diff options
author | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2016-08-24 11:14:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-24 11:14:44 +0000 |
commit | a1a518a774a3a4e0332eb1f1644d97a5a29382e4 (patch) | |
tree | 3b8fa74627ce08ca4fbac7d7a2b720daec5dc063 /test_cases/default/compute | |
parent | 6c24c80943a59ac224fc89bb4aaacdb898b1dbcd (diff) | |
parent | 012bae528a6981f6d7fb2be3b46756d3fad0239f (diff) |
Merge "Use test_case/default instead of the directory named with a pod's name."
Diffstat (limited to 'test_cases/default/compute')
-rw-r--r-- | test_cases/default/compute/dhrystone_bm.yaml | 4 | ||||
-rw-r--r-- | test_cases/default/compute/dpi_bm.yaml | 12 | ||||
-rw-r--r-- | test_cases/default/compute/ramspeed_bm.yaml | 5 | ||||
-rw-r--r-- | test_cases/default/compute/ssl_bm.yaml | 10 | ||||
-rw-r--r-- | test_cases/default/compute/whetstone_bm.yaml | 5 |
5 files changed, 17 insertions, 19 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: |