Muli Salem has uploaded a new change for review. Change subject: core: Usage as Lowercase and in Caps (#817798) ......................................................................
core: Usage as Lowercase and in Caps (#817798) https://bugzilla.redhat.com/817798 This patch changes the mapping of Network to display the usage property in lowercase. Also, it adds the property to /capabilities. Signed-off-by: Muli Salem <[email protected]> Change-Id: Ia806eff46e1a8982a2cc4e7de485ea2c8b07c953 --- M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java 4 files changed, 32 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/7431/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 96f32ba..c27accd 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 @@ -569,6 +569,7 @@ <xs:element ref="vm_device_types" minOccurs="0"/> <xs:element ref="permits" minOccurs="0"/> <xs:element ref="scheduling_policies" minOccurs="0"/> + <xs:element ref="network_usages" minOccurs="0"/> <!-- Gluster related --> <xs:element ref="gluster_volume_types" minOccurs="0"/> @@ -1552,6 +1553,20 @@ </xs:complexContent> </xs:complexType> + <xs:element name="network_usages" type="NetworkUsages"/> + + <xs:complexType name="NetworkUsages"> + <xs:sequence> + <xs:element name="network_usages" type="xs:string" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:appinfo> + <jaxb:property name="NetworkUsages"/> + </xs:appinfo> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + <!-- Storage Domains --> <xs:element name="storage_domain" type="StorageDomain"/> diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java index 94561e5..5e74891 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java @@ -42,6 +42,7 @@ import org.ovirt.engine.api.model.MigrateOnError; import org.ovirt.engine.api.model.NetworkStates; import org.ovirt.engine.api.model.NetworkStatus; +import org.ovirt.engine.api.model.NetworkUsages; import org.ovirt.engine.api.model.NicInterface; import org.ovirt.engine.api.model.NicInterfaces; import org.ovirt.engine.api.model.NicStatus; @@ -72,17 +73,18 @@ import org.ovirt.engine.api.model.VersionCaps; import org.ovirt.engine.api.model.VmAffinities; import org.ovirt.engine.api.model.VmAffinity; +import org.ovirt.engine.api.model.VmDeviceType; +import org.ovirt.engine.api.model.VmDeviceTypes; import org.ovirt.engine.api.model.VmPauseDetails; import org.ovirt.engine.api.model.VmStates; import org.ovirt.engine.api.model.VmStatus; import org.ovirt.engine.api.model.VmType; import org.ovirt.engine.api.model.VmTypes; -import org.ovirt.engine.api.model.VmDeviceType; -import org.ovirt.engine.api.model.VmDeviceTypes; import org.ovirt.engine.api.resource.CapabilitiesResource; import org.ovirt.engine.api.resource.CapabiliyResource; import org.ovirt.engine.api.restapi.model.StorageFormat; import org.ovirt.engine.api.restapi.types.MappingLocator; +import org.ovirt.engine.api.restapi.types.NetworkUsage; import org.ovirt.engine.api.restapi.util.FencingOptionsParser; import org.ovirt.engine.api.restapi.util.ServerCpuParser; import org.ovirt.engine.api.restapi.util.VersionHelper; @@ -171,6 +173,7 @@ addDataCenterStates(version, DataCenterStatus.values()); addPermits(version, PermitType.values()); addSchedulingPolicies(version, SchedulingPolicyType.values()); + addNetworkUsages(version, NetworkUsage.values()); version.setFeatures(getFeatures(v)); @@ -191,6 +194,15 @@ return guid!=null ? guid.toString():null; } + private void addNetworkUsages(VersionCaps version, NetworkUsage[] values) { + if (VersionUtils.greaterOrEqual(version, VERSION_3_1)) { + version.setNetworkUsages(new NetworkUsages()); + for (NetworkUsage networkUsage : values) { + version.getNetworkUsages().getNetworkUsages().add(networkUsage.value()); + } + } + } + private void addSchedulingPolicies(VersionCaps version, SchedulingPolicyType[] values) { version.setSchedulingPolicies(new SchedulingPolicies()); for (SchedulingPolicyType policy : values) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java index f0e1f74..5884d53 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterNetworkResourceTest.java @@ -101,7 +101,7 @@ assertEquals(model.isDisplay(), true); assertTrue(model.isSetUsages()); assertNotNull(model.getUsages().getUsages()); - assertTrue(model.getUsages().getUsages().contains(NetworkUsage.DISPLAY.name())); + assertTrue(model.getUsages().getUsages().contains(NetworkUsage.DISPLAY.value())); assertTrue(model.isSetRequired()); assertEquals(model.isRequired(), true); } diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java index f5a890d..ecefc32 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/NetworkMapper.java @@ -100,10 +100,10 @@ model.setUsages(new Usages()); if (entity.isVmNetwork()) { - model.getUsages().getUsages().add(NetworkUsage.VM.name()); + model.getUsages().getUsages().add(NetworkUsage.VM.value()); } if (entity.getCluster() != null && entity.getCluster().getis_display()) { - model.getUsages().getUsages().add(NetworkUsage.DISPLAY.name()); + model.getUsages().getUsages().add(NetworkUsage.DISPLAY.value()); } if (entity.getCluster() != null) { if (entity.getCluster().getstatus() != null) { -- To view, visit http://gerrit.ovirt.org/7431 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia806eff46e1a8982a2cc4e7de485ea2c8b07c953 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Muli Salem <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
