aboutsummaryrefslogtreecommitdiffstats
path: root/benchmarks/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'benchmarks/playbooks')
-rw-r--r--benchmarks/playbooks/info_script/info_collect.py6
-rw-r--r--benchmarks/playbooks/result_transform/ssl/ssl_transform.py20
-rw-r--r--benchmarks/playbooks/sys_info_pbook.yaml2
3 files changed, 14 insertions, 14 deletions
diff --git a/benchmarks/playbooks/info_script/info_collect.py b/benchmarks/playbooks/info_script/info_collect.py
index b352651e..7e5544c0 100644
--- a/benchmarks/playbooks/info_script/info_collect.py
+++ b/benchmarks/playbooks/info_script/info_collect.py
@@ -17,7 +17,7 @@ est_ob2.close()
Info_dict={};
inxi_host=os.popen("""cat $PWD/est_1 | grep -o -P '(?<=Host:).*(?=Kernel)' """).read().lstrip().rstrip()
-inxi_mem=os.popen("""cat $PWD/est_1 | grep -o -P '(?<=Memory:).*(?=Init)' """).read().lstrip().rstrip()
+inxi_mem=os.popen("""cat $PWD/est_1 | grep -o -P '(?<=Memory:).*(?=MB)' """).read().lstrip().rstrip()+"MB"
inxi_cpu=os.popen("""cat $PWD/est_1 | grep -o -P '(?<=CPU).*(?=speed)' | cut -f2 -d':'""").read().lstrip().rstrip()
inxi_distro=os.popen(""" cat $PWD/est_1 | grep -o -P '(?<=Distro:).*(?=Machine:)' """).read().rstrip().lstrip()
inxi_kernel=os.popen(""" cat $PWD/est_1 | grep -o -P '(?<=Kernel:).*(?=Console:)' """).read().rstrip().lstrip()
@@ -72,7 +72,7 @@ if (network_flag == 'n'):
Info_dict['9_Network_Interfaces']['Interface_'+str(x)]['2_Interface_info']=inxi_card_2
else:
print "No network cards"
- os.system("bwm-ng -c 1 | grep -v '=' | grep -v 'iface' | grep -v '-' > bwm_dump")
+ os.system("bwm-ng -o plain -c 1 | grep -v '=' | grep -v 'iface' | grep -v '-' > bwm_dump")
n_interface=int(os.popen(" cat bwm_dump | grep -v 'total' | wc -l ").read().rstrip())
interface={};
for x in range (1,n_interface):
@@ -82,7 +82,7 @@ if (network_flag == 'n'):
interface[str(interface_name)]['Tx (KB/s)']=os.popen(" cat bwm_dump | awk 'NR=="+str(x)+"' | awk '{print $4}' ").read().rstrip()
interface[str(interface_name)]['Total (KB/s)']=os.popen(" cat bwm_dump | awk 'NR== "+str(x)+"' | awk '{print $6}' ").read().rstrip()
- Info_dict['Interface I/O']=interface
+ Info_dict['10.Interface I/O']=interface
print Info_dict
diff --git a/benchmarks/playbooks/result_transform/ssl/ssl_transform.py b/benchmarks/playbooks/result_transform/ssl/ssl_transform.py
index 20ca5cff..6e632251 100644
--- a/benchmarks/playbooks/result_transform/ssl/ssl_transform.py
+++ b/benchmarks/playbooks/result_transform/ssl/ssl_transform.py
@@ -48,18 +48,18 @@ os.system("cat AES-128-CBC_dump >> " + hostname + "-" + time_stamp + ".log")
result = {}
result['1. Version'] = [openssl_version]
-result['2. RSA singatures'] = {}
-result['2. RSA singatures']['1. 512 bits (sign/s)'] = [rsa_512_sps]
-result['2. RSA singatures']['2. 1024 bits (sign/s)'] = [rsa_1024_sps]
-result['2. RSA singatures']['3. 2048 bits (sign/s)'] = [rsa_2048_sps]
-result['2. RSA singatures']['4. 4096 bits (sign/s)'] = [rsa_4096_sps]
+result['2. RSA signatures'] = {}
+result['2. RSA signatures']['1. 512 bits (sign/s)'] = rsa_512_sps
+result['2. RSA signatures']['2. 1024 bits (sign/s)'] = rsa_1024_sps
+result['2. RSA signatures']['3. 2048 bits (sign/s)'] = rsa_2048_sps
+result['2. RSA signatures']['4. 4096 bits (sign/s)'] = rsa_4096_sps
result['3. AES-128-cbc throughput'] = {}
-result['3. AES-128-cbc throughput']['1. 16 Bytes block (B/sec)'] = [aes_16B]
-result['3. AES-128-cbc throughput']['2. 64 Bytes block (B/sec)'] = [aes_64B]
-result['3. AES-128-cbc throughput']['3. 256 Bytes block (B/sec)'] = [aes_256B]
-result['3. AES-128-cbc throughput']['4. 1024 Bytes block (B/sec)'] = [aes_1024B]
-result['3. AES-128-cbc throughput']['5. 16 Bytes block (B/sec)'] = [aes_8192B]
+result['3. AES-128-cbc throughput']['1. 16 Bytes block (B/sec)'] = aes_16B
+result['3. AES-128-cbc throughput']['2. 64 Bytes block (B/sec)'] = aes_64B
+result['3. AES-128-cbc throughput']['3. 256 Bytes block (B/sec)'] = aes_256B
+result['3. AES-128-cbc throughput']['4. 1024 Bytes block (B/sec)'] = aes_1024B
+result['3. AES-128-cbc throughput']['5. 8192 Bytes block (B/sec)'] = aes_8192B
with open('./result_temp', 'w+') as result_file:
diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml
index cca6c941..b5415aad 100644
--- a/benchmarks/playbooks/sys_info_pbook.yaml
+++ b/benchmarks/playbooks/sys_info_pbook.yaml
@@ -5,7 +5,7 @@
shell: yum install inxi -y
when: ansible_os_family == "RedHat"
- name: system info collection tool install when Ubuntu
- shell: apt-get install inxi -y
+ shell: apt-get update && apt-get install inxi -y
when: ansible_os_family == "Debian"
- name: Install ansible copy dependencies if remote host has selinux enabled
shell: yum install libselinux-python -y