diff options
| author |   MofassirArif <Mofassir_Arif@dellteam.com> | 2016-01-15 04:29:23 -0800 |
|---|---|---|
| committer | MofassirArif <Mofassir_Arif@dellteam.com> | 2016-01-15 04:29:23 -0800 |
| commit | 9cff8cab939a91867f413d2ecdf09aa93f40bfc0 (patch) | |
| tree | 263024e6ca8034bfa23f73d7ef678328f18fb6ae | |
| parent | bec658afadacfeeca9fbfbe598ceb5c5601a3372 (diff) | |
bug fix in pushtodb
Change-Id: I2cba0a805275ebae8b79a968cc8d725dcc96504a
Signed-off-by: MofassirArif <Mofassir_Arif@dellteam.com>
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | dashboard/pushtoDB.py | 27 | ||||
| -rw-r--r-- | dashboard/qtip2dashboard.py | 97 | ||||
| -rw-r--r-- | data/hosts | 4 | ||||
| -rw-r--r-- | data/my_key.pem | 50 | ||||
| -rw-r--r-- | foo | 9 | ||||
| -rw-r--r-- | opnfv-creds.sh | 16 | ||||
| -rw-r--r-- | test_cases/default/compute/dhrystone_bm.yaml | 4 | ||||
| -rw-r--r-- | test_cases/default/compute/ramspeed_bm.yaml | 2 | ||||
| -rw-r--r-- | test_cases/default/network/iperf_bm.yaml | 4 | ||||
| -rw-r--r-- | test_cases/default/network/iperf_vm.yaml | 4 | ||||
| -rw-r--r-- | test_list/network | 2 |
12 files changed, 72 insertions, 152 deletions
@@ -1,11 +1,10 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ + *.py[cod] *$py.class # C extensions *.so - +benchmarks/* results/* # Distribution / packaging .Python diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py index b889f21c..d9d48f5a 100644 --- a/dashboard/pushtoDB.py +++ b/dashboard/pushtoDB.py @@ -7,24 +7,20 @@ TEST_DB = 'http://213.77.62.197' suite_list = [('compute_result.json', 'compute_test_suite'),('network_result.json', 'network_test_suite'),('storage_result.json', 'storage_test_suite')]
payload_list = { }
-def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us-testing-1"):
+def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us-testing-bm-1"):
url = db_url + "/results"
creation_date= str(datetime.datetime.utcnow().isoformat())
installer = os.environ['INSTALLER_TYPE']
- #pod_name = os.environ['NODE_NAME']
- print url
- print case_name
- print logger
- print pod_name
-
+ pod_name = os.environ['NODE_NAME']
+
params = {"project_name": "qtip", "case_name": case_name,
"pod_name": pod_name, "installer": installer, "creation_date": creation_date,
"version": "test" , "details": payload}
headers = {'Content-Type': 'application/json'}
- print params
-
+ print json.dumps(params)
+
try:
r = requests.post(url, data=json.dumps(params), headers=headers)
print r
@@ -32,26 +28,23 @@ def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us except:
print "Error:", sys.exc_info()[0]
return False
-
+
def populate_payload(suite_list):
global payload_list
for k,v in suite_list:
- print 'results/'+k
+
if os.path.isfile('results/'+str(k)):
payload_list[k]=v
-
- print payload_list
def main():
global payload_list
populate_payload(suite_list)
for suite,case in payload_list.items():
- with open('results/'+suite,'r') as result_file:
- j=result_file.read().rstrip()
-
- push_results_to_db(TEST_DB, 'Compute benchmark suite',j)
+ with open('results/'+suite,'r') as result_file:
+ j=json.load(result_file)
+ push_results_to_db(TEST_DB, case , j)
if __name__ == "__main__":
main()
diff --git a/dashboard/qtip2dashboard.py b/dashboard/qtip2dashboard.py deleted file mode 100644 index 3eab96cc..00000000 --- a/dashboard/qtip2dashboard.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/python - -############################################################################## -# Copyright (c) 2015 Dell Inc and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -asfdasd -def get_qtip_cases(): - """ - get the list of the supported test cases - TODO: update the list when adding a new test case for the dashboard - """ - return ["compute_test_suite","storage_test_suite","network_test_suite"] - - -def check_qtip_case_exist(case): - """ - check if the testcase exists - if the test case is not defined or not declared in the list - return False - """ - qtip_cases = get_qtip_cases() - - if (case is None or case not in qtip_cases): - return False - else: - return True - - -def format_qtip_for_dashboard(case, results): - """ - generic method calling the method corresponding to the test case - check that the testcase is properly declared first - then build the call to the specific method - """ - if check_qtip_case_exist(case): - res = format_common_for_dashboard(case, results) - else: - res = [] - print "Test cases not declared" - return res - -def format_common_for_dashboard(case, results): - """ - Common post processing - """ - test_data_description = case + " results for Dashboard" - test_data = [{'description': test_data_description}] - - graph_name = '' - if "network_test_suite" in case: - graph_name = "Throughput index" - else: - graph_name = "Index" - - # Graph 1: Rx fps = f(time) - # ******************************** - new_element = [] - for data in results: - new_element.append({'x': data['creation_date'], - 'y1': data['details']['index'], - }) - - test_data.append({'name': graph_name, - 'info': {'type': "graph", - 'xlabel': 'time', - 'y1label': 'Index Number'}, - 'data_set': new_element}) - - return test_data - - - - -############################ For local test ################################ -import os - -def _test(): - ans = [{'creation_date': '2015-09-12', 'project_name': 'qtip', 'version': 'test', 'pod_name': 'dell-us-testing-1', 'case_name': 'compute_test_suite', 'installer': 'fuel', 'details': {'index': '0.9'}}, - {'creation_date': '2015-09-33', 'project_name': 'qtip', 'version': 'test', 'pod_name': 'dell-us-testing-1', 'case_name': 'compute_test_suite', 'installer': 'fuel', 'details': {'index': '0.8'}}] - - result = format_qtip_for_dashboard("compute_test_suite", ans) - print result - - result = format_qtip_for_dashboard("storage_test_suite", ans) - print result - - result = format_qtip_for_dashboard("network_test_suite", ans) - print result - -if __name__ == '__main__': - _test()
\ No newline at end of file @@ -1,4 +1,4 @@ [2-host] -172.18.0.103 +172.18.0.124 [1-server] -172.18.0.104 +172.18.0.125 diff --git a/data/my_key.pem b/data/my_key.pem index e869cc22..12b24cfb 100644 --- a/data/my_key.pem +++ b/data/my_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- @@ -0,0 +1,9 @@ +results/compute_result.json +results/network_result.json +results/storage_result.json +{'compute_result.json': 'compute_test_suite'} +http://213.77.62.197/results +Compute benchmark suite +None +dell-us-testing-1 +{'project_name': 'qtip', 'creation_date': '2016-01-13T11:31:55.997833', 'version': 'test', 'pod_name': 'dell-us-testing-1', 'installer': 'fuel', 'case_name': 'Compute benchmark suite', 'details': '{\n "index": 0.8449014369484681, \n "suite results": {\n "DPI": {\n "1. Index": 0.9808497536945814, \n "2. Results": {\n "Baremetal1": {\n "1 Time of Report": "2016-01-06T10:29:03.293658", \n "2 System Information": {\n "1_Hostname": "node-41.domain.tld", \n "2_Product": "PowerEdge M620 serial: F1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.766 MHz Graphics", \n "6_CPU_Usage": "10.1%", \n "7_Memory Usage": "23284.2/112767.3MB", \n "8_Disk usage": "598.9GB (5.7% used)"\n }, \n "3 DPI result": {\n "DPI_benchmark(Gb/s)": 7.679, \n "DPI_benchmark(M pps)": 0.818\n }\n }, \n "Baremetal2": {\n "1 Time of Report": "2016-01-06T10:29:03.272836", \n "2 System Information": {\n "1_Hostname": "node-40.domain.tld", \n "2_Product": "PowerEdge M620 serial: C1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.851 MHz Graphics", \n "6_CPU_Usage": "0.5%", \n "7_Memory Usage": "1434.2/128895.3MB", \n "8_Disk usage": "598.9GB (0.5% used)"\n }, \n "3 DPI result": {\n "DPI_benchmark(Gb/s)": 8.25, \n "DPI_benchmark(M pps)": 0.879\n }\n }\n }\n }, \n "Dhrystone": {\n "1. Index": 0.8039476778552496, \n "2. Results": {\n "Baremetal1": {\n "1 Time of Report": "2016-01-06T07:36:28.806876", \n "2 System Information": {\n "1_Hostname": "node-41.domain.tld", \n "2_Product": "PowerEdge M620 serial: F1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.766 MHz Graphics", \n "6_CPU_Usage": "10.1%", \n "7_Memory Usage": "23455.8/112767.3MB", \n "8_Disk usage": "598.9GB (5.7% used)"\n }, \n "3 Dhrystone result": {\n "1.Number of CPU(s) in system": "24", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "2130.6"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "24", \n "2.Index score": "30836.0"\n }\n }\n }, \n "Baremetal2": {\n "1 Time of Report": "2016-01-06T10:13:07.955685", \n "2 System Information": {\n "1_Hostname": "node-40.domain.tld", \n "2_Product": "PowerEdge M620 serial: C1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.851 MHz Graphics", \n "6_CPU_Usage": "0.5%", \n "7_Memory Usage": "1410.1/128895.3MB", \n "8_Disk usage": "598.9GB (0.5% used)"\n }, \n "3 Dhrystone result": {\n "1.Number of CPU(s) in system": "24", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "2571.2"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "24", \n "2.Index score": "32389.8"\n }\n }\n }, \n "Baremetal3": {\n "1 Time of Report": "2016-01-06T10:13:07.976784", \n "2 System Information": {\n "1_Hostname": "node-41.domain.tld", \n "2_Product": "PowerEdge M620 serial: F1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.766 MHz Graphics", \n "6_CPU_Usage": "10.1%", \n "7_Memory Usage": "23274.4/112767.3MB", \n "8_Disk usage": "598.9GB (5.7% used)"\n }, \n "3 Dhrystone result": {\n "1.Number of CPU(s) in system": "24", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "2285.4"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "24", \n "2.Index score": "31259.5"\n }\n }\n }, \n "Baremetal4": {\n "1 Time of Report": "2016-01-06T07:36:28.782429", \n "2 System Information": {\n "1_Hostname": "node-40.domain.tld", \n "2_Product": "PowerEdge M620 serial: C1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.851 MHz Graphics", \n "6_CPU_Usage": "0.5%", \n "7_Memory Usage": "1409.9/128895.3MB", \n "8_Disk usage": "598.9GB (0.5% used)"\n }, \n "3 Dhrystone result": {\n "1.Number of CPU(s) in system": "24", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "2712.7"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "24", \n "2.Index score": "32450.4"\n }\n }\n }, \n "Virtual Machine 1": {\n "1 Time of Report": "2016-01-06T07:44:51.059493", \n "2 System Information": {\n "1_Hostname": "instance1", \n "2_Product": "OpenStack Nova v: 2014.2.2 serial: cfb53fc0-9d58-4499-bf27-68a03a3fabcb", \n "3_OS Distribution": "CentOS Linux release 7.1.1503 (Core)", \n "4_Kernel": "3.10.0-229.7.2.el7.x86_64 x86_64 (64 bit)", \n "5_CPU": "4 Single core Intel Xeon E312xx (Sandy Bridge)s (-SMP-) speed", \n "6_CPU_Usage": "11.9%", \n "7_Memory Usage": "172.7/7984.5MB", \n "8_Disk usage": "85.9GB (1.7% used)"\n }, \n "3 Dhrystone result": {\n "1.Number of CPU(s) in system": "4", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "2744.4"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "4", \n "2.Index score": "8134.9"\n }\n }\n }, \n "Virtual Machine 2": {\n "1 Time of Report": "2016-01-06T07:44:51.052127", \n "2 System Information": {\n "1_Hostname": "instance2", \n "2_Product": "OpenStack Nova v: 2014.2.2 serial: eaa09aac-c5b6-4030-95c4-9ff8d98d66d8", \n "3_OS Distribution": "CentOS Linux release 7.1.1503 (Core)", \n "4_Kernel": "3.10.0-229.7.2.el7.x86_64 x86_64 (64 bit)", \n "5_CPU": "4 Single core Intel Xeon E312xx (Sandy Bridge)s (-SMP-) speed", \n "6_CPU_Usage": "15.5%", \n "7_Memory Usage": "172.8/7984.5MB", \n "8_Disk usage": "85.9GB (1.7% used)"\n }, \n "3 Dhrystone result": {\n "1.Number of CPU(s) in system": "4", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "2734.2"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "4", \n "2.Index score": "6714.0"\n }\n }\n }\n }\n }, \n "RamSpeed": {\n "1. Index": 0.8108060107793202, \n "2. Results": {\n "Baremetal1": {\n "1 Time of Report": "2016-01-12T12:02:29.731423", \n "2 System Information": {\n "1_Hostname": "node-40.domain.tld", \n "2_Product": "PowerEdge M620 serial: C1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.851 MHz Graphics", \n "6_CPU_Usage": "0.5%", \n "7_Memory Usage": "1419.3/128895.3MB", \n "8_Disk usage": "598.9GB (0.5% used)"\n }, \n "3 RamSpeed result": {\n "1. INTmem bandwidth": {\n "1. Copy (MB/s)": "11606.89", \n "2. Add (MB/s)": "12206.35", \n "3. Scale (MB/s)": "11890.48", \n "4. Triad (MB/s)": "12063.59", \n "5. Average (MB/s)": "11941.83"\n }, \n "2. FLOATmem bandwidth": {\n "1. Copy (MB/s)": "7872.50", \n "2. Add (MB/s)": "10733.12", \n "3. Scale (MB/s)": "8025.65", \n "4. Triad (MB/s)": "10746.75", \n "5. Average (MB/s)": "9344.50"\n }\n }\n }, \n "Baremetal2": {\n "1 Time of Report": "2016-01-12T12:02:29.753152", \n "2 System Information": {\n "1_Hostname": "node-41.domain.tld", \n "2_Product": "PowerEdge M620 serial: F1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.766 MHz Graphics", \n "6_CPU_Usage": "10.1%", \n "7_Memory Usage": "22910.5/112767.3MB", \n "8_Disk usage": "598.9GB (5.7% used)"\n }, \n "3 RamSpeed result": {\n "1. INTmem bandwidth": {\n "1. Copy (MB/s)": "6475.10", \n "2. Add (MB/s)": "7517.29", \n "3. Scale (MB/s)": "7576.99", \n "4. Triad (MB/s)": "7353.62", \n "5. Average (MB/s)": "7230.75"\n }, \n "2. FLOATmem bandwidth": {\n "1. Copy (MB/s)": "5172.89", \n "2. Add (MB/s)": "8093.70", \n "3. Scale (MB/s)": "5239.64", \n "4. Triad (MB/s)": "7299.85", \n "5. Average (MB/s)": "6451.52"\n }\n }\n }\n }\n }, \n "SSL": {\n "1. Index": 0.8447691829905376, \n "2. Results": {\n "Baremetal1": {\n "1 Time of Report": "2016-01-06T10:26:17.402083", \n "2 System Information": {\n "1_Hostname": "node-40.domain.tld", \n "2_Product": "PowerEdge M620 serial: C1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.851 MHz Graphics", \n "6_CPU_Usage": "0.5%", \n "7_Memory Usage": "1410.1/128895.3MB", \n "8_Disk usage": "598.9GB (0.5% used)"\n }, \n "3 SSL result": {\n "1. Version": [\n "OpenSSL 1.0.2e 3 Dec 2015"\n ], \n "2. RSA signatures": {\n "1. 512 bits (sign/s)": "16732.5", \n "2. 1024 bits (sign/s)": "5456.2", \n "3. 2048 bits (sign/s)": "770.9", \n "4. 4096 bits (sign/s)": "105.1"\n }, \n "3. AES-128-cbc throughput": {\n "1. 16 Bytes block (B/sec)": "475911.73k", \n "2. 64 Bytes block (B/sec)": "576737.74k", \n "3. 256 Bytes block (B/sec)": "588061.78k", \n "4. 1024 Bytes block (B/sec)": "590354.09k", \n "5. 8192 Bytes block (B/sec)": "591104.68k"\n }\n }\n }, \n "Baremetal2": {\n "1 Time of Report": "2016-01-06T10:26:17.418950", \n "2 System Information": {\n "1_Hostname": "node-41.domain.tld", \n "2_Product": "PowerEdge M620 serial: F1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.766 MHz Graphics", \n "6_CPU_Usage": "10.1%", \n "7_Memory Usage": "23265.8/112767.3MB", \n "8_Disk usage": "598.9GB (5.7% used)"\n }, \n "3 SSL result": {\n "1. Version": [\n "OpenSSL 1.0.2e 3 Dec 2015"\n ], \n "2. RSA signatures": {\n "1. 512 bits (sign/s)": "14564.1", \n "2. 1024 bits (sign/s)": "4717.7", \n "3. 2048 bits (sign/s)": "716.4", \n "4. 4096 bits (sign/s)": "98.7"\n }, \n "3. AES-128-cbc throughput": {\n "1. 16 Bytes block (B/sec)": "429887.75k", \n "2. 64 Bytes block (B/sec)": "564057.37k", \n "3. 256 Bytes block (B/sec)": "580601.94k", \n "4. 1024 Bytes block (B/sec)": "579937.28k", \n "5. 8192 Bytes block (B/sec)": "580299.43k"\n }\n }\n }\n }\n }, \n "Whetstone": {\n "1. Index": 0.7841345594226515, \n "2. Results": {\n "Baremetal1": {\n "1 Time of Report": "2016-01-06T10:17:54.933960", \n "2 System Information": {\n "1_Hostname": "node-40.domain.tld", \n "2_Product": "PowerEdge M620 serial: C1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.851 MHz Graphics", \n "6_CPU_Usage": "0.5%", \n "7_Memory Usage": "1418.8/128895.3MB", \n "8_Disk usage": "598.9GB (0.5% used)"\n }, \n "3 Whetstone result": {\n "1.Number of CPU(s) in system": "24", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "708.4"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "24", \n "2.Index score": "13472.0"\n }\n }\n }, \n "Baremetal2": {\n "1 Time of Report": "2016-01-06T10:17:54.952956", \n "2 System Information": {\n "1_Hostname": "node-41.domain.tld", \n "2_Product": "PowerEdge M620 serial: F1V6WW1", \n "3_OS Distribution": "Ubuntu 14.04 trusty", \n "4_Kernel": "3.13.0-68-generic x86_64 (64 bit)", \n "5_CPU": "2 Hexa core Intel Xeon CPU E5-2640 0s (-HT-MCP-SMP-) clocked at 2499.766 MHz Graphics", \n "6_CPU_Usage": "10.1%", \n "7_Memory Usage": "23274.2/112767.3MB", \n "8_Disk usage": "598.9GB (5.7% used)"\n }, \n "3 Whetstone result": {\n "1.Number of CPU(s) in system": "24", \n "2.Single CPU test": {\n "1.Number of parallell test(s)": "1", \n "2.Index score": "638.9"\n }, \n "3.Multi CPU test": {\n "1.Number of parallell test(s)": "24", \n "2.Index score": "13618.4"\n }\n }\n }\n }\n }\n }\n}'} diff --git a/opnfv-creds.sh b/opnfv-creds.sh new file mode 100644 index 00000000..9266c19a --- /dev/null +++ b/opnfv-creds.sh @@ -0,0 +1,16 @@ +#!/bin/sh +export LC_ALL=C +export OS_NO_CACHE='true' +export OS_TENANT_NAME='admin' +export OS_USERNAME='admin' +export OS_PASSWORD='admin' +export OS_AUTH_URL='http://172.18.0.69:5000/v2.0' +export OS_AUTH_STRATEGY='keystone' +export OS_REGION_NAME='RegionOne' +export CINDER_ENDPOINT_TYPE='internalURL' +export GLANCE_ENDPOINT_TYPE='internalURL' +export KEYSTONE_ENDPOINT_TYPE='internalURL' +export NOVA_ENDPOINT_TYPE='internalURL' +export NEUTRON_ENDPOINT_TYPE='internalURL' +export OS_ENDPOINT_TYPE='internalURL' +export MURANO_REPO_URL='http://storage.apps.openstack.org/' diff --git a/test_cases/default/compute/dhrystone_bm.yaml b/test_cases/default/compute/dhrystone_bm.yaml index 022cf5ee..526a5717 100644 --- a/test_cases/default/compute/dhrystone_bm.yaml +++ b/test_cases/default/compute/dhrystone_bm.yaml @@ -1,4 +1,4 @@ - + Scenario: benchmark: dhrystone host: machine_1, machine_2 @@ -7,7 +7,7 @@ Scenario: Context: Host_Machines: machine_1: - ip: 10.20.0.4 + ip: 10.20.0.6 pw: role: host machine_2: diff --git a/test_cases/default/compute/ramspeed_bm.yaml b/test_cases/default/compute/ramspeed_bm.yaml index 47b933b8..a8d2cbfe 100644 --- a/test_cases/default/compute/ramspeed_bm.yaml +++ b/test_cases/default/compute/ramspeed_bm.yaml @@ -7,7 +7,7 @@ Scenario: Context: Host_Machines: machine_1: - ip: 10.20.0.4 + ip: 10.20.0.6 pw: role: host machine_2: diff --git a/test_cases/default/network/iperf_bm.yaml b/test_cases/default/network/iperf_bm.yaml index 4fd3d7f5..6baad150 100644 --- a/test_cases/default/network/iperf_bm.yaml +++ b/test_cases/default/network/iperf_bm.yaml @@ -13,11 +13,11 @@ Context: machine_1: ip: 10.20.0.5 pw: - role: 1-server + role: 2-host machine_2: ip: 10.20.0.6 pw: - role: 2-host + role: 1-server Virtual_Machines: diff --git a/test_cases/default/network/iperf_vm.yaml b/test_cases/default/network/iperf_vm.yaml index ebe1deac..39ec0881 100644 --- a/test_cases/default/network/iperf_vm.yaml +++ b/test_cases/default/network/iperf_vm.yaml @@ -14,14 +14,14 @@ Context: Virtual_Machines: virtualmachine_1: - availability_zone: compute1 + availability_zone: compute4 OS_image: QTIP_CentOS public_network: 'net04_ext' role: 1-server flavor: m1.large virtualmachine_2: - availability_zone: compute1 + availability_zone: compute4 OS_image: QTIP_CentOS public_network: 'net04_ext' role: 2-host diff --git a/test_list/network b/test_list/network index 0c08f678..c468f815 100644 --- a/test_list/network +++ b/test_list/network @@ -1,3 +1,3 @@ -iperf_vm.yaml iperf_bm.yaml +iperf_vm.yaml iperf_vm_2.yaml |