Dudi Maroshi has uploaded a new change for review. Change subject: restapi: add field ksm_merge_across_node to cluster ......................................................................
restapi: add field ksm_merge_across_node to cluster Add element and type to api.xsd Modified rsdl_metadata.yaml CluterMapper.java Add tests Change-Id: Idd6ce2c42b4d7fa30088c77d5f16d0dfdabb156a Bug-Url: https://bugzilla.redhat.com/840114 Signed-off-by: Dudi Maroshi <d...@redhat.com> --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/ClusterMapperTest.java 4 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/39783/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index 041b421..c891202 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -1732,6 +1732,7 @@ <xs:element ref="fencing_policy" minOccurs="0" maxOccurs="1"/> <xs:element ref="migration" minOccurs="0" maxOccurs="1" /> <xs:element name="management_network" type="Network" minOccurs="0" maxOccurs="1"/> + <xs:element ref="ksm_merge_across_nodes" minOccurs="0" maxOccurs="1"/> <!-- Also a rel="networks" link --> </xs:sequence> </xs:extension> @@ -1853,6 +1854,14 @@ </xs:sequence> </xs:complexType> + <xs:element name="ksm_merge_across_nodes" type="KSMMergeAcrossNodes"/> + + <xs:complexType name="KSMMergeAcrossNodes"> + <xs:sequence> + <xs:element name="enabled" type="xs:boolean" minOccurs="0" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + <xs:element name="ksm" type="KSM"/> <xs:complexType name="KSM"> diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml index 53841e1..41ddd4c 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml @@ -1797,7 +1797,7 @@ cluster.error_handling.on_error: 'xs:string', cluster.virt_service: 'xs:boolean', cluster.gluster_service: 'xs:boolean', cluster.threads_as_cores: 'xs:boolean', cluster.tunnel_migration: 'xs:boolean', cluster.ballooning_enabled: 'xs:boolean', cluster.cpu.architecture: 'xs:string', cluster.display.proxy: 'xs:string', cluster.ksm.enabled: 'xs:boolean', cluster.fencing_policy.enabled: 'xs:boolean', cluster.fencing_policy.skip_if_sd_active.enabled: 'xs:boolean', cluster.fencing_policy.skip_if_connectivity_broken.enabled: 'xs:boolean', cluster.fencing_policy.skip_if_connectivity_broken.threshold: 'xs:int', cluster.maintenance_reason_required: 'xs:boolean', - cluster.management_network.id|name: 'xs:string'} + cluster.management_network.id|name: 'xs:string', cluster.ksm_merge_across_nodes.enabled: 'xs:boolean'} description: update the specified cluster in the system. The capabilities like virt service, cluster service, tarnsparent huge pages etc can be changed. urlparams: {} headers: @@ -1815,7 +1815,7 @@ cluster.tunnel_migration: 'xs:boolean', cluster.trusted_service: 'xs:boolean', cluster.ha_reservation: 'xs:boolean', cluster.ballooning_enabled: 'xs:boolean', cluster.cpu.architecture: 'xs:string', cluster.display.proxy: 'xs:string', cluster.ksm.enabled: 'xs:boolean', cluster.fencing_policy.enabled: 'xs:boolean', cluster.fencing_policy.skip_if_sd_active.enabled: 'xs:boolean', cluster.fencing_policy.skip_if_connectivity_broken.enabled: 'xs:boolean', cluster.fencing_policy.skip_if_connectivity_broken.threshold: 'xs:int', - cluster.management_network.id|name: 'xs:string', cluster.maintenance_reason_required: 'xs:boolean'} + cluster.management_network.id|name: 'xs:string', cluster.maintenance_reason_required: 'xs:boolean', cluster.ksm_merge_across_nodes.enabled: 'xs:boolean'} description: add a new cluster to the system urlparams: {} headers: diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java index 266a98c..92f7793 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java @@ -12,6 +12,7 @@ import org.ovirt.engine.api.model.Display; import org.ovirt.engine.api.model.ErrorHandling; import org.ovirt.engine.api.model.KSM; +import org.ovirt.engine.api.model.KSMMergeAcrossNodes; import org.ovirt.engine.api.model.MemoryOverCommit; import org.ovirt.engine.api.model.MemoryPolicy; import org.ovirt.engine.api.model.MigrateOnError; @@ -105,6 +106,9 @@ if (model.isSetKsm() && model.getKsm().isSetEnabled()) { entity.setEnableKsm(model.getKsm().isEnabled()); } + if (model.isSetKsmMergeAcrossNodes() && model.getKsmMergeAcrossNodes().isSetEnabled()) { + entity.setKsmMergeAcrossNumaNodes(model.getKsmMergeAcrossNodes().isEnabled()); + } if (model.isSetDisplay() && model.getDisplay().isSetProxy()) { entity.setSpiceProxy("".equals(model.getDisplay().getProxy()) ? null : model.getDisplay().getProxy()); } @@ -164,6 +168,8 @@ model.setBallooningEnabled(entity.isEnableBallooning()); model.setKsm(new KSM()); model.getKsm().setEnabled(entity.isEnableKsm()); + model.setKsmMergeAcrossNodes(new KSMMergeAcrossNodes()); + model.getKsmMergeAcrossNodes().setEnabled(entity.isKsmMergeAcrossNumaNodes()); if (StringUtils.isNotBlank(entity.getSpiceProxy())) { Display display = new Display(); display.setProxy(entity.getSpiceProxy()); diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/ClusterMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/ClusterMapperTest.java index a592a49..39ccb75 100644 --- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/ClusterMapperTest.java +++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/ClusterMapperTest.java @@ -59,6 +59,7 @@ assertEquals(model.isTrustedService(), transform.isTrustedService()); assertEquals(model.isBallooningEnabled(), transform.isBallooningEnabled()); assertEquals(model.getKsm().isEnabled(), transform.getKsm().isEnabled()); + assertEquals(model.getKsmMergeAcrossNodes().isEnabled(), transform.getKsmMergeAcrossNodes().isEnabled()); assertEquals(model.getDisplay().getProxy(), transform.getDisplay().getProxy()); assertEquals(model.getSerialNumber().getPolicy(), transform.getSerialNumber().getPolicy()); assertEquals(model.getSerialNumber().getValue(), transform.getSerialNumber().getValue()); -- To view, visit https://gerrit.ovirt.org/39783 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd6ce2c42b4d7fa30088c77d5f16d0dfdabb156a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Dudi Maroshi <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
