diff options
| -rw-r--r-- | benchmarks/playbooks/dhrystone.yaml | 3 | ||||
| -rw-r--r-- | benchmarks/playbooks/dpi.yaml | 5 | ||||
| -rw-r--r-- | benchmarks/playbooks/fio.yaml | 3 | ||||
| -rw-r--r-- | benchmarks/playbooks/iperf.yaml | 2 | ||||
| -rw-r--r-- | benchmarks/playbooks/ramspeed.yaml | 3 | ||||
| -rw-r--r-- | benchmarks/playbooks/ssl.yaml | 8 | ||||
| -rw-r--r-- | benchmarks/playbooks/whetstone.yaml | 3 | ||||
| -rw-r--r-- | data/hosts | 6 | ||||
| -rw-r--r-- | data/my_key.pem | 50 | ||||
| -rw-r--r-- | func/cli.py | 10 | ||||
| -rw-r--r-- | func/driver.py | 10 | ||||
| -rw-r--r-- | qtip.py | 2 | ||||
| -rw-r--r-- | test_list/compute | 18 | ||||
| -rw-r--r-- | test_list/network | 2 |
14 files changed, 73 insertions, 52 deletions
diff --git a/benchmarks/playbooks/dhrystone.yaml b/benchmarks/playbooks/dhrystone.yaml index c3cfb333..3c1c7fb2 100644 --- a/benchmarks/playbooks/dhrystone.yaml +++ b/benchmarks/playbooks/dhrystone.yaml @@ -7,7 +7,8 @@ file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory - hosts: "{{role}}" - + become: yes + become_user: "{{username}}" tasks: - name: checking_home directory shell: echo $HOME diff --git a/benchmarks/playbooks/dpi.yaml b/benchmarks/playbooks/dpi.yaml index 19ab30ce..e4b7a0fc 100644 --- a/benchmarks/playbooks/dpi.yaml +++ b/benchmarks/playbooks/dpi.yaml @@ -7,8 +7,11 @@ file: path={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp state=directory - hosts: "{{role}}" + become: yes + become_user: "{{username}}" tasks: - + - name: echo + shell: echo $USER - name: checking_home directory shell: echo $HOME register: home_dir diff --git a/benchmarks/playbooks/fio.yaml b/benchmarks/playbooks/fio.yaml index 7162dc3b..4f8697c3 100644 --- a/benchmarks/playbooks/fio.yaml +++ b/benchmarks/playbooks/fio.yaml @@ -9,7 +9,8 @@ - hosts: "{{role}}" tasks: - + become: yes + become_user: "{{username}}" - name: checking_home directory shell: echo $HOME register: home_dir diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml index d6bc00ed..f139ff61 100644 --- a/benchmarks/playbooks/iperf.yaml +++ b/benchmarks/playbooks/iperf.yaml @@ -12,6 +12,8 @@ - hosts: "{{role}}" + become: yes + become_user: "{{username}}" tasks: - name: Rolename set_fact: diff --git a/benchmarks/playbooks/ramspeed.yaml b/benchmarks/playbooks/ramspeed.yaml index 1d45f028..0810946a 100644 --- a/benchmarks/playbooks/ramspeed.yaml +++ b/benchmarks/playbooks/ramspeed.yaml @@ -9,7 +9,8 @@ - hosts: "{{role}}" tasks: - + become: yes + become_user: "{{username}}" - name: checking_home directory shell: echo $HOME register: home_dir diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml index 9416bb38..9ba16455 100644 --- a/benchmarks/playbooks/ssl.yaml +++ b/benchmarks/playbooks/ssl.yaml @@ -1,16 +1,14 @@ - hosts: 127.0.0.1 connection: local - remote_user: '{{ ansible_env.USER }}' - sudo: no tasks: - name: making ssl directory file: path={{workingdir}}/{{Dest_dir}}/ssl state=directory - name: making temporary ssl directory file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=directory - hosts: "{{role}}" - remote_user: root + become: yes + become_user: "{{username}}" tasks: - - name: checking_home directory shell: echo $HOME register: home_dir @@ -73,8 +71,6 @@ - hosts: 127.0.0.1 connection: local - remote_user: '{{ ansible_env.USER }}' - sudo: no tasks: - name: echo shell: echo $PWD diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml index 599b98f3..7f062264 100644 --- a/benchmarks/playbooks/whetstone.yaml +++ b/benchmarks/playbooks/whetstone.yaml @@ -9,7 +9,8 @@ - hosts: "{{role}}" tasks: - + become: yes + become_user: "{{username}}" - name: storing_home shell: echo $HOME register: home_dir @@ -1,3 +1,3 @@ -[host] -172.18.1.39 -172.18.1.38 +[1Run] +10.20.0.5 +10.20.0.4 diff --git a/data/my_key.pem b/data/my_key.pem index c08dbd79..89c1a927 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----- diff --git a/func/cli.py b/func/cli.py index 9b140874..a99e9d0f 100644 --- a/func/cli.py +++ b/func/cli.py @@ -43,6 +43,10 @@ class cli(): else: return False + def _get_fname(self,file_name): + + return file_name[0: file_name.find('.')] + def __init__(self): suite=[] @@ -93,7 +97,11 @@ class cli(): obj.callsshtest() obj.updateAnsible() dvr = Driver() - dvr.drive_bench(benchmark, obj.roles_dict.items(), benchmark_details, obj.ip_pw_dict.items()) + dvr.drive_bench(benchmark, + obj.roles_dict.items(), + self._get_fname(benchmarks[items]), + benchmark_details, + obj.ip_pw_dict.items()) 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/driver.py b/func/driver.py index 9f7db237..3c3b75c0 100644 --- a/func/driver.py +++ b/func/driver.py @@ -21,7 +21,7 @@ class Driver: print os.environ['PWD'] self.dic_json = defaultdict() - def drive_bench(self, benchmark, roles, benchmark_detail = None, pip_dict = None): + def drive_bench(self, benchmark, roles, benchmark_fname, benchmark_detail = None, pip_dict = None): roles= sorted(roles) pip_dict = sorted(pip_dict) @@ -32,6 +32,12 @@ class Driver: self.dic_json['ip2']='' self.dic_json['installer']=str(os.environ['INSTALLER_TYPE']) self.dic_json['workingdir']=str(os.environ['PWD']) + self.dic_json['fname']=str(benchmark_fname) + self.dic_json['username']= str('root') + + if os.environ['INSTALLER_TYPE'] == str('joid'): + self.dic_json['username']=str('ubuntu') + for k,v in benchmark_detail: self.dic_json[k]=v for k, v in roles: @@ -49,5 +55,5 @@ class Driver: 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 ./benchmarks/playbooks/{0} --private-key=./data/QtipKey -i ./data/hosts --extra-vars \'{1}\' -v'.format(benchmark_name, dic_json) status = os.system(run_play) @@ -18,7 +18,7 @@ def main(): os.system('cd data/ref_results && python compute_suite.py') os.system('cd data/ref_results && python storage_suite.py') os.system('cd data/ref_results && python network_suite.py') - os.system('cd data/report && python Qtip_Report.py') +# os.system('cd data/report && python Qtip_Report.py') if __name__ == "__main__": main() diff --git a/test_list/compute b/test_list/compute index 044d8de6..7fc76145 100644 --- a/test_list/compute +++ b/test_list/compute @@ -1,8 +1,10 @@ -dhrystone_bm.yaml -dhrystone_vm.yaml -whetstone_bm.yaml -whetstone_vm.yaml -ssl_bm.yaml -ssl_vm.yaml -dpi_bm.yaml -dpi_vm.yaml +dhrystone_bm.yaml
+dhrystone_vm.yaml
+whetstone_bm.yaml
+whetstone_vm.yaml
+ramspeed_bm.yaml
+ramspeed_vm.yaml
+dpi_bm.yaml
+dpi_vm.yaml
+ssl_bm.yaml
+ssl_vm.yaml
\ No newline at end of file diff --git a/test_list/network b/test_list/network index c468f815..677f2ba4 100644 --- a/test_list/network +++ b/test_list/network @@ -1,3 +1,3 @@ iperf_bm.yaml iperf_vm.yaml -iperf_vm_2.yaml +iperf_vm_2.yaml
\ No newline at end of file |