Yevgeny Zaspitsky has uploaded a new change for review.

Change subject: engine: Change ManagementNetwork to DefaultManagementNetwork
......................................................................

engine: Change ManagementNetwork to DefaultManagementNetwork

Change option name from ManagementNetwork to DefaultManagementNetwork:
1. DB - update script was added
2. backend code was updated accordingly
3. ConfigurationValues enum and the UI code that relates to that were
updated too in order to keep tests pass. UI logic related to the
management network remained unchanged in this patch, it will be updated
in the upcoming patches.

Change-Id: Ic36e4c7bf50d307efaf6d259be99c52bc3ef8e26
Signed-off-by: Yevgeny Zaspitsky <[email protected]>
---
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommandTest.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
M 
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.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/queries/ConfigurationValues.java
M 
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
M 
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.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/datacenters/DataCenterNetworkListModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewProfileBehavior.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
M packaging/dbscripts/network_sp.sql
A 
packaging/dbscripts/upgrade/03_06_0440_update_management_network_vdc_option.sql
20 files changed, 24 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/32810/10

diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
index f74cccc..e1d7b12 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SetupNetworksParametersTest.java
@@ -19,7 +19,7 @@
 public class SetupNetworksParametersTest {
 
     @ClassRule
-    public static MockConfigRule mcr = new 
MockConfigRule(mockConfig(ConfigValues.ManagementNetwork, "ovirtmgmt"),
+    public static MockConfigRule mcr = new 
MockConfigRule(mockConfig(ConfigValues.DefaultManagementNetwork, "ovirtmgmt"),
             mockConfig(ConfigValues.NetworkConnectivityCheckTimeoutInSeconds, 
100));
 
     @Test
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommandTest.java
index 410c897..ef38b76 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/cluster/AttachNetworkToVdsGroupCommandTest.java
@@ -39,7 +39,7 @@
 
     @Rule
     public MockConfigRule mcr = new MockConfigRule(
-            MockConfigRule.mockConfig(ConfigValues.ManagementNetwork, "mgmt"));
+            MockConfigRule.mockConfig(ConfigValues.DefaultManagementNetwork, 
"mgmt"));
 
     @Mock
     NetworkClusterDao networkClusterDAO;
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
index 4af6322..9ae472f 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelperTest.java
@@ -53,7 +53,7 @@
     private static final int DEFAULT_MTU = 1500;
 
     @ClassRule
-    public static MockConfigRule mcr = new 
MockConfigRule(mockConfig(ConfigValues.ManagementNetwork,
+    public static MockConfigRule mcr = new 
MockConfigRule(mockConfig(ConfigValues.DefaultManagementNetwork,
             MANAGEMENT_NETWORK_NAME),
             mockConfig(ConfigValues.MultipleGatewaysSupported, 
Version.v3_3.toString(), true),
             mockConfig(ConfigValues.MultipleGatewaysSupported, 
Version.v3_2.toString(), false),
diff --git 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
index e7ed423..c418250 100644
--- 
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
+++ 
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/UpdateStoragePoolCommandTest.java
@@ -97,7 +97,7 @@
         doReturn(validator).when(cmd).createStoragePoolValidator();
 
         mcr.mockConfigValue(ConfigValues.AutoRegistrationDefaultVdsGroupID, 
DEFAULT_VDS_GROUP_ID);
-        mcr.mockConfigValue(ConfigValues.ManagementNetwork, "test_mgmt");
+        mcr.mockConfigValue(ConfigValues.DefaultManagementNetwork, 
"test_mgmt");
         mcr.mockConfigValue(ConfigValues.NonVmNetworkSupported, false);
         mcr.mockConfigValue(ConfigValues.MTUOverrideSupported, false);
     }
@@ -329,7 +329,7 @@
 
     private void addManagementNetworkToPool() {
         Network network = new Network();
-        network.setName(Config.<String> 
getValue(ConfigValues.ManagementNetwork));
+        network.setName(Config.<String> 
getValue(ConfigValues.DefaultManagementNetwork));
         List<Network> networks = new ArrayList<>();
         networks.add(network);
         
when(networkDao.getAllForDataCenter(any(Guid.class))).thenReturn(networks);
@@ -343,7 +343,7 @@
 
     private void addNetworkToPool() {
         Network network = new Network();
-        network.setName(Config.<String> 
getValue(ConfigValues.ManagementNetwork) + "2");
+        network.setName(Config.<String> 
getValue(ConfigValues.DefaultManagementNetwork) + "2");
         List<Network> networks = new ArrayList<>();
         networks.add(network);
         
when(networkDao.getAllForDataCenter(any(Guid.class))).thenReturn(networks);
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 ef4bd46..c10465f 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
@@ -921,7 +921,7 @@
     @Reloadable
     @TypeConverterAttribute(String.class)
     @DefaultValueAttribute("ovirtmgmt")
-    ManagementNetwork,
+    DefaultManagementNetwork,
 
     @Reloadable
     @TypeConverterAttribute(String.class)
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 abccfae..d1edc35 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
@@ -72,7 +72,7 @@
     HotPlugCpuSupported(ConfigAuthType.User),
     NetworkLinkingSupported(ConfigAuthType.User),
     SupportBridgesReportByVDSM(ConfigAuthType.User),
-    ManagementNetwork,
+    DefaultManagementNetwork,
     ApplicationMode(ConfigAuthType.User),
     ShareableDiskEnabled(ConfigAuthType.User),
     DirectLUNDiskEnabled(ConfigAuthType.User),
diff --git 
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
 
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
index 7997b63..14ec805 100644
--- 
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
+++ 
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MTUValidatorTest.java
@@ -28,7 +28,7 @@
         validator = ValidationUtils.getValidator();
 
         IConfigUtilsInterface confUtils = mock(IConfigUtilsInterface.class);
-        when(confUtils.getValue(ConfigValues.ManagementNetwork, 
ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MANAGEMENT_NETWORK);
+        when(confUtils.getValue(ConfigValues.DefaultManagementNetwork, 
ConfigCommon.defaultConfigurationVersion)).thenReturn(TEST_MANAGEMENT_NETWORK);
         Config.setConfigUtils(confUtils);
     }
 
diff --git 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
index 4badf9e..409ef2e 100644
--- 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
+++ 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/NetworkUtils.java
@@ -22,7 +22,7 @@
     public static final String OS_REFERENCE_TO_MACHINE_NAME = "HOSTNAME";
 
     public static String getEngineNetwork() {
-        return Config.<String> getValue(ConfigValues.ManagementNetwork);
+        return Config.<String> getValue(ConfigValues.DefaultManagementNetwork);
     }
 
     public static Integer getDefaultMtu() {
diff --git 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
index 180144a..507e6b4 100644
--- 
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
+++ 
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
@@ -29,7 +29,7 @@
 
     @Rule
     public MockConfigRule mcr = new MockConfigRule(
-            MockConfigRule.mockConfig(ConfigValues.ManagementNetwork, 
MANAGEMENT_NETWORK),
+            MockConfigRule.mockConfig(ConfigValues.DefaultManagementNetwork, 
MANAGEMENT_NETWORK),
             MockConfigRule.mockConfig(ConfigValues.DefaultMTU, DEFAULT_MTU));
 
     @Test
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 ecceab7..9da1ada 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
@@ -2584,7 +2584,7 @@
      */
     public void getManagementNetworkName(AsyncQuery aQuery) {
         getConfigFromCache(
-                new 
GetConfigurationValueParameters(ConfigurationValues.ManagementNetwork,
+                new 
GetConfigurationValueParameters(ConfigurationValues.DefaultManagementNetwork,
                         getDefaultConfigurationVersion()),
                 aQuery);
     }
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java
index e1fb2d7..8cda28a 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java
@@ -79,7 +79,7 @@
     public DataCenterNetworkListModel()
     {
         // get management network name
-        ENGINE_NETWORK = (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+        ENGINE_NETWORK = (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
         
setTitle(ConstantsManager.getInstance().getConstants().logicalNetworksTitle());
         setHelpTag(HelpTag.logical_networks);
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
index a5d226d..3f79d3c 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
@@ -53,7 +53,7 @@
     private static final String CMD_APPROVE = "OnApprove"; //$NON-NLS-1$
     private static final String CMD_ABORT = "OnAbort"; //$NON-NLS-1$
     protected static final String ENGINE_NETWORK =
-            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
     private EntityModel<String> privateName;
     private EntityModel<String> privateDescription;
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
index 49c1c65..bee0ce8 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
@@ -57,7 +57,7 @@
 {
 
     public static final String ENGINE_NETWORK_NAME =
-            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
     private UICommand privateEditCommand;
 
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
index e75ac0b..2c9e2fc 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java
@@ -13,7 +13,7 @@
 public class NetworkGeneralModel extends EntityModel
 {
     private final String ENGINE_NETWORK_NAME =
-            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
     private String name;
     private String role;
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
index aaa505d..1a01941 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java
@@ -39,7 +39,7 @@
 public class NetworkListModel extends ListWithDetailsModel implements 
ISupportSystemTreeContext
 {
     private static String ENGINE_NETWORK =
-            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
     private UICommand newCommand;
     private UICommand importCommand;
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewProfileBehavior.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewProfileBehavior.java
index ee493c9..e700987 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewProfileBehavior.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewProfileBehavior.java
@@ -12,7 +12,7 @@
 public class NewProfileBehavior extends ProfileBehavior {
 
     public static final String ENGINE_NETWORK_NAME =
-            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
     @Override
     public void initSelectedProfile(ListModel profileList, VmNetworkInterface 
networkInterface) {
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
index 6b75b58..5af03a1 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceModel.java
@@ -79,7 +79,7 @@
         this.profileBehavior = profileBehavior;
         // get management network name
         ENGINE_NETWORK_NAME =
-                (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+                (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
         this.vm = vm;
         this.vmNicList = vmNicList;
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
index 6bd2bf5..96285a8 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java
@@ -38,7 +38,7 @@
     }
 
     private final String ENGINE_NETWORK_NAME =
-            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.ManagementNetwork);
+            (String) 
AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigurationValues.DefaultManagementNetwork);
 
     private final ApplicationConstants constants;
 
diff --git a/packaging/dbscripts/network_sp.sql 
b/packaging/dbscripts/network_sp.sql
index 1ac163d..23faffe 100644
--- a/packaging/dbscripts/network_sp.sql
+++ b/packaging/dbscripts/network_sp.sql
@@ -1310,8 +1310,8 @@
 DECLARE
     v_old_name  varchar(4000);
 BEGIN
-    select option_value into v_old_name from vdc_options where option_name = 
'ManagementNetwork' and version = 'general';
-    perform fn_db_update_config_value('ManagementNetwork', v_name, 'general');
+    select option_value into v_old_name from vdc_options where option_name = 
'DefaultManagementNetwork' and version = 'general';
+    perform fn_db_update_config_value('DefaultManagementNetwork', v_name, 
'general');
     update network set name = v_name where name = v_old_name;
     update vnic_profiles set name = v_name where name = v_old_name;
 END; $procedure$
diff --git 
a/packaging/dbscripts/upgrade/03_06_0440_update_management_network_vdc_option.sql
 
b/packaging/dbscripts/upgrade/03_06_0440_update_management_network_vdc_option.sql
new file mode 100644
index 0000000..da7780f
--- /dev/null
+++ 
b/packaging/dbscripts/upgrade/03_06_0440_update_management_network_vdc_option.sql
@@ -0,0 +1,2 @@
+select fn_db_rename_config_key('ManagementNetwork', 
'DefaultManagementNetwork', 'genenral');
+


-- 
To view, visit http://gerrit.ovirt.org/32810
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic36e4c7bf50d307efaf6d259be99c52bc3ef8e26
Gerrit-PatchSet: 10
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yevgeny Zaspitsky <[email protected]>
Gerrit-Reviewer: Alona Kaplan <[email protected]>
Gerrit-Reviewer: Eli Mesika <[email protected]>
Gerrit-Reviewer: Moti Asayag <[email protected]>
Gerrit-Reviewer: Yevgeny Zaspitsky <[email protected]>
Gerrit-Reviewer: [email protected]
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to