Michael Pasternak has uploaded a new change for review. Change subject: restapi: add cpu-mode enumerable values to /capabilities #915042 ......................................................................
restapi: add cpu-mode enumerable values to /capabilities #915042 https://bugzilla.redhat.com/show_bug.cgi?id=915042 Change-Id: If4e06874b2450e60f2f84c485e82b24ecec71a9f Signed-off-by: Michael Pasternak <[email protected]> --- 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 2 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/13309/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 707808d..6b30023 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 @@ -580,6 +580,7 @@ <xs:element ref="usages" minOccurs="0"/> <xs:element ref="nfs_versions" minOccurs="0"/> <xs:element ref="pm_proxy_types" minOccurs="0"/> + <xs:element ref="cpu_modes" minOccurs="0"/> <!-- Gluster related --> <xs:element ref="gluster_volume_types" minOccurs="0"/> @@ -883,6 +884,20 @@ </xs:sequence> </xs:complexType> + <xs:element name="cpu_modes" type="CpuModes"/> + + <xs:complexType name="CpuModes"> + <xs:sequence> + <xs:element name="cpu_mode" type="xs:string" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:appinfo> + <jaxb:property name="CpuModes"/> + </xs:appinfo> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + <!-- Common to all resources --> 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 09f5ab7..e790060 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 @@ -12,6 +12,8 @@ import org.ovirt.engine.api.model.CPU; import org.ovirt.engine.api.model.CPUs; import org.ovirt.engine.api.model.Capabilities; +import org.ovirt.engine.api.model.CpuMode; +import org.ovirt.engine.api.model.CpuModes; import org.ovirt.engine.api.model.CreationStates; import org.ovirt.engine.api.model.CreationStatus; import org.ovirt.engine.api.model.CustomProperties; @@ -202,6 +204,7 @@ addPmProxyTypes(version, PmProxyType.values()); addReportedDeviceTypes(version, ReportedDeviceType.values()); addIpVersions(version, IpVersion.values()); + addCpuModes(version, CpuMode.values()); version.setFeatures(featuresHelper.getFeatures(v)); @@ -217,6 +220,15 @@ return version; } + private void addCpuModes(VersionCaps version, CpuMode[] values) { + if (VersionUtils.greaterOrEqual(version, VERSION_3_2)) { + version.setCpuModes(new CpuModes()); + for (CpuMode mode : values) { + version.getCpuModes().getCpuModes().add(mode.value()); + } + } + } + private void addReportedDeviceTypes(VersionCaps version, ReportedDeviceType[] values) { if (VersionUtils.greaterOrEqual(version, VERSION_3_2)) { version.setReportedDeviceTypes(new ReportedDeviceTypes()); -- To view, visit http://gerrit.ovirt.org/13309 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4e06874b2450e60f2f84c485e82b24ecec71a9f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: engine_3.2 Gerrit-Owner: Michael Pasternak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
