[Engine-patches] Change in ovirt-engine[master]: engine: adding "NetworkMigrationEnabled" to vdc_options.

[alkaplan]

Alona Kaplan has uploaded a new change for review.

Change subject: engine: adding "NetworkMigrationEnabled" to vdc_options.
......................................................................

engine: adding "NetworkMigrationEnabled" to vdc_options.

Migration network is 3.3 feature.
Each cluster can have one migration network.
If a network is signed as a "migration network" the vm migration inside
the cluster will be done via this network.
If there is no  migration network the migration proccess will be done via
the managment network.

Change-Id: Ib553b8ac2c2015659c59c8cddfd2329530133b30
Signed-off-by: Alona Kaplan <alkap...@redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
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/queries/ConfigurationValues.java
4 files changed, 19 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/13369/1

diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql 
b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
index b1741f4..42500eb 100644
--- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -153,6 +153,10 @@
 select fn_db_add_config_value('TunnelMigrationEnabled','false','3.1');
 select fn_db_add_config_value('TunnelMigrationEnabled','false','3.2');
 select fn_db_add_config_value('TunnelMigrationEnabled','true','3.3');
+select fn_db_add_config_value('MigrationNetworkEnabled','false','3.0');
+select fn_db_add_config_value('MigrationNetworkEnabled','false','3.1');
+select fn_db_add_config_value('MigrationNetworkEnabled','false','3.2');
+select fn_db_add_config_value('MigrationNetworkEnabled','true','3.3');
 
 -- by default use no proxy
 select fn_db_add_config_value('SpiceProxyDefault','','general');
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 57b9fc7..29ef0fe 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
@@ -86,4 +86,13 @@
     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) {
+        return supportedInConfig(ConfigValues.MigrationNetworkEnabled, 
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 d14a482..467b9ab 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
@@ -1343,6 +1343,10 @@
     @DefaultValueAttribute("Auto")
     ClientConsoleModeDefault(501),
 
+    @TypeConverterAttribute(Boolean.class)
+    @DefaultValueAttribute("false")
+    MigrationNetworkEnabled(502),
+
     Invalid(65535);
 
     private int intValue;
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 836ea6d..6775921 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
@@ -81,7 +81,8 @@
     GlusterVolumeOptionOwnerGroupVirtValue,
     CpuPinningEnabled,
     CpuPinMigrationEnabled,
-    MigrationSupportForNativeUsb(ConfigAuthType.User)
+    MigrationSupportForNativeUsb(ConfigAuthType.User),
+    MigrationNetworkEnabled(ConfigAuthType.User),
     ;
 
     public static enum ConfigAuthType {


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib553b8ac2c2015659c59c8cddfd2329530133b30
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