Merge "Use test_case/default instead of the directory named with a pod's name."

9 files changed, 31 insertions, 75 deletions

diff --git a/docker/run_qtip.sh b/docker/run_qtip.sh
index a4729c06..37eb0ea7 100755
--- a/docker/run_qtip.sh
+++ b/docker/run_qtip.sh
@@ -10,25 +10,25 @@ cd ${QTIP_DIR}  &&  source get_env_info.sh \
 source ${QTIP_DIR}/opnfv-creds.sh
 
 if [ "$TEST_CASE" == "compute" ]; then
-    cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f compute
+    cd ${QTIP_DIR}  && python qtip.py -l default -f compute
     cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py
 fi
 
 if [ "$TEST_CASE" == "storage" ]; then
-    cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f storage
+    cd ${QTIP_DIR}  && python qtip.py -l default -f storage
     cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py
 fi
 
 if [ "$TEST_CASE" == "network" ]; then
-    cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f network
+    cd ${QTIP_DIR}  && python qtip.py -l default -f network
     cd ${QTIP_DIR}/data/ref_results/ && python network_suite.py
 fi
 
 
 if [ "$TEST_CASE" == "all" ]; then
-    cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f compute
-    cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f storage
-    cd ${QTIP_DIR}  && python qtip.py -l ${NODE_NAME} -f network
+    cd ${QTIP_DIR}  && python qtip.py -l default -f compute
+    cd ${QTIP_DIR}  && python qtip.py -l default -f storage
+    cd ${QTIP_DIR}  && python qtip.py -l default -f network
 
     cd ${QTIP_DIR}/data/ref_results/ && python compute_suite.py
     cd ${QTIP_DIR}/data/ref_results/ && python storage_suite.py
diff --git a/test_cases/default/compute/dhrystone_bm.yaml b/test_cases/default/compute/dhrystone_bm.yaml
index ff17ea4d..64741537 100644
--- a/test_cases/default/compute/dhrystone_bm.yaml
+++ b/test_cases/default/compute/dhrystone_bm.yaml
@@ -7,11 +7,11 @@ Scenario:
 Context:
   Host_Machines:
     machine_1:
-      ip: 10.20.0.6
+      ip:
       pw:
       role: host
     machine_2:
-      ip: 10.20.0.5
+      ip:
       pw:
       role: host
 
diff --git a/test_cases/default/compute/dpi_bm.yaml b/test_cases/default/compute/dpi_bm.yaml
index 1bc534b3..14cb6d0d 100644
--- a/test_cases/default/compute/dpi_bm.yaml
+++ b/test_cases/default/compute/dpi_bm.yaml
@@ -5,13 +5,13 @@ Scenario:
 Context:
   Host_Machines:
      machine_1:
-       ip: 10.20.0.4
-       pw: Op3nStack
-       role: 1host
+       ip:
+       pw:
+       role: host
      machine_2:
-       ip: 10.20.0.5
-       pw: Op3nStack
-       role: 1host
+       ip:
+       pw:
+       role: host
   Virtual_Machines:
 Test_Description:
   Test_category: "Compute"
diff --git a/test_cases/default/compute/ramspeed_bm.yaml b/test_cases/default/compute/ramspeed_bm.yaml
index ce6d8921..ed8fc700 100644
--- a/test_cases/default/compute/ramspeed_bm.yaml
+++ b/test_cases/default/compute/ramspeed_bm.yaml
@@ -1,4 +1,3 @@
-
 Scenario:
   benchmark: ramspeed
   host: machine_1, machine_2
@@ -7,11 +6,11 @@ Scenario:
 Context:
   Host_Machines:
     machine_1:
-      ip: 10.20.0.6
+      ip:
       pw:
       role: host
     machine_2:
-      ip: 10.20.0.5
+      ip:
       pw:
       role: host
 
diff --git a/test_cases/default/compute/ssl_bm.yaml b/test_cases/default/compute/ssl_bm.yaml
index dc038822..cc5a8903 100644
--- a/test_cases/default/compute/ssl_bm.yaml
+++ b/test_cases/default/compute/ssl_bm.yaml
@@ -1,17 +1,17 @@
 Scenario:
   benchmark: ssl
-  1Run: machine_1,machine_2
+  host: machine_1,machine_2
 
 Context:
   Host_Machines:
     machine_1:
-      ip: 10.20.0.4
+      ip:
       pw:
-      role: 1Run
+      role: host
     machine_2:
-      ip: 10.20.0.5
+      ip:
       pw:
-      role: 1Run
+      role: host
   Virtual_Machines:
 
 
diff --git a/test_cases/default/compute/whetstone_bm.yaml b/test_cases/default/compute/whetstone_bm.yaml
index 180d4e51..3c128b60 100644
--- a/test_cases/default/compute/whetstone_bm.yaml
+++ b/test_cases/default/compute/whetstone_bm.yaml
@@ -1,4 +1,3 @@
-
 Scenario:
   benchmark: whetstone
   host: machine_1, machine_2
@@ -7,11 +6,11 @@ Scenario:
 Context:
   Host_Machines:
     machine_1:
-      ip: 10.20.0.4
+      ip:
       pw:
       role: host
     machine_2:
-      ip: 10.20.0.5
+      ip:
       pw:
       role: host
   Virtual_Machines:
diff --git a/test_cases/default/network/iperf_bm.yaml b/test_cases/default/network/iperf_bm.yaml
index b0410d4e..3aa8310d 100644
--- a/test_cases/default/network/iperf_bm.yaml
+++ b/test_cases/default/network/iperf_bm.yaml
@@ -11,13 +11,13 @@ Scenario:
 Context:
   Host_Machines:
     machine_1:
-        ip: 10.20.0.5
+        ip:
         pw:
-        role: 2-host
+        role: 1-server
     machine_2:
-        ip: 10.20.0.6
+        ip:
         pw:
-        role: 1-server
+        role: 2-host
 
   Virtual_Machines:
 
diff --git a/test_cases/default/network/netperf.yaml b/test_cases/default/network/netperf.yaml
deleted file mode 100644
index f4ce396b..00000000
--- a/test_cases/default/network/netperf.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-Scenario:
-  benchmark: netperf
-  topology: Client and Server on ONE compute
-  server : virtualmachine_1
-  client: virtualmachine_2
-  benchmark_details:
-    duration: 10
-    teststream: udp_stream
-
-Context:
-  Host_Machines:
-
-
-  Virtual_Machines:
-    virtualmachine_1:
-      availability_zone: compute2
-      OS_image: QTIP_CentOS
-      public_network: 'net04_ext'
-      role: 1-server
-      flavor: m1.large
-
-    virtualmachine_2:
-      availability_zone: compute2
-      OS_image: QTIP_CentOS
-      public_network: 'net04_ext'
-      role: 2-host
-      flavor: m1.large
-
-Test_Description:
-  Test_category: "network"
-  Benchmark: "netperf"
-  Overview: >
-        '''This test will run the NETPERF benchmark  on virutalmachine_1 and virtualmachine_2. On the\n
-         same compute node
-         if you wish to add a host machine add the following information under the Host_Machine tag
-
-        machine_1:
-          ip:
-          pw:
-          role:
-          '''
-
diff --git a/test_cases/default/storage/fio_bm.yaml b/test_cases/default/storage/fio_bm.yaml
index 3b0ce3af..d0001ea2 100644
--- a/test_cases/default/storage/fio_bm.yaml
+++ b/test_cases/default/storage/fio_bm.yaml
@@ -6,12 +6,12 @@ Scenario:
 Context:
   Host_Machines:
     machine_1:
-      ip: 10.20.0.7
-      pw: r00tme
+      ip:
+      pw:
       role: host
     machine_2:
-      ip: 10.20.0.6
-      pw: r00tme
+      ip:
+      pw:
       role: host