Alona Kaplan has uploaded a new change for review. Change subject: engine: remove dual mode from VmInterfaceType ......................................................................
engine: remove dual mode from VmInterfaceType Dual mode doesn't have to be supported anymore. The mode of old nics with dual mode is substituted with virtio mode. Change-Id: I17174d169160e535a383ba8ea1c99bc6f1d0cc3f Signed-off-by: Alona Kaplan <[email protected]> --- A backend/manager/dbscripts/upgrade/03_02_0510_update_sub_dual_with_virtio.sql M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties 11 files changed, 18 insertions(+), 83 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/13008/1 diff --git a/backend/manager/dbscripts/upgrade/03_02_0510_update_sub_dual_with_virtio.sql b/backend/manager/dbscripts/upgrade/03_02_0510_update_sub_dual_with_virtio.sql new file mode 100644 index 0000000..fb2c34a --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_02_0510_update_sub_dual_with_virtio.sql @@ -0,0 +1,4 @@ +UPDATE vm_interface +SET type = 3 +WHERE type = 0; + diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java index dea3cdb..257ac41 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java @@ -19,7 +19,6 @@ import org.ovirt.engine.core.common.businessentities.VmPayload; import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.common.businessentities.tags; -import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; @@ -118,11 +117,7 @@ int pciInUse = monitorsNumber; for (VmNetworkInterface a : interfaces) { - if (a.getType() != null && VmInterfaceType.forValue(a.getType()) == VmInterfaceType.rtl8139_pv) { - pciInUse += 2; - } else { - pciInUse += 1; - } + pciInUse += 1; } pciInUse += LinqUtils.filter(disks, new Predicate<T>() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java index 01d262c..cd369a3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmInterfaceType.java @@ -4,13 +4,6 @@ import java.util.Map; public enum VmInterfaceType { - /** - * This needs to cleaned up. We are leaving it in place to support import of - * VMs created using previous versions. - * @deprecated - */ - @Deprecated - rtl8139_pv(0, "Dual mode rtl8139, VirtIO", 1000), rtl8139(1, "rtl8139", 100), e1000(2, "e1000", 1000), pv(3, "VirtIO", 1000); diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index 9a2f763..2bfe8fc 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -539,7 +539,7 @@ vmDevice.setDevice(VmDeviceType.getoVirtDevice(resourceType).getName()); } } else if (Integer.valueOf(OvfHardware.Network) == resourceType) { - // handle interfaces with different sub types : we have 0-3 as the VmInterfaceType enum + // handle interfaces with different sub types : we have 1-3 as the VmInterfaceType enum boolean isKnownType = false; for (VmInterfaceType vmInterfaceType : VmInterfaceType.values()) { if (Integer.valueOf(vmInterfaceType.getValue()) == resourceSubType) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java index 6ba2926..c7da014 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmInfoBuilder.java @@ -43,7 +43,7 @@ private final List<XmlRpcStruct> devices = new ArrayList<XmlRpcStruct>(); private List<VmDevice> managedDevices = null; - private boolean hasNonDefaultBootOrder; + private final boolean hasNonDefaultBootOrder; public VmInfoBuilder(VM vm, XmlRpcStruct createInfo) { this.vm = vm; @@ -310,34 +310,11 @@ if (vmInterface.getType() != null) { ifaceType = VmInterfaceType.forValue(vmInterface.getType()); } - if (ifaceType == VmInterfaceType.rtl8139_pv) { - if (vm.getHasAgent()) { - addNetworkInterfaceProperties(struct, - vmInterface, - vmDevice, - VmInterfaceType.pv.name(), - vm.getVdsGroupCompatibilityVersion()); - // Doual Mode: in this case we have to insert 2 interfaces with the same entries except nicModel - XmlRpcStruct rtl8139Struct = new XmlRpcStruct(); - addNetworkInterfaceProperties(rtl8139Struct, - vmInterface, - vmDevice, - VmInterfaceType.rtl8139.name(), - vm.getVdsGroupCompatibilityVersion()); - } else { - addNetworkInterfaceProperties(struct, - vmInterface, - vmDevice, - VmInterfaceType.rtl8139.name(), - vm.getVdsGroupCompatibilityVersion()); - } - } else { - addNetworkInterfaceProperties(struct, - vmInterface, - vmDevice, - ifaceType.toString(), - vm.getVdsGroupCompatibilityVersion()); - } + addNetworkInterfaceProperties(struct, + vmInterface, + vmDevice, + ifaceType.toString(), + vm.getVdsGroupCompatibilityVersion()); devices.add(struct); addToManagedDevices(vmDevice); } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java index 1c966bf..9d339dc 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VmOldInfoBuilder.java @@ -152,15 +152,7 @@ .getType()); } - if (ifaceType == VmInterfaceType.rtl8139_pv) { - if (vm.getHasAgent()) { - nics.append("pv"); - } else { - nics.append("rtl8139"); - } - } else { - nics.append(ifaceType.toString()); - } + nics.append(ifaceType.toString()); if (i < vm.getInterfaces().size() - 1) { macs.append(","); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index 0ad85c2..b1eac37 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -2534,23 +2534,6 @@ return VdcEventNotificationUtils.GetNotificationEvents(); } - public static ArrayList<VmInterfaceType> GetNicTypeList(VmOsType osType, boolean hasDualmode) - { - ArrayList<VmInterfaceType> list = new ArrayList<VmInterfaceType>(Arrays.asList(VmInterfaceType.values())); - - list.remove(VmInterfaceType.rtl8139_pv); // Dual mode NIC should be available only for existing NICs that have - // that type already - if (IsWindowsOsType(osType)) - { - if (osType == VmOsType.WindowsXP && hasDualmode) - { - list.add(VmInterfaceType.rtl8139_pv); - } - } - - return list; - } - public static VmInterfaceType GetDefaultNicType(VmOsType osType) { return VmInterfaceType.pv; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java index 7309eed..9d84c5c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/BaseEditVmInterfaceModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; @@ -38,10 +39,7 @@ @Override protected void init() { - Integer selectedNicType = getNic().getType(); - ArrayList<VmInterfaceType> nicTypes = - AsyncDataProvider.GetNicTypeList(getVm().getOs(), - VmInterfaceType.forValue(selectedNicType) == VmInterfaceType.rtl8139_pv); + ArrayList<VmInterfaceType> nicTypes = new ArrayList<VmInterfaceType>(Arrays.asList(VmInterfaceType.values())); getNicType().setItems(nicTypes); initSelectedType(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java index 14f7ee7..3db7689 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmInterfaceModel.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.ovirt.engine.core.common.action.AddVmInterfaceParameters; @@ -8,6 +9,7 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.network.Network; +import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -37,7 +39,7 @@ @Override protected void init() { String newNicName = AsyncDataProvider.GetNewNicName(getVmNicList()); - getNicType().setItems(AsyncDataProvider.GetNicTypeList(getVm().getOs(), false)); + getNicType().setItems(new ArrayList<VmInterfaceType>(Arrays.asList(VmInterfaceType.values()))); initSelectedType(); getName().setEntity(newNicName); initMAC(); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java index 3337242..695b9e1 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Enums.java @@ -189,14 +189,6 @@ String OriginType___OVIRT(); - /** - * This needs to cleaned up. We are leaving it in place to support import of - * VMs created using previous versions. - * @deprecated - */ - @Deprecated - String VmInterfaceType___rtl8139_pv(); - String VmInterfaceType___rtl8139(); String VmInterfaceType___e1000(); diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties index 63b4dc9..663fbf1 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/Enums.properties @@ -92,7 +92,6 @@ OriginType___OVIRT=oVirt OriginType___VMWARE=VmWare OriginType___XEN=Xen -VmInterfaceType___rtl8139_pv=Dual mode rtl8139, VirtIO VmInterfaceType___rtl8139=rtl8139 VmInterfaceType___e1000=e1000 VmInterfaceType___pv=VirtIO -- To view, visit http://gerrit.ovirt.org/13008 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I17174d169160e535a383ba8ea1c99bc6f1d0cc3f 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
