Support to config external network by shell env

Example invocation:
	$ export EXTERNAL_NETWORK=net04_ext
	$ yardstick task start samples/ping.yaml

The default external network is "net04_ext"

external_net should not be possible set in yaml anymore.

JIRA: YARDSTICK-54

Change-Id: I8c7b2850801f312c6878e9a363b06cdc8ade09bf
Signed-off-by: QiLiang <liangqi1@huawei.com>

diff --git a/samples/fio-template.yaml b/samples/fio-template.yaml
index 940446b..395e4c4 100644 (file)
--- a/samples/fio-template.yaml
+++ b/samples/fio-template.yaml
@@ -36,5 +36,4 @@ context:
   networks:
     test:
       cidr: "10.0.1.0/24"
-      external_network: "net04_ext"
 

diff --git a/samples/fio.yaml b/samples/fio.yaml
index be82227..44444c7 100644 (file)
--- a/samples/fio.yaml
+++ b/samples/fio.yaml
@@ -73,4 +73,3 @@ context:
   networks:
     test:
       cidr: "10.0.1.0/24"
-      external_network: "net04_ext"

diff --git a/samples/iperf3.yaml b/samples/iperf3.yaml
index b3a7a9f..8de4467 100644 (file)
--- a/samples/iperf3.yaml
+++ b/samples/iperf3.yaml
@@ -40,5 +40,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/lmbench.yaml b/samples/lmbench.yaml
index c7526c0..256d8c6 100644 (file)
--- a/samples/lmbench.yaml
+++ b/samples/lmbench.yaml
@@ -41,6 +41,5 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
 

diff --git a/samples/perf.yaml b/samples/perf.yaml
index e7ba2d0..b6ce2a2 100644 (file)
--- a/samples/perf.yaml
+++ b/samples/perf.yaml
@@ -40,4 +40,3 @@ context:
   networks:
     test:
       cidr: "10.0.1.0/24"
-      external_network: "net04_ext"

diff --git a/samples/ping-ext-ip.yaml b/samples/ping-ext-ip.yaml
index f2923f6..d36c295 100644 (file)
--- a/samples/ping-ext-ip.yaml
+++ b/samples/ping-ext-ip.yaml
@@ -32,5 +32,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/ping-ext-stimuli.yaml b/samples/ping-ext-stimuli.yaml
index cfe7915..451f010 100644 (file)
--- a/samples/ping-ext-stimuli.yaml
+++ b/samples/ping-ext-stimuli.yaml
@@ -45,5 +45,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/ping-iteration.yaml b/samples/ping-iteration.yaml
index 810530c..a5e9094 100755 (executable)
--- a/samples/ping-iteration.yaml
+++ b/samples/ping-iteration.yaml
@@ -41,5 +41,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/ping-multiple-context.yaml b/samples/ping-multiple-context.yaml
index c529fcc..1c27e1b 100644 (file)
--- a/samples/ping-multiple-context.yaml
+++ b/samples/ping-multiple-context.yaml
@@ -36,7 +36,6 @@ contexts:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 -
   name: demo2
   image: cirros-0.3.3
@@ -52,5 +51,4 @@ contexts:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/ping-option-list.yaml b/samples/ping-option-list.yaml
index 1fa95e6..30d133e 100644 (file)
--- a/samples/ping-option-list.yaml
+++ b/samples/ping-option-list.yaml
@@ -39,6 +39,5 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
 

diff --git a/samples/ping-parallel.yaml b/samples/ping-parallel.yaml
index f3f6989..00d2613 100644 (file)
--- a/samples/ping-parallel.yaml
+++ b/samples/ping-parallel.yaml
@@ -53,5 +53,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/ping-serial.yaml b/samples/ping-serial.yaml
index ff281ee..37ea715 100644 (file)
--- a/samples/ping-serial.yaml
+++ b/samples/ping-serial.yaml
@@ -45,5 +45,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/ping-template.yaml b/samples/ping-template.yaml
index 3f10218..cde6ddd 100644 (file)
--- a/samples/ping-template.yaml
+++ b/samples/ping-template.yaml
@@ -45,5 +45,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/ping.yaml b/samples/ping.yaml
index f8b6a31..845d10d 100644 (file)
--- a/samples/ping.yaml
+++ b/samples/ping.yaml
@@ -41,5 +41,4 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 

diff --git a/samples/pktgen.yaml b/samples/pktgen.yaml
index 6097308..11d6279 100644 (file)
--- a/samples/pktgen.yaml
+++ b/samples/pktgen.yaml
@@ -47,6 +47,5 @@ context:
   networks:
     test:
       cidr: '10.0.1.0/24'
-      external_network: "net04_ext"
 
 

diff --git a/yardstick/cmd/commands/task.py b/yardstick/cmd/commands/task.py
index f49a258..6e117ed 100755 (executable)
--- a/yardstick/cmd/commands/task.py
+++ b/yardstick/cmd/commands/task.py
@@ -135,6 +135,10 @@ class TaskParser(object):
             context_cfgs = cfg["contexts"]
 
         for cfg_attrs in context_cfgs:
+            # config external_network based on env var
+            for _, attrs in cfg_attrs["networks"].items():
+                attrs["external_network"] = os.environ.get('EXTERNAL_NETWORK',
+                                                           'net04_ext')
             context = Context()
             context.init(cfg_attrs)