Alona Kaplan has uploaded a new change for review. Change subject: restapi: Showing the host maintenance reason ......................................................................
restapi: Showing the host maintenance reason Change-Id: Ie1c920672e68e5cb10d99ff3c4988ee4dade04f3 Signed-off-by: Alona Kaplan <[email protected]> --- 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/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java 4 files changed, 11 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/38314/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 f7febd8..d4a74e2 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 @@ -209,6 +209,8 @@ <xs:element ref="storage_domains" minOccurs="0" maxOccurs="1"/> <!-- For import Glance disk --> <xs:element ref="disk" minOccurs="0" maxOccurs="1"/> + <!-- For host maintenance (deactivate) --> + <xs:element name="maintenance_reason" type="xs:string" minOccurs="0"/> </xs:sequence> </xs:group> @@ -1942,6 +1944,7 @@ <xs:element name="live_snapshot_support" type="xs:boolean" minOccurs="0" maxOccurs="1" /> <xs:element ref="katello_errata" minOccurs="0" maxOccurs="1"/> <xs:element ref="external_host_provider" minOccurs="0" maxOccurs="1"/> + <xs:element name="maintenance_reason" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:extension> </xs:complexContent> 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 36236a3..11056fe 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 @@ -2973,7 +2973,7 @@ parameterType: Action signatures: - mandatoryArguments: {} - optionalArguments: {action.async: 'xs:boolean', action.grace_period.expiry: 'xs:long'} + optionalArguments: {action.async: 'xs:boolean', action.grace_period.expiry: 'xs:long', action.maintenanceReason: 'xs:string'} description: deactivate the specified host urlparams: {} headers: diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java index 2a2b7b8..6503f3e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java @@ -246,9 +246,12 @@ @Override public Response deactivate(Action action) { + validateParameters(action, "maintenanceReason"); return doAction(VdcActionType.MaintenanceNumberOfVdss, - new MaintenanceNumberOfVdssParameters(asList(guid), false), - action); + new MaintenanceNumberOfVdssParameters(asList(guid), + false, + action.isSetMaintenanceReason() ? action.getMaintenanceReason() : null), + action); } @Override diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java index d7fb9ba..b0bdd42 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java @@ -298,6 +298,8 @@ model.setExternalHostProvider(new ExternalHostProvider()); model.getExternalHostProvider().setId(entity.getHostProviderId().toString()); } + + model.setMaintenanceReason(entity.getStopReason()); return model; } -- To view, visit https://gerrit.ovirt.org/38314 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1c920672e68e5cb10d99ff3c4988ee4dade04f3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
