diff options
| author |   MofassirArif <Mofassir_Arif@dellteam.com> | 2016-01-12 03:12:23 -0800 |
|---|---|---|
| committer |   Nauman Ahad <Nauman_Ahad@dell.com> | 2016-01-14 11:58:11 +0000 |
| commit | 63fa71cc462c00f19bc1949f3e2b32f42721388b (patch) | |
| tree | e7fa95e0b05564d5f3ee2e14a516e8410083a9d6 | |
| parent | c02ac0ea76af8011afaf7241e30999326efe8105 (diff) | |
error handling for the files being input to the framework.
iperf bug fix for the bare metal testing, renamed all the iperf
config files. added more detail to the help.
Change-Id: I16cfb1c05599cd0b803e735e6a75083e3e6733ec
Signed-off-by: MofassirArif <Mofassir_Arif@dellteam.com>
(cherry picked from commit 4c06a4ed3b3b22e3dbcddb33dda33ca773dfae11)
28 files changed, 353 insertions, 463 deletions
@@ -6,6 +6,7 @@ __pycache__/ # C extensions *.so +results/* # Distribution / packaging .Python env/ diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml index 11d427f3..feef9369 100644 --- a/benchmarks/playbooks/iperf.yaml +++ b/benchmarks/playbooks/iperf.yaml @@ -59,11 +59,17 @@ poll: 0 when: rolename == "1-server" - name: Running Iperf on Host - shell: iperf3 --time {{duration}} -b {{bandwidthGbps}}G -c {{privateip1}} -J -O10>> ./qtip_result/iperf_raw.json + shell: iperf3 --time {{duration}} -b {{bandwidthGbps}}G -c {{ip1}} -J -O10 >> ./qtip_result/iperf_raw.json ignore_errors: yes with_items: - "{{ip1}}" - when: rolename == "2-host" and "{{ip2}}" == '' + when: rolename == "2-host" and "{{privateip1}}" == "NONE" + - name: Running Iperf on Host + shell: iperf3 --time {{duration}} -b{{bandwidthGbps}}G -c {{privateip1}} -J -O10 >> ./qtip_result/iperf_raw.json + ignore_errors: yes + with_items: + - "{{ip1}}" + when: rolename == "2-host" and "{{privateip1}}" != "NONE" - name: Fetching result transformation script copy: src=./result_transform/iperf/iperf_transform.py dest={{home_dir.stdout}}/qtip_result - name: Transforming result diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py index e9e05ba2..b889f21c 100644 --- a/dashboard/pushtoDB.py +++ b/dashboard/pushtoDB.py @@ -4,8 +4,8 @@ import datetime import os
TEST_DB = 'http://213.77.62.197'
-suite_list = ['compute_result.json','network_result.json','storage_result.json']
-payload_list = []
+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"):
@@ -24,7 +24,7 @@ def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us headers = {'Content-Type': 'application/json'}
print params
- '''
+
try:
r = requests.post(url, data=json.dumps(params), headers=headers)
print r
@@ -32,13 +32,14 @@ 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 suites in suite_list:
- if os.path.isfile('results/'+suites):
- payload_list.append(suites)
+ for k,v in suite_list:
+ print 'results/'+k
+ if os.path.isfile('results/'+str(k)):
+ payload_list[k]=v
print payload_list
@@ -46,11 +47,11 @@ def main(): global payload_list
populate_payload(suite_list)
- for pay in payload_list:
- with open('results/'+pay,'r') as result_file:
+ 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)
if __name__ == "__main__":
- main()
\ No newline at end of file + main()
diff --git a/dashboard/qtip2dashboard.py b/dashboard/qtip2dashboard.py index 008f7371..3eab96cc 100644 --- a/dashboard/qtip2dashboard.py +++ b/dashboard/qtip2dashboard.py @@ -9,7 +9,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## - +asfdasd def get_qtip_cases(): """ get the list of the supported test cases @@ -1,3 +1,4 @@ -[host] -172.18.0.114 -172.18.0.113 +[2-host] +172.18.0.103 +[1-server] +172.18.0.104 diff --git a/data/my_key.pem b/data/my_key.pem index 66bd451b..e869cc22 100644 --- a/data/my_key.pem +++ b/data/my_key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEAvWnI0pV7xpXqY5vCn/gnKt8qxBBjjX7A3K2gfE7dimGrJ9VY -ZMpu1tlc/ocYY7IDKpO7lQiAJdF4A1XxL0Nb4I+xYd/+2RwQ0CsWkpCXlfo/waje -DUqQROGwjt634dwUJzG6mz6BkPdyGLnFVlS/eD1Tc3J3fwn9nDk20xUPyMcPGQ1b -CA2UwLiSVFdyWWC+MRonAYoH63bEKy6G8a8NW8JqpF6uy4jUys+40FiNrgB3g7rh -DJr3XwFVcdG5/duxUHi2O6DFx7zoZXSlBX1OfbntWyU6A/dhmTWotungR+zP0n2B -mxZjuw1Ipsbh5gfZ7f4HAHTTltljCXUfm2SwhQIDAQABAoIBAEpkned3pqGch+6P -YqWJxXhlJlrTRQZx3jXOS9YG86RCMAL5HDqZ92aTAJ9HWCDv7aZvV6F1MT+pQcWt -n4i8n/1W8ohKfcGv8DqScc8m0yKooxngxTXbL0aejcXPW9FtqsyqD2yh5CmXxkxH -ymXZ60nCbGBPePeAaQdOwWWuRADK35QFNoCzktZ1OkUXjn7UeyhYl9T68X4lfgzm -ZPn5rXFufYLw8ICyUm3G76Wt4EpG6/PN+BAUNZNOj0lejpQNwry2KE0yWfJBnWda -9uKFMU0PWJBQ+97QTzgZa+M0v6WsDxTUKoPgPmm5rt9hIvE01reb21ZlLzM/DCXp -Zd2hppECgYEA+jJZi2NTpjni9G/V/F/apZ3KrIlf7Pk1f6iBLxAEev2otSVpkDr1 -/Z58ShMntH8PLwaF/eEOcSjmAhkbU3FUY35lGm9RK33vF6BsyvYzAjrRnLDoJI1r -kc5YzkwxKR4j8NVQeCuDETiPcbGZC9wrRgupBxbXl71rwxC2NDlj8L8CgYEAwc6B -vV1BolznMYCN1lgEbN2+8nAFcOfDMfKzNmGKWo/KEzWI1k22BFNCZDr3vbEys/5w -zRILsTiSaI0gnsZ8+PrYPjx4lk3TjCzRw+LaO4fDsviD2t2Us+af3elXvL+bteKH -eAfV0NbUUh0Uq6WcsBXdTgXawugLufCnkcM8a7sCgYEAv/RrQQb2wZy95H39NgCw -tsoGGjPXle9pPUUhv+LRHS+KBVjr0c16t5elkgt6NgAZvSGLIcpOk0Emnst2bKGR -djgeB5cKNo0LKBxb+6fCYN6RvV747DpYIminN7e7K+nE91whveDcURUM8NSqMDA+ -PyJpD1hWFkQs7l7e+9hgNe8CgYA6mBq1i8paMkhbuQgo87dyyp/+YEvk1M04/q2c -FWVk9/AaWqciU6BiMmHyN7nLChXQQW8NMRWD4Ryyq2hfWJdUF1LljhbPKnx49tv8 -o0tjkCpko6oJs9BPi7xttSynji6fkPtwGL5WQ30xzkT/mDSFMDcWbcK0Br/02YNw -GFzeHQKBgQDnOVkiXl70Pvjn07oZxebr0rXLPMXY7zSJxGWlWL6i8A30tRfkSABf -mV4SfBv7f4T32JJvRZvNPdwGXoKJJKL+bykF22Xq2BWwgjZg0ubOWPY2e4ut5gsQ -4Nv6Okvd0nMNBjev7MPNXgiRalYSts+H4diy/u8RwRQ3jAMmY4B8/Q== +MIIEpAIBAAKCAQEAtM/TsKAIh4OcgkkJ97ri2hlkFRRoZc4/gewyhaqq8/k6kEJM +pEid1eARO7cph5NLT2gnyYv2EQwLBGIXmA/zbHC+r79lv46nb4xIKo05KSZbLTvR +I/BjYoYfNOVUUJX7cP91VZFEWJVfsV/Gmc1oTdJDQ8OsBZJkQOWUfJucdFR9rSki +j/1yefL1p17drOejvBoi6dL804Q60WeN5ZyMzZY55VGJVPlAIoN5WuT8Y20k7QtK +KAK+OQABpGrJZYHA4vaUNOnwoO1rSiHyJEYewGNn9bIVOF09WeJJTkht2m7nxAeV +uUZ44kPP9nICxX2mte2ZuqfEKa18fPN54MRtzwIDAQABAoIBAD7mmd81HSJ/j5/n +ZtdOpYJ4GNAYhGT+RiudjsnfYI91YYEz/1Obi4UO6Q/cHU9z11wtgMHltdmiVebV +dR3KVsWfx0Z+kBf+uZLdu3FKJduB43AuAgi9pOVugUa2jQln08wwopH88kja1ipv +hjiVM7b28b2OQbbCgavt8iUTQW9aK0kFHd2A/vf9qrcNzylAAkJkOzonrKIxgpMv +yduft40Oho4hztG/8IPPfC4WRTS0Roffpi6IehnpWhv74Kg4064nwQnwTfQavzhP +bLPn9OtS+WrxfdUetT/8JTCgp0eOhuycx5pazdQ/9wIAL67SUYGDexAwuJEamOU5 +Pq7CjykCgYEA5YUAxgdsUAWJbbYiIxIYtx/W1UhjNRe1EKcBSBV4zcOX8DhxR0py +oure9bs7gk6r/NKH2fTyM2NzNest8bDnjqNnZ4W5L18NQkGFiil14XnRbvC7Dlp3 +26j+JDyJNvRXo++vVVPPHEN+HOT4gh3ZaNl8wCMUx7vx8jxDYRdfb5sCgYEAyaw2 +V6F+80LgO0EfYAMTJ45M38+ZLqrXXTmtcFebFNmqKvJSEjwgBuokodVUWZA9qASG +oGbSJjjOLfKA5EfFCMrpfrOCdIRI4qzBC3mh9QoG6O4GqNT5dyE3oJBIinK7FZPU +KASDp666+Ssm9CbZlbn7As36nf+W+tfvXu51D90CgYAmHgSW3ry6PXEpa0oYEPVR +1FPVcAQp2RoU/edUlVxOr+EX4AfQEykerWsB3GpxpacigcRWCjv/FNEZb0leDkcm +hTSzGJ48o8iL7F3FKEWPgK+rgQdPxu6I6HPsiLExEztK2o9/2D9ZLkxPeCddVJ+6 +rgPt1OWqligEVsXJ5hvPaQKBgQDIBGQVP5fwXqiUPD+I8yPBPJIj+/q6XTiiPn01 +Cb5GzKbIV3NsoHNHSFwyoak59yQfivWXCsNsozRiP7z0K/ZQhSdVwWYmd7juEFaa +MfWeWWaHCORT+H6/V5ObTN6VabsBaI+nbOrCmTrZu6GzzwBITp+UpYPlxkQQ36+K +IMi7hQKBgQC0R3taxYQBr/6zGtIFufu3PeY5ldqvHeB0TlxoEk5u0S43A86SVywC +oBQJ/E8FafnlxqcJo/sqvMWVg2ZtpsxxfXUi/c2w02MVzDia9rS5zZ0pVoe4XrId +C1BToZmkCEHhSxCkgq5cOpjuTPSYoarhw3m5o2qJwlAdjCkdsZ7ExA== -----END RSA PRIVATE KEY----- diff --git a/func/cli.py b/func/cli.py index 8433e483..b8718407 100644 --- a/func/cli.py +++ b/func/cli.py @@ -18,24 +18,58 @@ import argparse class cli(): def _getfile(self, filepath): + with open('test_list/'+filepath,'r') as finput: _benchmarks=finput.readlines() for items in range( len(_benchmarks)): _benchmarks[items]=_benchmarks[items].rstrip() return _benchmarks + def _getsuite(self, filepath): -# for suites in range (len(filepath)): - # xindex= filepath[suites].find('.') - # filepath[suites]=filepath[suites][0:xindex] + return filepath - + + def _checkTestList(self, filename): + + if os.path.isfile('test_list/'+filename): + return True + else: + return False + + def _checkLabName(self, labname): + + if os.path.isdir('test_cases/'+labname): + return True + else: + return False + def __init__(self): + suite=[] parser = argparse.ArgumentParser() - parser.add_argument('-l ', '--lab', help='Name of Lab on which being tested ') - parser.add_argument('-f', '--file', help = 'File in test_list with the list ' \ - 'of tests') + parser.add_argument('-l ', '--lab', help='Name of Lab on which being tested, These can' \ + 'be found in the test_cases/ directory. Please ' \ + 'ensure that you have edited the respective files '\ + 'before using them. For testing other than through Jenkins'\ + ' The user should list default after -l . all the fields in'\ + ' the files are necessary and should be filled') + parser.add_argument('-f', '--file', help = 'File in test_list with the list of tests. there are three files' \ + '\n compute '\ + '\n storage '\ + '\n network '\ + 'They contain all the tests that will be run. They are listed by suite.' \ + 'Please ensure there are no empty lines') args = parser.parse_args() + + if not self._checkTestList(args.file): + print '\n\n ERROR: Test File Does not exist in test_list/ please enter correct file \n\n' + sys.exit(0) + + if not self._checkLabName(args.lab): + print '\n\n You have specified a lab that is not present in test_cases/ please enter correct'\ + ' file. If unsure how to proceed, use -l default.\n\n' + sys.exit(0) + benchmarks = self._getfile(args.file) suite.append(args.file) suite=self._getsuite(suite) @@ -63,4 +97,3 @@ class cli(): else: print (args.benchmark, ' is not a Template in the Directory - \ Enter a Valid file name. or use qtip.py -h for list') - diff --git a/func/create_zones.py b/func/create_zones.py index a21fb41f..44ba7568 100644 --- a/func/create_zones.py +++ b/func/create_zones.py @@ -107,6 +107,9 @@ class create_zones: for x in range(len(zone_machine)): compute_index = self.get_compute_num(D[x]) + if compute_index > len(hyper_list): + print '\n The specified compute node doesnt exist. using compute 1' + compute_index = 1 if not self.check_aggregate(nova, hostnA[compute_index]): agg_idA = nova.aggregates.create(hostnA[compute_index], D[x]) nova.aggregates.add_host(aggregate=agg_idA, host=hostnA[compute_index]) diff --git a/func/driver.py b/func/driver.py index 2cdddba5..0dc0a6e1 100644 --- a/func/driver.py +++ b/func/driver.py @@ -21,6 +21,7 @@ class Driver: self.dic_json = defaultdict() def drive_bench(self, benchmark, roles, benchmark_detail= None, pip_dict = None): + roles= sorted(roles) pip_dict = sorted(pip_dict) result_dir = 'results' @@ -39,12 +40,11 @@ class Driver: if k == '1-server': print values, 'saving IP' self.dic_json['ip'+str(index)]= str(values) - self.dic_json['privateip'+str(index)] = pip_dict[0][1] + if pip_dict[0][1][0]: + self.dic_json['privateip'+str(index)] = pip_dict[0][1] + if not pip_dict[0][1][0]: + self.dic_json['privateip'+str(index)] = 'NONE' index= index+1 dic_json = json.dumps(dict(self.dic_json.items())) - print dic_json run_play = 'ansible-playbook -s ./benchmarks/playbooks/{0} --private-key=./data/QtipKey -i ./data/hosts --extra-vars \'{1}\' -v '.format(benchmark_name, dic_json) -# run_play = 'ansible-playbook -s $PWD/benchmarks/playbooks/{0} --extra-vars "Dest_dir={1} role={2}" -vvv'.format( -# benchmark_name, result_dir, k) status = os.system(run_play) - diff --git a/func/validate_yaml.py b/func/validate_yaml.py index c0df4d87..e4d3d5cf 100644 --- a/func/validate_yaml.py +++ b/func/validate_yaml.py @@ -24,7 +24,7 @@ class Validate_Yaml(): if not doc['Scenario']['benchmark']: print '\nBenchmark field missing' if not doc['Scenario']['pointless']: - print '\nBabyeating anumal' + print '' if not doc['Context']: print '\nEntire Context is missing' if not doc['Context']['Host_Machine']: diff --git a/test_cases/default/network/iperf_bm.yaml b/test_cases/default/network/iperf_bm.yaml new file mode 100644 index 00000000..4fd3d7f5 --- /dev/null +++ b/test_cases/default/network/iperf_bm.yaml @@ -0,0 +1,50 @@ +Scenario: + benchmark: iperf + topology: Client and Server on different baremetal Compute nodes + server: machine_1 + client: machine_2 + benchmark_details: + duration: 20 + protocol: tcp + bandwidthGbps: 10 + +Context: + Host_Machines: + machine_1: + ip: 10.20.0.5 + pw: + role: 1-server + machine_2: + ip: 10.20.0.6 + pw: + role: 2-host + + Virtual_Machines: + +Test_Description: + Test_category: "network" + Benchmark: "iperf" + Overview: > + '''This test will run the IPERF 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 + virtualmachine_1: + availability_zone: compute1 + 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 + + machine_1: + ip: + pw: + role: + ''' + diff --git a/test_cases/default/network/iperf_topology_2.yaml b/test_cases/default/network/iperf_topology_2.yaml deleted file mode 100644 index 301a9916..00000000 --- a/test_cases/default/network/iperf_topology_2.yaml +++ /dev/null @@ -1,43 +0,0 @@ -Scenario: - benchmark: iperf - topology: Client and Server on different Compute nodes - server: virtualmachine_1 - client: virtualmachine_2 - benchmark_details: - duration: 20 - protocol: tcp - bandwidthGbps: 10 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - 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: "iperf" - Overview: > - '''This test will run the IPERF 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/network/iperf_topology_3.yaml b/test_cases/default/network/iperf_topology_3.yaml deleted file mode 100644 index 9e7b73e7..00000000 --- a/test_cases/default/network/iperf_topology_3.yaml +++ /dev/null @@ -1,60 +0,0 @@ -Scenario: - benchmark: iperf - topology: 2 Client on one compute and 2 servers on another machine - 1Run : virtualmachine_1, virtualmachine_2 - 2Run: - benchmark_details: - duration: 20 - protocol: udp - bandwidthGbps: 1 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_3: - availability_zone: compute3 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_4: - availability_zone: compute4 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - - - -Test_Description: - Test_category: "network" - Benchmark: "iperf" - Overview: > - '''This test will run the IPERF 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/dell-us-deploying-bm3/network/iperf_topology_1.yaml b/test_cases/default/network/iperf_vm.yaml index 18eba8ac..ebe1deac 100644 --- a/test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml +++ b/test_cases/default/network/iperf_vm.yaml @@ -3,15 +3,15 @@ Scenario: topology: Client and Server on ONE compute server : virtualmachine_1 client: virtualmachine_2 + description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: duration: 20 protocol: tcp - bandwidthGbps: 10 + bandwidthGbps: 0 Context: Host_Machines: - Virtual_Machines: virtualmachine_1: availability_zone: compute1 @@ -26,7 +26,7 @@ Context: public_network: 'net04_ext' role: 2-host flavor: m1.large - + Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml b/test_cases/default/network/iperf_vm_2.yaml index 301a9916..90fd334d 100644 --- a/test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml +++ b/test_cases/default/network/iperf_vm_2.yaml @@ -1,12 +1,13 @@ Scenario: benchmark: iperf - topology: Client and Server on different Compute nodes - server: virtualmachine_1 + topology: Client and Server on two different compute nodes + server : virtualmachine_1 client: virtualmachine_2 + description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: - duration: 20 + duration: 20 protocol: tcp - bandwidthGbps: 10 + bandwidthGbps: 0 Context: Host_Machines: diff --git a/test_cases/default/network/pktgen.yaml b/test_cases/default/network/pktgen.yaml deleted file mode 100644 index 13fae68f..00000000 --- a/test_cases/default/network/pktgen.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Scenario: - benchmark: pktgen - topology: Client and Server on ONE compute - server : virtualmachine_1 - client: virtualmachine_2 - benchmark_details: - duration: "10" - packetsize: "64" - ipaddr: "10.10.17.4" - numberofports: "10" - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute2 - OS_image: pktgenready - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: pktgenready - public_network: 'provider_network' - role: 2-host - flavor: m1.large - -Test_Description: - Test_category: "network" - Benchmark: "iperf" - Overview: > - '''This test will run the IPERF 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/dell-us-deploying-bm3/network/iperf_bm.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml new file mode 100644 index 00000000..4fd3d7f5 --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml @@ -0,0 +1,50 @@ +Scenario: + benchmark: iperf + topology: Client and Server on different baremetal Compute nodes + server: machine_1 + client: machine_2 + benchmark_details: + duration: 20 + protocol: tcp + bandwidthGbps: 10 + +Context: + Host_Machines: + machine_1: + ip: 10.20.0.5 + pw: + role: 1-server + machine_2: + ip: 10.20.0.6 + pw: + role: 2-host + + Virtual_Machines: + +Test_Description: + Test_category: "network" + Benchmark: "iperf" + Overview: > + '''This test will run the IPERF 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 + virtualmachine_1: + availability_zone: compute1 + 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 + + machine_1: + ip: + pw: + role: + ''' + diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml deleted file mode 100644 index 9e7b73e7..00000000 --- a/test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml +++ /dev/null @@ -1,60 +0,0 @@ -Scenario: - benchmark: iperf - topology: 2 Client on one compute and 2 servers on another machine - 1Run : virtualmachine_1, virtualmachine_2 - 2Run: - benchmark_details: - duration: 20 - protocol: udp - bandwidthGbps: 1 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_3: - availability_zone: compute3 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_4: - availability_zone: compute4 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - - - -Test_Description: - Test_category: "network" - Benchmark: "iperf" - Overview: > - '''This test will run the IPERF 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/network/iperf_topology_1.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml index 18eba8ac..14d50890 100644 --- a/test_cases/default/network/iperf_topology_1.yaml +++ b/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml @@ -3,10 +3,11 @@ Scenario: topology: Client and Server on ONE compute server : virtualmachine_1 client: virtualmachine_2 + description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: duration: 20 protocol: tcp - bandwidthGbps: 10 + bandwidthGbps: 0 Context: Host_Machines: diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml new file mode 100644 index 00000000..90fd334d --- /dev/null +++ b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml @@ -0,0 +1,44 @@ +Scenario: + benchmark: iperf + topology: Client and Server on two different compute nodes + server : virtualmachine_1 + client: virtualmachine_2 + description: 'Leave the bandwidth as 0 to throttle maximum traffic' + benchmark_details: + duration: 20 + protocol: tcp + bandwidthGbps: 0 + +Context: + Host_Machines: + + + Virtual_Machines: + virtualmachine_1: + availability_zone: compute1 + 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: "iperf" + Overview: > + '''This test will run the IPERF 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/dell-us-deploying-bm3/network/pktgen.yaml b/test_cases/dell-us-deploying-bm3/network/pktgen.yaml deleted file mode 100644 index 13fae68f..00000000 --- a/test_cases/dell-us-deploying-bm3/network/pktgen.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Scenario: - benchmark: pktgen - topology: Client and Server on ONE compute - server : virtualmachine_1 - client: virtualmachine_2 - benchmark_details: - duration: "10" - packetsize: "64" - ipaddr: "10.10.17.4" - numberofports: "10" - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute2 - OS_image: pktgenready - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: pktgenready - public_network: 'provider_network' - role: 2-host - flavor: m1.large - -Test_Description: - Test_category: "network" - Benchmark: "iperf" - Overview: > - '''This test will run the IPERF 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/dell-us-testing-bm-1/network/iperf_bm.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml new file mode 100644 index 00000000..4fd3d7f5 --- /dev/null +++ b/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml @@ -0,0 +1,50 @@ +Scenario: + benchmark: iperf + topology: Client and Server on different baremetal Compute nodes + server: machine_1 + client: machine_2 + benchmark_details: + duration: 20 + protocol: tcp + bandwidthGbps: 10 + +Context: + Host_Machines: + machine_1: + ip: 10.20.0.5 + pw: + role: 1-server + machine_2: + ip: 10.20.0.6 + pw: + role: 2-host + + Virtual_Machines: + +Test_Description: + Test_category: "network" + Benchmark: "iperf" + Overview: > + '''This test will run the IPERF 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 + virtualmachine_1: + availability_zone: compute1 + 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 + + machine_1: + ip: + pw: + role: + ''' + diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_topology_2.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_topology_2.yaml deleted file mode 100644 index 301a9916..00000000 --- a/test_cases/dell-us-testing-bm-1/network/iperf_topology_2.yaml +++ /dev/null @@ -1,43 +0,0 @@ -Scenario: - benchmark: iperf - topology: Client and Server on different Compute nodes - server: virtualmachine_1 - client: virtualmachine_2 - benchmark_details: - duration: 20 - protocol: tcp - bandwidthGbps: 10 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - 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: "iperf" - Overview: > - '''This test will run the IPERF 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/dell-us-testing-bm-1/network/iperf_topology_3.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_topology_3.yaml deleted file mode 100644 index 9e7b73e7..00000000 --- a/test_cases/dell-us-testing-bm-1/network/iperf_topology_3.yaml +++ /dev/null @@ -1,60 +0,0 @@ -Scenario: - benchmark: iperf - topology: 2 Client on one compute and 2 servers on another machine - 1Run : virtualmachine_1, virtualmachine_2 - 2Run: - benchmark_details: - duration: 20 - protocol: udp - bandwidthGbps: 1 - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_3: - availability_zone: compute3 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_4: - availability_zone: compute4 - OS_image: QTIP_CentOS - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - - - -Test_Description: - Test_category: "network" - Benchmark: "iperf" - Overview: > - '''This test will run the IPERF 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/dell-us-testing-bm-1/network/iperf_topology_1.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml index 18eba8ac..14d50890 100644 --- a/test_cases/dell-us-testing-bm-1/network/iperf_topology_1.yaml +++ b/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml @@ -3,10 +3,11 @@ Scenario: topology: Client and Server on ONE compute server : virtualmachine_1 client: virtualmachine_2 + description: 'Leave the bandwidth as 0 to throttle maximum traffic' benchmark_details: duration: 20 protocol: tcp - bandwidthGbps: 10 + bandwidthGbps: 0 Context: Host_Machines: diff --git a/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml new file mode 100644 index 00000000..90fd334d --- /dev/null +++ b/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml @@ -0,0 +1,44 @@ +Scenario: + benchmark: iperf + topology: Client and Server on two different compute nodes + server : virtualmachine_1 + client: virtualmachine_2 + description: 'Leave the bandwidth as 0 to throttle maximum traffic' + benchmark_details: + duration: 20 + protocol: tcp + bandwidthGbps: 0 + +Context: + Host_Machines: + + + Virtual_Machines: + virtualmachine_1: + availability_zone: compute1 + 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: "iperf" + Overview: > + '''This test will run the IPERF 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/dell-us-testing-bm-1/network/pktgen.yaml b/test_cases/dell-us-testing-bm-1/network/pktgen.yaml deleted file mode 100644 index 13fae68f..00000000 --- a/test_cases/dell-us-testing-bm-1/network/pktgen.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Scenario: - benchmark: pktgen - topology: Client and Server on ONE compute - server : virtualmachine_1 - client: virtualmachine_2 - benchmark_details: - duration: "10" - packetsize: "64" - ipaddr: "10.10.17.4" - numberofports: "10" - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute2 - OS_image: pktgenready - public_network: 'provider_network' - role: 1-server - flavor: m1.large - - virtualmachine_2: - availability_zone: compute2 - OS_image: pktgenready - public_network: 'provider_network' - role: 2-host - flavor: m1.large - -Test_Description: - Test_category: "network" - Benchmark: "iperf" - Overview: > - '''This test will run the IPERF 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_list/network b/test_list/network index 3ed6f82f..0c08f678 100644 --- a/test_list/network +++ b/test_list/network @@ -1 +1,3 @@ -iperf_topology_1.yaml +iperf_vm.yaml +iperf_bm.yaml +iperf_vm_2.yaml |