aboutsummaryrefslogtreecommitdiffstats
path: root/test_cases
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2016-08-24 11:14:44 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-24 11:14:44 +0000
commita1a518a774a3a4e0332eb1f1644d97a5a29382e4 (patch)
tree3b8fa74627ce08ca4fbac7d7a2b720daec5dc063 /test_cases
parent6c24c80943a59ac224fc89bb4aaacdb898b1dbcd (diff)
parent012bae528a6981f6d7fb2be3b46756d3fad0239f (diff)
Merge "Use test_case/default instead of the directory named with a pod's name."
Diffstat (limited to 'test_cases')
-rw-r--r--test_cases/default/compute/dhrystone_bm.yaml4
-rw-r--r--test_cases/default/compute/dpi_bm.yaml12
-rw-r--r--test_cases/default/compute/ramspeed_bm.yaml5
-rw-r--r--test_cases/default/compute/ssl_bm.yaml10
-rw-r--r--test_cases/default/compute/whetstone_bm.yaml5
-rw-r--r--test_cases/default/network/iperf_bm.yaml8
-rw-r--r--test_cases/default/network/netperf.yaml42
-rw-r--r--test_cases/default/storage/fio_bm.yaml8
8 files changed, 25 insertions, 69 deletions
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