Gustavo Frederico Temple Pedrosa has uploaded a new change for review.
Change subject: core: Cleanup of Vnic and Disk hotplug
......................................................................
core: Cleanup of Vnic and Disk hotplug
This change clean the obsolete code of disk and NIC hotplug,
because the code was migrated from database to the osinfo file.
Change-Id: I8c38a8ecbbc56fc8ef70c6e45732225ce96ba1f0
Signed-off-by: Gustavo Pedrosa <gustavo.pedr...@eldorado.org.br>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M
frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M
frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
16 files changed, 6 insertions(+), 89 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/19758/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
index 3d49f65..382c6c8 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachDiskToVmCommand.java
@@ -121,8 +121,7 @@
if (getParameters().isPlugUnPlug()
&& getVm().getStatus() != VMStatus.Down) {
- return isOsSupportingHotPlug() && isHotPlugSupported()
- && isInterfaceSupportedForPlugUnPlug(disk);
+ return isInterfaceSupportedForPlugUnPlug(disk);
}
return true;
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
index 165a854..6703d1b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DetachDiskFromVmCommand.java
@@ -46,8 +46,7 @@
}
if (retValue && Boolean.TRUE.equals(getParameters().isPlugUnPlug())
&& getVm().getStatus() != VMStatus.Down) {
- retValue = isHotPlugSupported() && isOsSupportingHotPlug()
- && isInterfaceSupportedForPlugUnPlug(disk);
+ retValue = isInterfaceSupportedForPlugUnPlug(disk);
}
if (retValue && Boolean.FALSE.equals(getParameters().isPlugUnPlug())
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java
index ed56413..2962df3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommand.java
@@ -77,7 +77,7 @@
private boolean checkCanPerformPlugUnPlugDisk() {
if (getVm().getStatus().isUpOrPaused()) {
setVdsId(getVm().getRunOnVds());
- if (!canPerformDiskHotPlug() ||
!isInterfaceSupportedForPlugUnPlug(disk)) {
+ if (!isInterfaceSupportedForPlugUnPlug(disk)) {
return false;
}
}
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 ac0c9f8..7d1b5f5 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
@@ -378,41 +378,8 @@
}
}
- protected boolean canPerformDiskHotPlug() {
- return isHotPlugSupported() && isOsSupportingHotPlug();
- }
-
protected boolean canPerformNicHotPlug() {
return osRepository.hasNicHotplugSupport(getVm().getOs(),
getVm().getVdsGroupCompatibilityVersion());
- }
-
- /**
- * check that hotplug is enabled via the 3.1 config paramter {@literal
ConfigValues.HotPlugEnabled,
- * @return
- */
- protected boolean isHotPlugSupported() {
- if (Config.<Boolean> GetValue(ConfigValues.HotPlugEnabled,
getVds().getVdsGroupCompatibilityVersion()
- .getValue())) {
- return true;
- }
- addCanDoActionMessage(VdcBllMessages.HOT_PLUG_IS_NOT_SUPPORTED);
- return false;
- }
-
- /**
- * The following method should check if os of guest is supported for hot
plug/unplug operation
- * @return
- */
- protected boolean isOsSupportingHotPlug() {
- int vmOs = getVm().getOs();
- String[] unsupportedOSs = Config.<String>
GetValue(ConfigValues.HotPlugUnsupportedOsList).split(",");
- for (String os : unsupportedOSs) {
- if (os.equalsIgnoreCase(osRepository.getOsName(vmOs))) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_GUEST_OS_VERSION_IS_NOT_SUPPORTED);
- return false;
- }
- }
- return true;
}
protected VmDeviceDAO getVmDeviceDao() {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java
index 2ca9ff6..95d336a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java
@@ -5,7 +5,6 @@
import org.ovirt.engine.core.bll.context.CompensationContext;
import org.ovirt.engine.core.common.AuditLogType;
-import org.ovirt.engine.core.common.FeatureSupported;
import org.ovirt.engine.core.common.businessentities.VM;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.businessentities.network.VmNic;
@@ -56,8 +55,7 @@
if (allocateMac) {
iface.setMacAddress(getMacPoolManager().allocateNewMac());
- } else if (FeatureSupported.hotPlug(clusterCompatibilityVersion)
- && getOsRepository().hasNicHotplugSupport(osId,
clusterCompatibilityVersion)) {
+ } else if (getOsRepository().hasNicHotplugSupport(osId,
clusterCompatibilityVersion)) {
getMacPoolManager().forceAddMac(iface.getMacAddress());
} else if (!getMacPoolManager().addMac(iface.getMacAddress())) {
auditLogMacInUse(iface);
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
index 6bb4304..cf32709 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/HotPlugDiskToVmCommandTest.java
@@ -8,7 +8,6 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
import java.util.ArrayList;
import java.util.Arrays;
@@ -16,7 +15,6 @@
import java.util.List;
import java.util.Map;
import org.junit.Before;
-import org.junit.ClassRule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -37,7 +35,6 @@
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.VmDevice;
import org.ovirt.engine.core.common.businessentities.VmDeviceId;
-import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.errors.VdcBllMessages;
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.common.utils.SimpleDependecyInjector;
@@ -48,7 +45,6 @@
import org.ovirt.engine.core.dao.VdsDAO;
import org.ovirt.engine.core.dao.VmDAO;
import org.ovirt.engine.core.dao.VmDeviceDAO;
-import org.ovirt.engine.core.utils.MockConfigRule;
@RunWith(MockitoJUnitRunner.class)
public class HotPlugDiskToVmCommandTest {
@@ -59,11 +55,6 @@
private final Guid storageDomainId = Guid.newGuid();
protected static final ArrayList<String> DISK_HOTPLUGGABLE_INTERFACES =
new ArrayList<String>(
Arrays.asList("VirtIO_SCSI", "VirtIO"));
-
- @ClassRule
- public static final MockConfigRule mcr = new MockConfigRule(
- mockConfig(ConfigValues.HotPlugUnsupportedOsList, "RHEL3x64"),
- mockConfig(ConfigValues.HotPlugEnabled, "3.1", true));
@Mock
private VmDAO vmDAO;
@@ -170,6 +161,8 @@
vm.setVmOs(15); // rhel3x64
cretaeVirtIODisk();
when(osRepository.getOsName(15)).thenReturn("RHEL3x64");
+ when(osRepository.getDiskHotpluggableInterfaces(any(Integer.class),
+ any(Version.class))).thenReturn(new ArrayList<String>());
assertFalse(command.canDoAction());
assertTrue(command.getReturnValue()
.getCanDoActionMessages()
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java
index 39c91b7..454ab4e 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/VmInterfaceManagerTest.java
@@ -9,14 +9,12 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Before;
-import org.junit.ClassRule;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
@@ -28,7 +26,6 @@
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface;
import org.ovirt.engine.core.common.businessentities.network.VmNic;
-import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.osinfo.OsRepository;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
@@ -37,7 +34,6 @@
import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao;
import org.ovirt.engine.core.dao.network.VmNetworkStatisticsDao;
import org.ovirt.engine.core.dao.network.VmNicDao;
-import org.ovirt.engine.core.utils.MockConfigRule;
import org.ovirt.engine.core.utils.RandomUtils;
public class VmInterfaceManagerTest {
@@ -46,10 +42,6 @@
private final String VM_NAME = "vmName";
private final static Version VERSION_3_2 = new Version(3, 2);
private final static int OS_ID = 0;
-
- @ClassRule
- public static MockConfigRule mcr = new MockConfigRule(
- mockConfig(ConfigValues.HotPlugEnabled, VERSION_3_2.getValue(),
true));
@Mock
private MacPoolManager macPoolManager;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
index fc760dd..2f219a1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/FeatureSupported.java
@@ -81,15 +81,6 @@
/**
* @param version
* Compatibility version to check for.
- * @return <code>true</code> if hot plug is supported for the version,
<code>false</code> if it's not.
- */
- public static boolean hotPlug(Version version) {
- return supportedInConfig(ConfigValues.HotPlugEnabled, version);
- }
-
- /**
- * @param version
- * Compatibility version to check for.
* @return <code>true</code> if migration network is supported for the
version, <code>false</code> if it's not.
*/
public static boolean migrationNetwork(Version version) {
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 8fdcc4b..f8fc435 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
@@ -898,15 +898,6 @@
@DefaultValueAttribute("OVIRT")
OriginType(336),
- @TypeConverterAttribute(Boolean.class)
- @DefaultValueAttribute("false")
- HotPlugEnabled(337),
-
- @Reloadable
- @TypeConverterAttribute(String.class)
- @DefaultValueAttribute("")
- HotPlugUnsupportedOsList(338),
-
@Reloadable
@TypeConverterAttribute(Boolean.class)
@DefaultValueAttribute("false")
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
index b6a584f..29ada66 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java
@@ -652,7 +652,6 @@
MOVE_VM_CLUSTER_MISSING_NETWORK(ErrorType.CONFLICT),
ACTION_TYPE_FAILED_STORAGE_POOL_WITH_DEFAULT_VDS_GROUP_CANNOT_BE_LOCALFS(ErrorType.CONFLICT),
DEFAULT_CLUSTER_CANNOT_BE_ON_LOCALFS(ErrorType.CONFLICT),
- HOT_PLUG_IS_NOT_SUPPORTED(ErrorType.NOT_SUPPORTED),
UNLINKING_IS_NOT_SUPPORTED(ErrorType.NOT_SUPPORTED),
NULL_NETWORK_IS_NOT_SUPPORTED(ErrorType.NOT_SUPPORTED),
ACTION_TYPE_FAILED_NETWORK_QOS_IS_NOT_SUPPORTED(ErrorType.NOT_SUPPORTED),
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
index 6cfa364..11dbf4e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ConfigurationValues.java
@@ -65,7 +65,6 @@
OvfItemsCountPerUpdate,
ProductRPMVersion(ConfigAuthType.User),
RhevhLocalFSPath,
- HotPlugEnabled(ConfigAuthType.User),
NetworkLinkingSupported(ConfigAuthType.User),
SupportBridgesReportByVDSM(ConfigAuthType.User),
ManagementNetwork,
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
index b10ad2d..afae27a 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -840,7 +840,6 @@
USER_CANNOT_BE_ADDED_TO_VM=User cannot be added to VM
USER_CANNOT_BE_ADDED_TO_VM_POOL=User cannot be added to VM-Pool
ACTION_TYPE_FAILED_DETECTED_PINNED_VMS=Cannot ${action} ${type}. The following
VMs are set to run specifically only on this Host: ${VmNames}.\nIn order to
${action} ${type}, you need to remove the association between the VMs and the
Host (Using Edit VM properties).
-HOT_PLUG_IS_NOT_SUPPORTED=Activate/Deactivate while VM is running, is only
supported for Clusters of version 3.1 and above.
UNLINKING_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Link state is set to
'Down' on the virtual machine's interface, this is not supported for clusters
of version ${clusterVersion}.
NULL_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. There is no network on
the virtual machine's interface, this is not supported for clusters of version
${clusterVersion}.
ACTION_TYPE_FAILED_NETWORK_QOS_IS_NOT_SUPPORTED=Cannot ${action} ${type}.
There is Network QoS on the profile, this is not supported for clusters of
version ${clusterVersion}.
diff --git
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
index aae66ad..7823a85 100644
---
a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
+++
b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
@@ -2266,9 +2266,6 @@
@DefaultStringValue("Cannot ${action} ${type}. The following VMs are set
to run specifically only on this Host: ${VmNames}.\nIn order to ${action}
${type}, you need to remove the association between the VMs and the Host (Using
Edit VM properties).")
String ACTION_TYPE_FAILED_DETECTED_PINNED_VMS();
- @DefaultStringValue("Activate/Deactivate while VM is running, is only
supported for Clusters of version 3.1 and above.")
- String HOT_PLUG_IS_NOT_SUPPORTED();
-
@DefaultStringValue("Cannot ${action} ${type}. Link state is set to 'Down'
on the virtual machine's interface, this is not supported for clusters of
version ${clusterVersion}.")
String UNLINKING_IS_NOT_SUPPORTED();
diff --git
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index e54c94b..30d618f 100644
---
a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -818,7 +818,6 @@
USER_CANNOT_BE_ADDED_TO_VM=User cannot be added to VM
USER_CANNOT_BE_ADDED_TO_VM_POOL=User cannot be added to VM-Pool
ACTION_TYPE_FAILED_DETECTED_PINNED_VMS=Cannot ${action} ${type}. The following
VMs are set to run specifically only on this Host: ${VmNames}.\nIn order to
${action} ${type}, you need to remove the association between the VMs and the
Host (Using Edit VM properties).
-HOT_PLUG_IS_NOT_SUPPORTED=Activate/Deactivate while VM is running, is only
supported for Clusters of version 3.1 and above.
UNLINKING_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Link state is set to
'Down' on the virtual machine's interface, this is not supported for clusters
of version ${clusterVersion}.
NULL_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. There is no network on
the virtual machine's interface, this is not supported for clusters of version
${clusterVersion}.
ACTION_TYPE_FAILED_NETWORK_QOS_IS_NOT_SUPPORTED=Cannot ${action} ${type}.
There is Network QoS on the profile, this is not supported for clusters of
version ${clusterVersion}.
diff --git
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
index 1ee8ea9..5353fb5 100644
---
a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
+++
b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
@@ -840,7 +840,6 @@
USER_CANNOT_BE_ADDED_TO_VM=User cannot be added to VM
USER_CANNOT_BE_ADDED_TO_VM_POOL=User cannot be added to VM-Pool
ACTION_TYPE_FAILED_DETECTED_PINNED_VMS=Cannot ${action} ${type}. The following
VMs are set to run specifically only on this Host: ${VmNames}.\nIn order to
${action} ${type}, you need to remove the association between the VMs and the
Host (Using Edit VM properties).
-HOT_PLUG_IS_NOT_SUPPORTED=Activate/Deactivate while VM is running, is only
supported for Clusters of version 3.1 and above.
UNLINKING_IS_NOT_SUPPORTED=Cannot ${action} ${type}. Link state is set to
'Down' on the virtual machine's interface, this is not supported for clusters
of version ${clusterVersion}.
NULL_NETWORK_IS_NOT_SUPPORTED=Cannot ${action} ${type}. There is no network on
the virtual machine's interface, this is not supported for clusters of version
${clusterVersion}.
ACTION_TYPE_FAILED_NETWORK_QOS_IS_NOT_SUPPORTED=Cannot ${action} ${type}.
There is Network QoS on the profile, this is not supported for clusters of
version ${clusterVersion}.
diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index a02d727..5f8a244 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -157,10 +157,6 @@
select
fn_db_add_config_value('HighUtilizationForEvenlyDistribute','75','general');
select fn_db_add_config_value('HighUtilizationForPowerSave','75','general');
select fn_db_add_config_value('HostTimeDriftInSec','300','general');
-select fn_db_add_config_value('HotPlugEnabled','false','3.0');
-select fn_db_add_config_value('HotPlugEnabled','true','3.1');
-select fn_db_add_config_value('HotPlugEnabled','true','3.2');
-select fn_db_add_config_value('HotPlugEnabled','true','3.3');
select fn_db_add_config_value('MigrationSupportForNativeUsb','false','3.0');
select fn_db_add_config_value('MigrationSupportForNativeUsb','false','3.1');
select fn_db_add_config_value('MigrationSupportForNativeUsb','true','3.2');
@@ -170,7 +166,6 @@
select fn_db_add_config_value('NetworkLinkingSupported','true','3.2');
select fn_db_add_config_value('NetworkLinkingSupported','true','3.3');
select fn_db_add_config_value('DisconnectPoolOnReconstruct','0,2','general');
-select fn_db_add_config_value('HotPlugUnsupportedOsList','','general');
select fn_db_add_config_value('InitStorageSparseSizeInGB','1','general');
select fn_db_add_config_value('TunnelMigrationEnabled','false','3.0');
select fn_db_add_config_value('TunnelMigrationEnabled','false','3.1');
--
To view, visit http://gerrit.ovirt.org/19758
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8c38a8ecbbc56fc8ef70c6e45732225ce96ba1f0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gustavo Frederico Temple Pedrosa <gustavo.pedr...@eldorado.org.br>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
