Vered Volansky has uploaded a new change for review.
Change subject: Revert "restapi: add field ksm_merge_across_node to cluster"
......................................................................
Revert "restapi: add field ksm_merge_across_node to cluster"
This reverts commit 59f2380f876d4cdddd60ef1ad9a845a694259b96.
Change-Id: I2085180c5d1be9c1329de699969db3c0760710f4
Signed-off-by: Vered Volansky <vvola...@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, 3 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/42368/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 4516d05..61e1bf4 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
@@ -1917,7 +1917,6 @@
<xs:complexType name="KSM">
<xs:sequence>
<xs:element name="enabled" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
- <xs:element name="merge_across_nodes" type="xs:boolean" minOccurs="0"
maxOccurs="1"/>
</xs:sequence>
</xs:complexType>
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 1bd32c2..4781632 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
@@ -1292,7 +1292,6 @@
cluster.maintenance_reason_required: xs:boolean
cluster.management_network.id|name: xs:string
cluster.ha_reservation: xs:boolean
- cluster.ksm.merge_across_nodes: xs:boolean
description: update the specified cluster in the system. The
capabilities like virt service, cluster service, tarnsparent huge pages etc can
be changed.
- name: /clusters|rel=add
description: add a new cluster to the system
@@ -1305,7 +1304,7 @@
cluster.scheduling_policy.policy--DEPRECATED: 'xs:string',
cluster.scheduling_policy.thresholds.low--DEPRECATED: 'xs:int',
cluster.scheduling_policy.thresholds.high--DEPRECATED: 'xs:int',
cluster.scheduling_policy.thresholds.duration--DEPRECATED: 'xs:int',
cluster.scheduling_policy.id: 'xs:string',
cluster.scheduling_policy.properties.property--COLLECTION: {property.name:
'xs:string', property.value: 'xs:string'}, 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.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.ksm.merge_across_nodes:
'xs:boolean',
+ 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'}
description: add a new cluster to the system
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 1cd08c3..266a98c 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
@@ -102,13 +102,8 @@
if (model.isSetBallooningEnabled()) {
entity.setEnableBallooning(model.isBallooningEnabled());
}
- if (model.isSetKsm()) {
- if (model.getKsm().isSetEnabled()) {
- entity.setEnableKsm(model.getKsm().isEnabled());
- }
- if (model.getKsm().isSetMergeAcrossNodes()) {
-
entity.setKsmMergeAcrossNumaNodes(model.getKsm().isMergeAcrossNodes());
- }
+ if (model.isSetKsm() && model.getKsm().isSetEnabled()) {
+ entity.setEnableKsm(model.getKsm().isEnabled());
}
if (model.isSetDisplay() && model.getDisplay().isSetProxy()) {
entity.setSpiceProxy("".equals(model.getDisplay().getProxy()) ?
null : model.getDisplay().getProxy());
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 7fb8e3d..a592a49 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
@@ -58,11 +58,7 @@
assertEquals(model.isTunnelMigration(), transform.isTunnelMigration());
assertEquals(model.isTrustedService(), transform.isTrustedService());
assertEquals(model.isBallooningEnabled(),
transform.isBallooningEnabled());
-
assertEquals(model.getKsm().isEnabled(),
transform.getKsm().isEnabled());
- assertEquals(model.getKsm().isMergeAcrossNodes(), transform.getKsm()
- .isMergeAcrossNodes());
-
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/42368
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2085180c5d1be9c1329de699969db3c0760710f4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvola...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
