Alona Kaplan has uploaded a new change for review.
Change subject: engine: Dual mode shouldn't be sent to vdsm on hotplug nic
......................................................................
engine: Dual mode shouldn't be sent to vdsm on hotplug nic
Since 3.0 vdsm doesn't support Dual mode on vm interface.
When running a vm, VmInfoBuilder takes care of replacing the
interface type in case it is Dual mode.
This patch adds the same treatment to hot plug nic.
Change-Id: Ifdc878a5f8391659a58cf25f2f9137c944689ce4
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugNicVDSCommand.java
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/26380/1
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 3400ff2..e34f812 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
@@ -48,7 +48,18 @@
addAddress(map, vmDevice.getAddress());
map.put(VdsProperties.SpecParams, vmDevice.getSpecParams());
- map.put(VdsProperties.NIC_TYPE,
VmInterfaceType.forValue(nic.getType()).getInternalName());
+
+ VmInterfaceType ifaceType = VmInterfaceType.forValue(nic.getType());
+ if (ifaceType == VmInterfaceType.rtl8139_pv) {
+ if (getParameters().getVm().getHasAgent()) {
+ map.put(VdsProperties.NIC_TYPE, VmInterfaceType.pv.name());
+ } else {
+ map.put(VdsProperties.NIC_TYPE,
VmInterfaceType.rtl8139.name());
+ }
+ } else {
+ map.put(VdsProperties.NIC_TYPE, ifaceType.getInternalName());
+ }
+
map.put(VdsProperties.DeviceId,
vmDevice.getId().getDeviceId().toString());
if (vmDevice.getBootOrder() > 0) {
--
To view, visit http://gerrit.ovirt.org/26380
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdc878a5f8391659a58cf25f2f9137c944689ce4
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alona Kaplan <alkap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
