Alona Kaplan has uploaded a new change for review. Change subject: engine: introduce HostDevChangeNumVfsVDSCommand ......................................................................
engine: introduce HostDevChangeNumVfsVDSCommand Change-Id: Ifdcd28ae7de11b47c0d8545e62a24eb5d6af318d Signed-off-by: Alona Kaplan <[email protected]> --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java A backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostDevChangeNumVfsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java 7 files changed, 81 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/37721/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java new file mode 100644 index 0000000..f72fa86 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java @@ -0,0 +1,34 @@ +package org.ovirt.engine.core.common.vdscommands; + +import org.ovirt.engine.core.compat.Guid; + +public class HostDevChangeNumVfsVDSParameters extends VdsIdVDSCommandParametersBase { + + private String deviceName; + private int numOfVfs; + + public HostDevChangeNumVfsVDSParameters(Guid vdsId, String deviceName, int numOfVfs) { + super(vdsId); + this.deviceName = deviceName; + this.numOfVfs = numOfVfs; + } + + public HostDevChangeNumVfsVDSParameters() { + } + + public String getDeviceName() { + return deviceName; + } + + public int getNumOfVfs() { + return numOfVfs; + } + + @Override + public String toString() { + return String.format("%s, deviceName=%s, numOfVds=%d", + super.toString(), + getDeviceName(), + getNumOfVfs()); + } +} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 0f4ba36..2eb6988 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -172,6 +172,7 @@ GetAllVmStats("org.ovirt.engine.core.vdsbroker.vdsbroker"), // get a list of VMs with full data and statistics HostDevListByCaps("org.ovirt.engine.core.vdsbroker"), // get all host devices with passthrough information Destroy("org.ovirt.engine.core.vdsbroker.vdsbroker"), // Clean a DOWN VM from the vms list + HostDevChangeNumVfs("org.ovirt.engine.core.vdsbroker.vdsbroker"), /** * Get Host capabilities */ diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java index e538409..2d478a4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java @@ -1597,4 +1597,14 @@ .withResponseType(Object[].class); return new VMListReturnForXmlRpc(response); } + + @Override + public StatusOnlyReturnForXmlRpc hostdevChangeNumvfs(String deviceName, int numOfVfs) { + JsonRpcRequest request = + new RequestBuilder("Host.hostdevChangeNumvfs").withParameter("deviceName", deviceName) + .withParameter("numvfs", numOfVfs) + .build(); + Map<String, Object> response = new FutureMap(this.client, request); + return new StatusOnlyReturnForXmlRpc(response); + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostDevChangeNumVfsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostDevChangeNumVfsVDSCommand.java new file mode 100644 index 0000000..60ad4de --- /dev/null +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostDevChangeNumVfsVDSCommand.java @@ -0,0 +1,21 @@ +package org.ovirt.engine.core.vdsbroker.vdsbroker; + +import java.util.HashMap; +import java.util.Map; + +import org.ovirt.engine.core.common.vdscommands.HostDevChangeNumVfsVDSParameters; + +public class HostDevChangeNumVfsVDSCommand<P extends HostDevChangeNumVfsVDSParameters> extends VdsBrokerCommand<P> { + + protected Map<String, Object> struct = new HashMap<String, Object>(); + + public HostDevChangeNumVfsVDSCommand(P parameters) { + super(parameters); + } + + @Override + protected void executeVdsBrokerCommand() { + status = getBroker().hostdevChangeNumvfs(getParameters().getDeviceName(), getParameters().getNumOfVfs()); + proceedProxyReturnValue(); + } +} diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index 29529ce..374cb0d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -336,4 +336,6 @@ StatusOnlyReturnForXmlRpc glusterVolumeGeoRepResume(String volumeName, String slaveHostName, String slaveVolumeName, boolean force); VMListReturnForXmlRpc getExternalVmList(String uri, String username, String password); + + StatusOnlyReturnForXmlRpc hostdevChangeNumvfs(String deviceName, int numOfVfs); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java index bc2973a..c2aa589 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerConnector.java @@ -316,4 +316,6 @@ public Map<String, Object> updateVmPolicy(Map info); public Map<String, Object> getExternalVMs(String uri, String username, String password); + + public Map<String, Object> hostdevChangeNumvfs(String deviceName, int numOfVfs); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java index 379415f..10d2e7c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsServerWrapper.java @@ -1557,4 +1557,15 @@ throw new XmlRpcRunTimeException(ute); } } + + @Override + public StatusOnlyReturnForXmlRpc hostdevChangeNumvfs(String deviceName, int numOfVfs) { + try { + Map<String, Object> xmlRpcReturnValue = vdsServer.hostdevChangeNumvfs(deviceName, numOfVfs); + StatusOnlyReturnForXmlRpc wrapper = new StatusOnlyReturnForXmlRpc(xmlRpcReturnValue); + return wrapper; + } catch (UndeclaredThrowableException ute) { + throw new XmlRpcRunTimeException(ute); + } + } } -- To view, visit http://gerrit.ovirt.org/37721 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifdcd28ae7de11b47c0d8545e62a24eb5d6af318d 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
