diff options
| -rw-r--r-- | dashboard/pushtoDB.py | 2 | ||||
| -rw-r--r-- | test_cases/default/compute/dhrystone_bm.yaml | 12 | ||||
| -rw-r--r-- | test_cases/default/compute/ramspeed_bm.yaml | 14 | ||||
| -rw-r--r-- | test_cases/default/network/iperf_bm.yaml | 6 | ||||
| -rw-r--r-- | test_cases/default/network/iperf_vm.yaml | 4 |
5 files changed, 18 insertions, 20 deletions
diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py index d9d48f5a..d056c18b 100644 --- a/dashboard/pushtoDB.py +++ b/dashboard/pushtoDB.py @@ -42,7 +42,7 @@ def main(): global payload_list
populate_payload(suite_list)
for suite,case in payload_list.items():
- with open('results/'+suite,'r') as result_file:
+ with open('results/'+suite,'r') as result_file:
j=json.load(result_file)
push_results_to_db(TEST_DB, case , j)
diff --git a/test_cases/default/compute/dhrystone_bm.yaml b/test_cases/default/compute/dhrystone_bm.yaml index 526a5717..ff17ea4d 100644 --- a/test_cases/default/compute/dhrystone_bm.yaml +++ b/test_cases/default/compute/dhrystone_bm.yaml @@ -1,22 +1,22 @@ - + Scenario: benchmark: dhrystone host: machine_1, machine_2 - server: + server: Context: Host_Machines: machine_1: ip: 10.20.0.6 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - + Virtual_Machines: + Test_Description: Test_category: "Compute" @@ -31,5 +31,3 @@ Test_Description: OS_image: flavor: role: ''' - - diff --git a/test_cases/default/compute/ramspeed_bm.yaml b/test_cases/default/compute/ramspeed_bm.yaml index a8d2cbfe..ce6d8921 100644 --- a/test_cases/default/compute/ramspeed_bm.yaml +++ b/test_cases/default/compute/ramspeed_bm.yaml @@ -1,22 +1,22 @@ - + Scenario: benchmark: ramspeed host: machine_1, machine_2 - server: + server: Context: Host_Machines: machine_1: ip: 10.20.0.6 - pw: + pw: role: host machine_2: ip: 10.20.0.5 pw: role: host - Virtual_Machines: - + Virtual_Machines: + Test_Description: Test_category: "Compute" @@ -31,5 +31,5 @@ Test_Description: OS_image: flavor: role: ''' - - + + diff --git a/test_cases/default/network/iperf_bm.yaml b/test_cases/default/network/iperf_bm.yaml index 6baad150..b0410d4e 100644 --- a/test_cases/default/network/iperf_bm.yaml +++ b/test_cases/default/network/iperf_bm.yaml @@ -20,7 +20,7 @@ Context: role: 1-server Virtual_Machines: - + Test_Description: Test_category: "network" Benchmark: "iperf" @@ -33,7 +33,7 @@ Test_Description: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute2 @@ -41,7 +41,7 @@ Test_Description: public_network: 'net04_ext' role: 2-host flavor: m1.large - + machine_1: ip: pw: diff --git a/test_cases/default/network/iperf_vm.yaml b/test_cases/default/network/iperf_vm.yaml index 39ec0881..d1cda0b4 100644 --- a/test_cases/default/network/iperf_vm.yaml +++ b/test_cases/default/network/iperf_vm.yaml @@ -5,7 +5,7 @@ Scenario: client: virtualmachine_2 description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: - duration: 20 + duration: 20 protocol: tcp bandwidthGbps: 0 @@ -18,7 +18,7 @@ Context: OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server - flavor: m1.large + flavor: m1.large virtualmachine_2: availability_zone: compute4 |