Ravi Nori has uploaded a new change for review. Change subject: tools: engine-config cleanup 2.2 UseRtl8139_pv ......................................................................
tools: engine-config cleanup 2.2 UseRtl8139_pv Remove deprecated config values for version 2.2 from engine-config Removed UseRtl8139_pv key and the code surrounding the logic. Change-Id: Ib3deecd9c8cc3e19d8a19c43e8a619c5f3cd5b08 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=859045 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.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 4 files changed, 12 insertions(+), 54 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/9491/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 386e9a4..c268ee1 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -478,10 +478,6 @@ select fn_db_add_config_value('UserDefinedVMProperties','','3.2'); select fn_db_add_config_value('UserRefreshRate','3600','general'); select fn_db_add_config_value('UserSessionTimeOutInterval','30','general'); -select fn_db_add_config_value('UseRtl8139_pv','true','2.2'); -select fn_db_add_config_value('UseRtl8139_pv','false','3.0'); -select fn_db_add_config_value('UseRtl8139_pv','false','3.1'); -select fn_db_add_config_value('UseRtl8139_pv','false','3.2'); --Handling Use Secure Connection with Hosts select fn_db_add_config_value('UseSecureConnectionWithServers','true','general'); select fn_db_add_config_value('UseVdsBrokerInProc','true','general'); @@ -662,6 +658,10 @@ select fn_db_delete_config_value('SupportStorageFormat','3.0'); select fn_db_delete_config_value('SupportStorageFormat','3.1'); select fn_db_delete_config_value('SupportStorageFormat','3.2'); +select fn_db_delete_config_value('UseRtl8139_pv','2.2'); +select fn_db_delete_config_value('UseRtl8139_pv','3.0'); +select fn_db_delete_config_value('UseRtl8139_pv','3.1'); +select fn_db_delete_config_value('UseRtl8139_pv','3.2'); ------------------------------------------------------------------------------------ -- Split config section -- The purpose of this section is to treat config option that was once diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 33a1940..8003584 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -1007,11 +1007,6 @@ @DefaultValueAttribute("0") SupportedStorageFormats(296), - @Reloadable - @TypeConverterAttribute(Boolean.class) - @DefaultValueAttribute("false") - UseRtl8139_pv(297), - @TypeConverterAttribute(String.class) @DefaultValueAttribute("ILIKE") @OptionBehaviourAttribute(behaviour = OptionBehaviour.ValueDependent, dependentOn = ConfigValues.DBEngine, 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 b583761..89b098f 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 @@ -290,11 +290,6 @@ @Override protected void buildVmNetworkInterfaces() { - Boolean useRtl8139_pv = Config.<Boolean> GetValue( - ConfigValues.UseRtl8139_pv, vm - .getvds_group_compatibility_version() - .toString()); - Map<VmDeviceId, VmDevice> devicesByDeviceId = Entities.businessEntitiesById(DbFacade.getInstance() .getVmDeviceDao() @@ -316,33 +311,18 @@ ifaceType = VmInterfaceType.forValue(vmInterface.getType()); } if (ifaceType == VmInterfaceType.rtl8139_pv) { - if (!useRtl8139_pv) { - if (vm.getHasAgent()) { - addNetworkInterfaceProperties(struct, - vmInterface, - vmDevice, - VmInterfaceType.pv.name(), - vm.getvds_group_compatibility_version()); - } else { - addNetworkInterfaceProperties(struct, - vmInterface, - vmDevice, - VmInterfaceType.rtl8139.name(), - vm.getvds_group_compatibility_version()); - } - } else { + if (vm.getHasAgent()) { addNetworkInterfaceProperties(struct, vmInterface, vmDevice, VmInterfaceType.pv.name(), vm.getvds_group_compatibility_version()); - // Doual Mode: in this case we have to insert 2 interfaces with the same entries except nicModel - XmlRpcStruct rtl8139Struct = new XmlRpcStruct(); - addNetworkInterfaceProperties(rtl8139Struct, + } else { + addNetworkInterfaceProperties(struct, vmInterface, vmDevice, - VmInterfaceType.rtl8139.name(), vm.getvds_group_compatibility_version()); - devices.add(rtl8139Struct); + VmInterfaceType.rtl8139.name(), + vm.getvds_group_compatibility_version()); } } else { addNetworkInterfaceProperties(struct, 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 06bfbe8..8d65ff5 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 @@ -15,8 +15,6 @@ import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.VmType; -import org.ovirt.engine.core.common.config.Config; -import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.common.utils.VmDeviceCommonUtils; import org.ovirt.engine.core.common.utils.VmDeviceType; import org.ovirt.engine.core.compat.Guid; @@ -155,28 +153,13 @@ } if (ifaceType == VmInterfaceType.rtl8139_pv) { - Boolean useRtl8139_pv = Config.<Boolean> GetValue( - ConfigValues.UseRtl8139_pv, vm - .getvds_group_compatibility_version() - .toString()); - - if (!useRtl8139_pv) { - if (vm.getHasAgent()) { - nics.append("pv"); - } else { - nics.append("rtl8139"); - } + if (vm.getHasAgent()) { + nics.append("pv"); } else { - nics.append("rtl8139,pv"); - macs.append(","); - macs.append(vm.getInterfaces().get(i).getMacAddress()); - networks.append(","); - networks.append(vm.getInterfaces().get(i).getNetworkName()); + nics.append("rtl8139"); } } else { - nics.append(ifaceType.toString()); - } if (i < vm.getInterfaces().size() - 1) { -- To view, visit http://gerrit.ovirt.org/9491 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3deecd9c8cc3e19d8a19c43e8a619c5f3cd5b08 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
