Get VIRT_NUMBER from DHA file

JIRA: COMPASS-611

Change-Id: I498ea9517ff4f29c0369b8339b5e625c4131bd00
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf
index dcee7d3..f49f0c6 100644 (file)
--- a/deploy/conf/virtual.conf
+++ b/deploy/conf/virtual.conf
@@ -1,4 +1,3 @@
-export VIRT_NUMBER=${VIRT_NUMBER:-5}
 export VIRT_CPUS=${VIRT_CPUS:-8}
 export VIRT_MEM=${VIRT_MEM:-16384}
 export VIRT_DISK=${VIRT_DISK:-200G}

diff --git a/deploy/config_parse.py b/deploy/config_parse.py
index 3ee0d86..9cdf1ac 100644 (file)
--- a/deploy/config_parse.py
+++ b/deploy/config_parse.py
@@ -127,6 +127,9 @@ def export_dha_file(dha, dha_file, ofile):
     if len(value) > 0:
         env.update({'HOST_MACS': value})
 
+    if dha.get('TYPE', "virtual") == "virtual":
+        env.update({'VIRT_NUMBER': len(dha['hosts'])})
+
     export_env_dict(env, ofile)