Ori Liel has uploaded a new change for review. Change subject: restapi: Add Snapshot Statuses to Capabilities (#977322) ......................................................................
restapi: Add Snapshot Statuses to Capabilities (#977322) Change-Id: I2b2902953bd7353d4bed5ffe195b69b72cd67fd4 Bug-Url: http://bugzilla.redhat.com/799322 Signed-off-by: Ori Liel <ol...@redhat.com> --- 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, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/17970/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 2f6994b..7f1056e 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 @@ -603,6 +603,7 @@ <xs:element ref="brick_states" minOccurs="0"/> <xs:element ref="reported_device_types" minOccurs="0"/> <xs:element ref="ip_versions" minOccurs="0"/> + <xs:element ref="snapshot_statuses" minOccurs="0"/> </xs:sequence> </xs:extension> </xs:complexContent> @@ -973,6 +974,21 @@ </xs:sequence> </xs:complexType> + + <xs:element name="snapshot_statuses" type="SnapshotStatuses"/> + + <xs:complexType name="SnapshotStatuses"> + <xs:sequence> + <xs:element name="snapshot_status" type="xs:string" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:appinfo> + <jaxb:property name="SnapshotStatuses"/> + </xs:appinfo> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + <!-- Common to all resources --> <xs:complexType name="ActionableResource"> 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 cd4a07e..d02be90 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 @@ -92,6 +92,8 @@ 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.SnapshotStatus; +import org.ovirt.engine.api.model.SnapshotStatuses; import org.ovirt.engine.api.model.WatchdogActions; import org.ovirt.engine.api.model.WatchdogModels; import org.ovirt.engine.api.resource.CapabilitiesResource; @@ -227,6 +229,7 @@ addWatchdogActions(version, WatchdogAction.values()); addWatchdogModels(version, WatchdogModel.values()); addConfigurationTypes(version, ConfigurationType.values()); + addSnapshotStatuses(version, SnapshotStatus.values()); // External tasks types addStepEnumTypes(version, StepEnum.values()); @@ -245,6 +248,15 @@ return version; } + private void addSnapshotStatuses(VersionCaps version, SnapshotStatus[] values) { + if (VersionUtils.greaterOrEqual(version, VERSION_3_2)) { + version.setSnapshotStatuses(new SnapshotStatuses()); + for (SnapshotStatus mode : values) { + version.getSnapshotStatuses().getSnapshotStatuses().add(mode.value()); + } + } + } + private void addCpuModes(VersionCaps version, CpuMode[] values) { if (VersionUtils.greaterOrEqual(version, VERSION_3_2)) { version.setCpuModes(new CpuModes()); -- To view, visit http://gerrit.ovirt.org/17970 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b2902953bd7353d4bed5ffe195b69b72cd67fd4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <ol...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
