Mike Kolesnik has uploaded a new change for review.
Change subject: engine: Rename HotPlugUnplgNicVDSParameters
......................................................................
engine: Rename HotPlugUnplgNicVDSParameters
Renamed the parameters to VmNicDeviceVDSParameters so that they can be
used in other commands that need the same combination of parameters.
Change-Id: Ie9f956a2dc00cfded652682a39521bf901917369
Signed-off-by: Mike Kolesnik <mkole...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
R
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotUnplugNicVDSCommand.java
4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/10269/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
index 68b9b8e..55ee64c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateDeactivateVmNicCommand.java
@@ -12,7 +12,7 @@
import org.ovirt.engine.core.common.businessentities.VmDeviceId;
import org.ovirt.engine.core.common.businessentities.VmInterfaceType;
import org.ovirt.engine.core.common.businessentities.VmNetworkInterface;
-import org.ovirt.engine.core.common.vdscommands.HotPlugUnplgNicVDSParameters;
+import org.ovirt.engine.core.common.vdscommands.VmNicDeviceVDSParameters;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.VdcBllMessages;
import org.ovirt.engine.core.dao.InterfaceDAO;
@@ -78,7 +78,7 @@
// HotPlug in the host is called only if the Vm is UP
if (hotPlugVmNicRequired(getVm().getStatus())) {
runVdsCommand(getParameters().getAction().getCommandType(),
- new HotPlugUnplgNicVDSParameters(getVdsId(),
+ new VmNicDeviceVDSParameters(getVdsId(),
getVm(),
getVmNetworkInterfaceDao().get(getParameters().getNicId()),
vmDevice));
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
similarity index 83%
rename from
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java
rename to
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
index ad6a196..b5a4e65 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugUnplgNicVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
@@ -5,13 +5,13 @@
import org.ovirt.engine.core.common.businessentities.VmNetworkInterface;
import org.ovirt.engine.core.compat.Guid;
-public class HotPlugUnplgNicVDSParameters extends
VdsIdVDSCommandParametersBase {
+public class VmNicDeviceVDSParameters extends VdsIdVDSCommandParametersBase {
private final VM vm;
private final VmNetworkInterface nic;
private final VmDevice vmDevice;
- public HotPlugUnplgNicVDSParameters(Guid vdsId, VM vm, VmNetworkInterface
nic, VmDevice vmDevice) {
+ public VmNicDeviceVDSParameters(Guid vdsId, VM vm, VmNetworkInterface nic,
VmDevice vmDevice) {
super(vdsId);
this.vm = vm;
this.nic = nic;
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
index be24c66..a6b08ad 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
@@ -9,11 +9,11 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.VmDeviceType;
-import org.ovirt.engine.core.common.vdscommands.HotPlugUnplgNicVDSParameters;
+import org.ovirt.engine.core.common.vdscommands.VmNicDeviceVDSParameters;
import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcStringUtils;
import org.ovirt.engine.core.vdsbroker.xmlrpc.XmlRpcStruct;
-public class HotPlugNicVDSCommand<P extends HotPlugUnplgNicVDSParameters>
extends VdsBrokerCommand<P> {
+public class HotPlugNicVDSCommand<P extends VmNicDeviceVDSParameters> extends
VdsBrokerCommand<P> {
protected XmlRpcStruct struct = new XmlRpcStruct();
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotUnplugNicVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotUnplugNicVDSCommand.java
index bce4588..171a339 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotUnplugNicVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotUnplugNicVDSCommand.java
@@ -1,8 +1,8 @@
package org.ovirt.engine.core.vdsbroker.vdsbroker;
-import org.ovirt.engine.core.common.vdscommands.HotPlugUnplgNicVDSParameters;
+import org.ovirt.engine.core.common.vdscommands.VmNicDeviceVDSParameters;
-public class HotUnplugNicVDSCommand<P extends HotPlugUnplgNicVDSParameters>
extends HotPlugNicVDSCommand<P> {
+public class HotUnplugNicVDSCommand<P extends VmNicDeviceVDSParameters>
extends HotPlugNicVDSCommand<P> {
public HotUnplugNicVDSCommand(P parameters) {
super(parameters);
--
To view, visit http://gerrit.ovirt.org/10269
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9f956a2dc00cfded652682a39521bf901917369
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Mike Kolesnik <mkole...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
