Tal Nisan has uploaded a new change for review. Change subject: restapi: Support for force select SPM ......................................................................
restapi: Support for force select SPM Change-Id: Ida4a7abbcf0cbf3ae39c75c8431810fefb5c9404 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ForceSelectSPMParameters.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/HostResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java 3 files changed, 15 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/61/16961/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ForceSelectSPMParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ForceSelectSPMParameters.java index 7d8151e..ff5e31e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ForceSelectSPMParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ForceSelectSPMParameters.java @@ -7,13 +7,11 @@ private static final long serialVersionUID = -755083459086386402L; private Guid preferredSPMId; - private Guid storagePoolId = Guid.Empty; public ForceSelectSPMParameters() { } - public ForceSelectSPMParameters(Guid storagePoolId, Guid prefferedSPMId) { - setStoragePoolId(storagePoolId); + public ForceSelectSPMParameters(Guid prefferedSPMId) { setPreferredSPMId(prefferedSPMId); } @@ -23,13 +21,5 @@ public void setPreferredSPMId(Guid preferredSPMId) { this.preferredSPMId = preferredSPMId; - } - - public Guid getStoragePoolId() { - return storagePoolId; - } - - public void setStoragePoolId(Guid storagePoolId) { - this.storagePoolId = storagePoolId; } } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/HostResource.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/HostResource.java index c833c22..9d36e8f 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/HostResource.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resource/HostResource.java @@ -31,7 +31,7 @@ @Produces({ApiMediaType.APPLICATION_XML, ApiMediaType.APPLICATION_JSON, ApiMediaType.APPLICATION_X_YAML}) public interface HostResource extends UpdatableResource<Host>, MeasurableResource { - @Path("{action: (approve|install|fence|activate|deactivate|commitnetconfig|iscsidiscover|iscsilogin)}/{oid}") + @Path("{action: (approve|install|fence|activate|deactivate|commitnetconfig|iscsidiscover|iscsilogin|forceselectspm)}/{oid}") public ActionResource getActionSubresource(@PathParam("action")String action, @PathParam("oid")String oid); @POST @@ -82,6 +82,12 @@ @Path("iscsilogin") public Response iscsiLogin(Action action); + @POST + @Formatted + @Actionable + @Path("forceselectspm") + public Response forceSelectSPM(Action action); + @Path("nics") public HostNicsResource getHostNicsResource(); 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 9918efa..8dad624 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 @@ -30,6 +30,7 @@ import org.ovirt.engine.core.common.action.ChangeVDSClusterParameters; import org.ovirt.engine.core.common.action.FenceVdsActionParameters; import org.ovirt.engine.core.common.action.FenceVdsManualyParameters; +import org.ovirt.engine.core.common.action.ForceSelectSPMParameters; import org.ovirt.engine.core.common.action.MaintenanceNumberOfVdssParameters; import org.ovirt.engine.core.common.action.StorageServerConnectionParametersBase; import org.ovirt.engine.core.common.action.UpdateVdsActionParameters; @@ -183,6 +184,12 @@ } @Override + public Response forceSelectSPM(Action action) { + return doAction(VdcActionType.ForceSelectSPM, + new ForceSelectSPMParameters(guid), action); + } + + @Override public Response iscsiDiscover(Action action) { validateParameters(action, "iscsi.address"); -- To view, visit http://gerrit.ovirt.org/16961 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida4a7abbcf0cbf3ae39c75c8431810fefb5c9404 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
