bug fix: result collection bug fix for docker images

Change-Id: Ia4ea09b90c7a4f4e3699af456c6d66e85661cc0b
Signed-off-by: MofassirArif <Mofassir_Arif@dellteam.com>
(cherry picked from commit 971a7c98515a9d83661f5e423f7e8390f35dca59)

65 files changed, 420 insertions, 368 deletions

diff --git a/benchmarks/playbooks/cachebench.yaml b/benchmarks/playbooks/cachebench.yaml
index 510812bd..ebd0e172 100644
--- a/benchmarks/playbooks/cachebench.yaml
+++ b/benchmarks/playbooks/cachebench.yaml
@@ -33,6 +33,6 @@
       shell: (cd /root/results/; find . -maxdepth 1 -type f) | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src=/root/results/{{item}} dest=../../{{Dest_dir}}/cachebench
+      fetch:  src=/root/results/{{item}} dest={{workingdir}}/{{Dest_dir}}/cachebench
       with_items: files_to_copy.stdout_lines
 
diff --git a/benchmarks/playbooks/dhrystone.yaml b/benchmarks/playbooks/dhrystone.yaml
index 8144cc01..c3cfb333 100644
--- a/benchmarks/playbooks/dhrystone.yaml
+++ b/benchmarks/playbooks/dhrystone.yaml
@@ -2,10 +2,10 @@
    connection: local
    tasks:
     - name: making dhrystone directory
-      file: path=../../{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
     - name: making temporary dhrystone directory
-      file: path=../../{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
- 
+      file: path={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
+
  - hosts:  "{{role}}"
 
    tasks:
@@ -15,7 +15,7 @@
     - name: cleaning tempT
       shell: rm -rf $HOME/tempT
     - name: cleaning_qtip_result
-      shell: rm -rf $HOME/qtip_result 
+      shell: rm -rf $HOME/qtip_result
     - name: make directory
       shell: mkdir $HOME/qtip_result
     - include: ./sys_info_pbook.yaml
@@ -44,7 +44,7 @@
     - name: copying consolidated report script
       copy: src=./result_transform/final_report.py  dest={{home_dir.stdout}}/qtip_result/
     - name: making consolidated report
-      shell: cd $HOME/qtip_result && python final_report.py Dhrystone 
+      shell: cd $HOME/qtip_result && python final_report.py Dhrystone
     - name: making directory
       file: path={{home_dir.stdout}}/qtip_result/log state=directory
     - name: copying result to temp directory
@@ -53,15 +53,15 @@
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/dhrystone/dhrystone_temp
-      with_items: files_to_copy.stdout_lines 
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp
+      with_items: files_to_copy.stdout_lines
     - name: registering log files
       shell: (cd $HOME/qtip_result/log/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2
       register: copy_log_results
     - name: copying log results
-      fetch:  src={{home_dir.stdout}}/qtip_result/log/{{item}} dest=../../{{Dest_dir}}/dhrystone/dhrystone_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp
       with_items: copy_log_results.stdout_lines
-     
+
     - name: cleaning tempT
       shell: rm -rf $HOME/tempT
     - name: cleaning_qtip_result
@@ -72,13 +72,13 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: (find  ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dhrystone/)
+      shell: ( find  {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/)
     - name: making_logs_folder
-      shell: mkdir -p ../../{{Dest_dir}}/dhrystone/logs
+      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/dhrystone/logs
     - name: extracting_log
-      shell: (find ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/dhrystone/logs)
-    - name: removing dhrystone_temp 
-      shell: rm -rf ../../{{Dest_dir}}/dhrystone/dhrystone_temp 
+      shell: ( find {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/dhrystone/logs)
+    - name: removing dhrystone_temp
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/dhrystone/dhrystone_temp
    # - name: cleaning_2
    #   file: path=/root/tempT  state=absent
    #   file: path=/root/qtip_result state=absent
diff --git a/benchmarks/playbooks/dpi.yaml b/benchmarks/playbooks/dpi.yaml
index 029133d0..19ab30ce 100644
--- a/benchmarks/playbooks/dpi.yaml
+++ b/benchmarks/playbooks/dpi.yaml
@@ -1,14 +1,14 @@
  - hosts: 127.0.0.1
    connection: local
-   tasks: 
+   tasks:
     - name: making dpi directory
-      file: path=../../{{Dest_dir}}/dpi state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/dpi state=directory
     - name: making temporary whetstone directory
-      file: path=../../{{Dest_dir}}/dpi/dpi_temp state=directory
- 
+      file: path={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp state=directory
+
  - hosts: "{{role}}"
    tasks:
-   
+
     - name: checking_home directory
       shell: echo $HOME
       register: home_dir
@@ -40,14 +40,14 @@
     - name: Fetching Test_pcap file
       shell: cd $HOME/tempD/nDPI/example  &&  wget https://www.dropbox.com/s/ne64u7jykuw2uu5/test.pcap
     - name: fetch Averaging script
-      copy: src=./result_transform/dpi/dpi_average.sh dest={{home_dir.stdout}}/tempD/nDPI/example mode=777 
+      copy: src=./result_transform/dpi/dpi_average.sh dest={{home_dir.stdout}}/tempD/nDPI/example mode=777
     - name: Run nDPI benchmark
       shell: cd $HOME/tempD/nDPI/example && ./dpi_average.sh
     - name: copy result to temp_direc
       shell: cp $HOME/tempD/nDPI/example/dpi_dump.txt $HOME/qtip_result
     - name: fetch dpi result transform script
       copy: src=./result_transform/dpi/dpi_transform.py dest={{home_dir.stdout}}/qtip_result
-    
+
     - name: Transforming results
       shell: cd $HOME/qtip_result && python dpi_transform.py
     - name: copy report formation script
@@ -58,13 +58,13 @@
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/dpi/dpi_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp
       with_items: files_to_copy.stdout_lines
     - name: registering log files
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2
       register: copy_log_results
     - name: copying log results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/dpi/dpi_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/dpi/dpi_temp
       with_items: copy_log_results.stdout_lines
 
  #   - name: cleaning tempD
@@ -77,10 +77,10 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: (find  ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dpi/)
+      shell: ( find  {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/)
     - name: making_logs_folder
-      shell: mkdir -p ../../{{Dest_dir}}/dpi/logs
+      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/dpi/logs
     - name: extracting_log
-      shell: (find ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/dpi/logs)
+      shell: ( find {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/dpi/logs)
     - name: removing dpi_temp
-      shell: rm -rf ../../{{Dest_dir}}/dpi/dpi_temp
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/dpi/dpi_temp
diff --git a/benchmarks/playbooks/fio.yaml b/benchmarks/playbooks/fio.yaml
index f1d54fde..7162dc3b 100644
--- a/benchmarks/playbooks/fio.yaml
+++ b/benchmarks/playbooks/fio.yaml
@@ -2,9 +2,9 @@
    connection: local
    tasks:
     - name: making fio  directory
-      file: path=../../{{Dest_dir}}/fio state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/fio state=directory
     - name: making temporary fio directory
-      file: path=../../{{Dest_dir}}/fio/fio_temp state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/fio/fio_temp state=directory
 
 
  - hosts: "{{role}}"
@@ -54,24 +54,24 @@
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/fio/fio_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp
       with_items: files_to_copy.stdout_lines
     - name: registering log files
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2
       register: copy_log_results
     - name: copying log results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/fio/fio_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/fio/fio_temp
       with_items: copy_log_results.stdout_lines
 
  - hosts: 127.0.0.1
    connection: local
    tasks:
     - name: extracting_json
-      shell: (find  ../../{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/fio/)
+      shell: ( find  {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/)
     - name: making_logs_folder
-      shell: mkdir -p ../../{{Dest_dir}}/fio/logs
+      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/fio/logs
     - name: extracting_log
-      shell: (find ../../{{Dest_dir}}/fio/fio_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/fio/logs)
+      shell: ( find {{workingdir}}/{{Dest_dir}}/fio/fio_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/fio/logs)
     - name: removing fio_log
-      shell: rm -rf ../../{{Dest_dir}}/fio/fio_temp
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/fio/fio_temp
 
diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml
index 8f6d9cc2..d6bc00ed 100644
--- a/benchmarks/playbooks/iperf.yaml
+++ b/benchmarks/playbooks/iperf.yaml
@@ -1,14 +1,14 @@
  - hosts: 127.0.0.1
    connection: local
-   tasks: 
+   tasks:
 
     - name: getting directory
       shell: echo $PWD
       register: qtip_dir
     - name: making Iperf directory
-      file: path=../../{{Dest_dir}}/iperf state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/iperf state=directory
     - name: making temporary iperf directory
-      file: path=../../{{Dest_dir}}/iperf/iperf_temp state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp state=directory
 
 
  - hosts: "{{role}}"
@@ -53,7 +53,7 @@
       when: iptable_entry != '' and installertype == 'fuel'
     - name: Installing IPERF when Ubuntu
       shell: apt-get install iperf3 -y
-      when: ansible_os_family == "Debian" and rolename == '1-server'  
+      when: ansible_os_family == "Debian" and rolename == '1-server'
     - name: Installing Iperf3
       shell: yum install iperf3 -y
       when: ansible_os_family == "RedHat"
@@ -65,13 +65,13 @@
     - name: Running Iperf on Host
       shell: iperf3  --time {{duration}} -b {{bandwidthGbps}}G -c {{ip1}} -J -O10 >> ./qtip_result/iperf_raw.json
       ignore_errors: yes
-      with_items: 
+      with_items:
         - "{{ip1}}"
       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: 
+      with_items:
         - "{{ip1}}"
       when: rolename == "2-host" and "{{privateip1}}" != "NONE"
     - name: Fetching result transformation script
@@ -83,14 +83,14 @@
       copy: src=./result_transform/final_report.py dest={{home_dir.stdout}}/qtip_result
       when: rolename =="2-host" and "{{ip2}}" == ''
     - name: consolidating report
-      shell: cd $HOME/qtip_result &&  python final_report.py IPERF      
+      shell: cd $HOME/qtip_result &&  python final_report.py IPERF
       when: rolename =="2-host" and "{{ip2}}" == ''
-    - name: Files to Copy  
+    - name: Files to Copy
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
       when: rolename =="2-host" and "{{ip2}}" == ''
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/iperf/iperf_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
       with_items: files_to_copy.stdout_lines
       when: rolename =="2-host" and "{{ip2}}" == ''
     - name: registering log files
@@ -98,7 +98,7 @@
       register: copy_log_results
       when: rolename =="2-host" and "{{ip2}}" == ''
     - name: copying log results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/iperf/iperf_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
       with_items: copy_log_results.stdout_lines
       when: rolename =="2-host" and "{{ip2}}" == ''
 
@@ -111,15 +111,15 @@
         rolename: "{{role}}"
         when: role is defined
     - name: extracting_json
-      shell: (find  ../../{{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/iperf/)
+      shell: ( find  {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/iperf/)
       when: rolename == "2-host"
     - name: making_logs_folder
-      shell: mkdir -p ../../{{Dest_dir}}/iperf/logs
+      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/iperf/logs
     - name: extracting_log
-      shell: (find ../../{{Dest_dir}}/iperf/iperf_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/iperf/logs)
+      shell: ( find {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/iperf/logs)
       when: rolename == "2-host"
     - name: removing iperf_raw file
-      shell: rm -rf ../../{{Dest_dir}}/iperf/iperf_raw.json
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_raw.json
       when: rolename == "2-host"
     - name: removing iperf_temp
-      shell: rm -rf ../../{{Dest_dir}}/iperf/iperf_temp
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/iperf/iperf_temp
\ No newline at end of file
diff --git a/benchmarks/playbooks/netperf.yaml b/benchmarks/playbooks/netperf.yaml
index 3292f060..12943bcc 100644
--- a/benchmarks/playbooks/netperf.yaml
+++ b/benchmarks/playbooks/netperf.yaml
@@ -1,14 +1,14 @@
  - hosts: 127.0.0.1
    connection: local
-   tasks: 
+   tasks:
 
     - name: getting directory
       shell: echo $PWD
       register: qtip_dir
     - name: making Netperf directory
-      file: path=../../{{Dest_dir}}/netperf state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/netperf state=directory
     - name: making temporary netperf directory
-      file: path=../../{{Dest_dir}}/netperf/netperf_temp state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/netperf/netperf_temp state=directory
 
 
  - hosts: "{{role}}"
@@ -17,7 +17,7 @@
       set_fact:
         rolename: "{{role}}"
         when: role is defined
-    
+
     - name: Get Hostname
       shell: echo $HOSTNAME
       register: hostID
@@ -32,7 +32,7 @@
       shell: mkdir $HOME/netperf
     - name: making  results temporary directory
       shell: mkdir $HOME/qtip_result
-    
+
     - name: Fetching netperf
       shell: wget ftp://ftp.netperf.org/netperf/netperf-2.7.0.tar.gz
       when: ansible_os_family == "RedHat"
@@ -41,26 +41,26 @@
     - name: configuring netperf
       shell: cd $HOME/netperf-2.7.0  && ./configure
     - name: Making Netperf
-      shell: cd $HOME/netperf-2.7.0 && make 
+      shell: cd $HOME/netperf-2.7.0 && make
     - name: Installing Netperf
       shell: cd $HOME/netperf-2.7.0 && make install
-    
+
     - name: Running netperf on server
       shell: /usr/local/bin/netserver -p 4000
       when: rolename == "1-server"
-   
+
     - name: Running netperf on Host
       shell: /usr/local/bin/netperf -H {{privateip1}} -p 4000 -l {{duration}} -t {{teststream}} -fG >> ./qtip_result/server{{hostID.stdout}}-{{item}}.json
       ignore_errors: yes
-      with_items: 
+      with_items:
         - "{{ip1}}"
       when: rolename == "2-host" and "{{ip2}}" == ''
-      
-    - name: Files to Copy  
+
+    - name: Files to Copy
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/netperf/netperf_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/netperf/netperf_temp
       with_items: files_to_copy.stdout_lines
  - hosts: 127.0.0.1
    connection: local
@@ -70,7 +70,7 @@
         rolename: "{{role}}"
         when: role is defined
     - name: extracting_json
-      shell: ( find  ../../{{Dest_dir}}/netperf/netperf_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/netperf/)
+      shell: ( find  {{workingdir}}/{{Dest_dir}}/netperf/netperf_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/netperf/)
       when: rolename == "2-host"
     - name: removing netperf_temp
-      shell: rm -rf ../../{{Dest_dir}}/netperf/netperf_temp
\ No newline at end of file
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/netperf/netperf_temp
\ No newline at end of file
diff --git a/benchmarks/playbooks/pktgen.yaml b/benchmarks/playbooks/pktgen.yaml
index 04a0066e..466fb8e9 100644
--- a/benchmarks/playbooks/pktgen.yaml
+++ b/benchmarks/playbooks/pktgen.yaml
@@ -1,14 +1,14 @@
  - hosts: 127.0.0.1
    connection: local
-   tasks: 
+   tasks:
 
     - name: getting directory
       shell: echo $PWD
       register: qtip_dir
     - name: making pktgen directory
-      file: path=../../{{Dest_dir}}/pktgen state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/pktgen state=directory
     - name: making temporary pktgen directory
-      file: path=../../{{Dest_dir}}/pktgen/pktgen_temp state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/pktgen/pktgen_temp state=directory
 
 
  - hosts: "{{role}}"
@@ -17,7 +17,7 @@
       set_fact:
         rolename: "{{role}}"
         when: role is defined
-    
+
     - name: IPTABLE Setup
       shell: iptables -F
       when: rolename == '1-server'
@@ -30,7 +30,7 @@
  - hosts: "{{role}}"
    tasks:
     - name: Rolename
-      set_fact: 
+      set_fact:
         rolename: "{{role}}"
         when: role is defined
     - name: Get server packetsize
diff --git a/benchmarks/playbooks/ramspeed.yaml b/benchmarks/playbooks/ramspeed.yaml
index 365251b0..1d45f028 100644
--- a/benchmarks/playbooks/ramspeed.yaml
+++ b/benchmarks/playbooks/ramspeed.yaml
@@ -2,14 +2,14 @@
    connection: local
    tasks:
     - name: making ramspeed  directory
-      file: path=../../{{Dest_dir}}/ramspeed state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/ramspeed state=directory
     - name: making temporary ramspeed directory
-      file: path=../../{{Dest_dir}}/ramspeed/ramspeed_temp state=directory
- 
+      file: path={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp state=directory
+
 
  - hosts:  "{{role}}"
    tasks:
-   
+
     - name: checking_home directory
       shell: echo $HOME
       register: home_dir
@@ -18,9 +18,9 @@
     - name: cleaning previous results
       shell: rm -rf $HOME/qtip_result
     - name: making ramspeed temporary directory
-      shell: mkdir $HOME/ramspeed  
+      shell: mkdir $HOME/ramspeed
     - name: making  results temporary directory
-      shell: mkdir $HOME/qtip_result 
+      shell: mkdir $HOME/qtip_result
     - include: ./sys_info_pbook.yaml
       vars:
           network: false
@@ -54,23 +54,23 @@
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ramspeed/ramspeed_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp
       with_items: files_to_copy.stdout_lines
     - name: registering log files
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2
       register: copy_log_results
     - name: copying log results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ramspeed/ramspeed_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp
       with_items: copy_log_results.stdout_lines
 
  - hosts: 127.0.0.1
    connection: local
    tasks:
     - name: extracting_json
-      shell: (find  ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ramspeed/)
+      shell: ( find  {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/)
     - name: making_logs_folder
-      shell: mkdir -p ../../{{Dest_dir}}/ramspeed/logs
+      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/ramspeed/logs
     - name: extracting_log
-      shell: (find ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ramspeed/logs)
+      shell: ( find {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/ramspeed/logs)
     - name: removing ramspeed_log
-      shell: rm -rf ../../{{Dest_dir}}/ramspeed/ramspeed_temp
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/ramspeed/ramspeed_temp
diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml
index 75379d48..9416bb38 100644
--- a/benchmarks/playbooks/ssl.yaml
+++ b/benchmarks/playbooks/ssl.yaml
@@ -4,13 +4,13 @@
    sudo: no
    tasks:
     - name: making ssl directory
-      file: path=../../{{Dest_dir}}/ssl state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/ssl state=directory
     - name: making temporary ssl directory
-      file: path=../../{{Dest_dir}}/ssl/ssl_temp state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=directory
  - hosts: "{{role}}"
    remote_user: root
    tasks:
-   
+
     - name: checking_home directory
       shell: echo $HOME
       register: home_dir
@@ -19,9 +19,9 @@
     - name: cleaning previous results
       shell: rm -rf $HOME/qtip_result
     - name: making OpenSSL temporary directory
-      shell: mkdir $HOME/Open_SSL  
+      shell: mkdir $HOME/Open_SSL
     - name: making  results temporary directory
-      shell: mkdir $HOME/qtip_result 
+      shell: mkdir $HOME/qtip_result
     - include: ./sys_info_pbook.yaml
       vars:
           network: false
@@ -37,8 +37,8 @@
       shell: cd $HOME/Open_SSL/ && tar -zxvf openssl-1.0.2e.tar.gz
     - name: configure
       shell: cd $HOME/Open_SSL/openssl-1.0.2e  && ./config
-    - name: make 
-      shell: cd  $HOME/Open_SSL/openssl-1.0.2e && make 
+    - name: make
+      shell: cd  $HOME/Open_SSL/openssl-1.0.2e && make
     - name: make install
       shell: cd  $HOME/Open_SSL/openssl-1.0.2e  && make install
     - name: Benchmarking RSA signatures
@@ -57,16 +57,16 @@
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ssl/ssl_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
       with_items: files_to_copy.stdout_lines
     - name: registering log files
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2
       register: copy_log_results
     - name: copying log results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ssl/ssl_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
       with_items: copy_log_results.stdout_lines
 
-  
+
   #  - name: copy results
   #    fetch:  src=/root/results/{{item}}  dest={{Dest_dir}}/ssl
   #    with_items: files_to_copy.stdout_lines
@@ -76,11 +76,13 @@
    remote_user: '{{ ansible_env.USER }}'
    sudo: no
    tasks:
+    - name: echo
+      shell: echo $PWD
     - name: extracting_json
-      shell: (find  ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ssl/)
+      shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/)
     - name: making_logs_folder
-      shell: mkdir -p ../../{{Dest_dir}}/ssl/logs
+      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/ssl/logs
     - name: extracting_log
-      shell: (find ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ssl/logs)
+      shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/logs)
     - name: removing ssl_temp
-      shell: rm -rf ../../{{Dest_dir}}/ssl/ssl_temp
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml
index bcbccf3e..599b98f3 100644
--- a/benchmarks/playbooks/whetstone.yaml
+++ b/benchmarks/playbooks/whetstone.yaml
@@ -2,10 +2,10 @@
    connection: local
    tasks:
     - name: making whetstone directory
-      file: path=../../{{Dest_dir}}/whetstone state=directory
+      file: path={{workingdir}}/{{Dest_dir}}/whetstone state=directory
     - name: making temporary whetstone directory
-      file: path=../../{{Dest_dir}}/whetstone/whetstone_temp state=directory
- 
+      file: path={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp state=directory
+
  - hosts: "{{role}}"
 
    tasks:
@@ -45,7 +45,7 @@
     - name: copying consolidated report script
       copy: src=./result_transform/final_report.py  dest={{home_dir.stdout}}/qtip_result/
     - name: making consolidated report
-      shell: cd $HOME/qtip_result && python final_report.py Whetstone 
+      shell: cd $HOME/qtip_result && python final_report.py Whetstone
     - name: making directory
       file: path={{home_dir.stdout}}/qtip_result/log state=directory
     - name: copying result to temp directory
@@ -54,13 +54,13 @@
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.json") | cut -d'/' -f2
       register: files_to_copy
     - name: copy results
-      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp
-      with_items: files_to_copy.stdout_lines 
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp
+      with_items: files_to_copy.stdout_lines
     - name: registering log files
       shell: (cd $HOME/qtip_result/log/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2
       register: copy_log_results
     - name: copying log results
-      fetch:  src={{home_dir.stdout}}/qtip_result/log/{{item}} dest=../../{{Dest_dir}}/whetstone/whetstone_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/log/{{item}} dest={{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp
       with_items: copy_log_results.stdout_lines
     - name: cleaning tempT
       shell: rm -rf $HOME/tempT
@@ -72,10 +72,10 @@
    connection: local
    tasks:
     - name: extracting_json
-      shell: (find  ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/whetstone/)
+      shell: ( find  {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/)
     - name: making_logs_folder
-      shell: mkdir -p ../../{{Dest_dir}}/whetstone/logs
+      shell: mkdir -p {{workingdir}}/{{Dest_dir}}/whetstone/logs
     - name: extracting_log
-      shell: (find ../../{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/whetstone/logs)
-    - name: removing whetstone_temp 
-      shell: rm -rf ../../{{Dest_dir}}/whetstone/whetstone_temp
+      shell: ( find {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/whetstone/logs)
+    - name: removing whetstone_temp
+      shell: rm -rf {{workingdir}}/{{Dest_dir}}/whetstone/whetstone_temp
diff --git a/dashboard/pushtoDB.py b/dashboard/pushtoDB.py
index d056c18b..44602628 100644
--- a/dashboard/pushtoDB.py
+++ b/dashboard/pushtoDB.py
@@ -19,7 +19,9 @@ def push_results_to_db(db_url, case_name, payload,logger=None, pod_name="dell-us
               "version": "test" , "details": payload}

 

     headers = {'Content-Type': 'application/json'}

-    print json.dumps(params)

+    print pod_name

+    print installer

+    print creation_date

 

     try:

         r = requests.post(url, data=json.dumps(params), headers=headers)

@@ -41,10 +43,15 @@ 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=json.load(result_file)

-        push_results_to_db(TEST_DB, case , j)

+    if payload_list:

+        print payload_list

+        for suite,case in payload_list.items():

+            with open('results/'+suite,'r') as result_file:

+                j=json.load(result_file)

+            push_results_to_db(TEST_DB, case , j)

+    elif not payload_list:

+        print 'Results not found'

+

 

 if __name__ == "__main__":

     main()

diff --git a/data/hosts b/data/hosts
index ab071623..ec2e4b80 100644
--- a/data/hosts
+++ b/data/hosts
@@ -1,4 +1,4 @@
-[2-host]
-172.18.1.92
 [1-server]
-172.18.1.93
+10.20.0.5
+[2-host]
+10.20.0.4
diff --git a/data/my_key.pem b/data/my_key.pem
index 41d9e669..d7c96f24 100644
--- a/data/my_key.pem
+++ b/data/my_key.pem
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAzVkXQaXre1h1FmIOAPwgBst5y5crMVI6dSPIBqo0sLU4tCG7
-WdpZCYlyymj64gjOrHNT0rwX5t0YRywzh9mzOej5PDPBpS4uWxnb+jRpoy/m7fKp
-HDJgas8RWhRJ6CSMoCfD7ZxvEPnhHVNpgscKipE8ivoY173T9dGothiY48Z6430g
-NoLLIHiunL4lUyeBwZ9Sn6rLdHkL558wlxpiNbnaxCSIKywmuH3KiAVTQhAWGNQp
-a4BU4hP844tFiTVT7+oySHhEZokvBlE1RTc199s752tyEN1eBQGycsWw3csJ6Eth
-bwVWlKaGzJkTc+jcoOX420easK2Jrkha8Jk05QIDAQABAoIBAHuhlNfobiMf+baV
-KHs9UIbmwJhrlgymxh06grZIiVqOcOo6mNKbHBoaz6q/k7S8urmm4aOxrO5I1NIc
-8ZVr43UNJ+kv+/lYGX6tzfwQzDz8nRtLirc4OUZ1DqxeJLUINEZESrjnAxOEbh06
-1/5tmZIdqQa/Vm+lkVSheuLPYlVXWDPhJNhYZlAfbR6TiRnEmLnuTiuV4KHbuT9u
-OpeB2PBGFF7qmlAFKMHTNQ/tMQvKZqZCD+u49spN33XJ7vp18WjCjlfYf7l5ysTX
-BqOtIaqp/mCi/o45u3OWVG2R4JUEAVEYYjohS7BSs8pqpeyGDGOOykYP3Tl1zakt
-CXReZWECgYEA+F/oOfH3bBu/tR4vjl7faFJaiJxqgwzg1NlmE9b9S4NSb2DQuv98
-o74kf61MiMg8XcuuJzkpbEze8BJUsacMtlHWI5G1KMgUfLYhjqE/YRZj9eUO/Cb/
-pSWzHOSC1Tbz9FRP6+8DcHB/TWRId8iX6RRsFWBA/fGflISY2l01E+kCgYEA06cE
-axalbEonNJZ2F8Dnj2DBMoKmkODQw7JSqYYgePiSiPlBBFkCGzUu0nrxduWIXVPp
-MdcIlm+B2C6CWNA9Na4x6I+5cy6ku4+lt8Oz59pqY0x909iyYJ6SA8GeaQcPnoVu
-c5h/G2eA3oc6SxsMK/22GwNR55CPkAva9+A3p50CgYAEXLLYaa59wJMCXFBbgMEN
-tPyQD6czPAOq2VKYoJr8O4c0G5Au6JPI0GsVrvZ8JIAi6ZPabn+Svlrf/oJsSFHJ
-1fAb2dBDshfiBNTcC2rwipMg23AC77BntxzJMh42Hmv0a5Knwx/dVqx1sIAxUl2Q
-o2Iuke0ySI8T7aw9kYuAGQKBgGLR3U8+sJfh+3IjOhoXGEaqTyoNNEX6oZ5teQjr
-teelb42CiyfDgyc+6pCdlHYF72hb0EpT8w+CGqbb+EINYDbbETRbPqQXyBRGmoI1
-Xp9HLFsWkL1DtO1FvDkCwrqY8GL8O7i/H8GkzteXXdFJXKKBf/AW2bv7k/wWfPM0
-/edFAoGAR2QJQpvz/qAa64SndY32jYB9KMIb8aZJ7xe11+MgljFJ93MK1rsOtBXP
-hbxoRaQUMw8MyuadOrUiK8vUNuFzRa/JNKB23bVb9fhMgbNkRYauJjj7Pl/KlxEs
-azwNk2nziRpd3qWhvU1rAjFGUs6vjzMFQsJPXFGs+hnZTObH+6A=
+MIIEowIBAAKCAQEAntmA9ybqcxQKr9R3iTbNr+89ZJwlt5+gLbT8VR9sUAYCEEJn
+xX7DX5djpSdQ1OoxJun/HE0ByKPXCIqGq3sHnxQ/3Wh80UGlyiSXgS8/p8NlfgPr
+DIDuVNhKJlsobsfTVXL789i512rqf2zFBWfoesFgZee6ACrSYN3hdNICFOwtbmHA
+g+xEs00yGmbcFDuBQnDeR2yPpV6G4AtrU5zwliVj7fMzrB5w9De20ydbFqxjPdOD
+gbfwrhQQs82pv7vfJCFByjsSlwP4mcznKgOt/aO2y/B1ZvL+dOsCi8D3H6Ggrg7R
+wmiIRaCijYX4SycYxdn+RkZpp9g0AyR/potcKwIDAQABAoIBADncgF2Gj1/brQjf
+G6ufiszLGFHNju+T9YSwqDlZeNqtVZMWnTYTNpdbTbCa4Zast7q1AXgNlNjA1VMH
+IobUCbKobZr4tH6Eqx82tPkZfNZfFlkQlE25qRa+skPGcLPpldFKUPxBtXACQeio
+dhvB/ay5Q6PbBKWK85bVO4qR9LApxHCDQgovGtasUF1/wu5z4vOCP3KLtlE268m+
+XJ/4IZX2erBOfxOGPqp+qDK8FTP1NcuGFEkhUa8Tr406CIXptTDyPc+bMZANIGDM
+hhww6VR5aHxsHWgu1UITVZuDh5fJ8U6n2utqTm/QLT25DUPKoTJSAjLet7fnm4Cw
+hee7GgECgYEAziiWq4peA9WrJYTlR8bNRLgsMjZx/AphyJQpFCQsgCMuB9wIluTT
+5Di4jvdvKclsFTh6foxnltltX6O8tL+vrzfbK9fBB3A2T1V1sDMOznhI47Mmoqk6
+9le6aMmpTIhNFJMu1DpsuoxRLIJaNkWLCwWaIE1ZggqCgbjIdMOJt20CgYEAxUDo
+DUf0zi/qYZVVTnziubcqu0kjUWhmeEiv08WFst8l2fAwHBILNms5ot4TY5MlFxta
+vLsWaXC7o6tqofSHF52cD8AbUWEnvK2NtCA7gW+0xBtQEPqrtItA0YjblFXw7qwb
+QUValSo535bFYJjp5foJxTZXg9rErF4iUgExqvcCgYBK5t5PNvePhxsmh5FSMb20
+oQGVwMhLHW6HlKUUJ0xvxdhcjKomQL9npOAROX8O/JqjXyDKR7L/UMH3RKM0PIzV
+KYMc+8erLy7cRh17RiG0DGnXKOj5omjExfz5Q4OaRc9TkWIrQ4rrgD2h4T5rh3rM
+J13nLJM/txfRj9Rs7/piRQKBgCm3RFwqr5c7gvIIRvZGaxyjpCHfodyBm8osdSLw
+Two5LyQcK9CD8GMd4h6ToL4aTGnKmzH2zxKViNlgUzjVIgzYhDzAgAaB6Yl5mtJR
+TsRc/3nJ3PD6Un3oRVkK/IUud7nCJDF1nWaWe47RsARx0mWUr6RJjdCQ368kaVW2
+cu6ZAoGBALD4Gw+AsH6/za7gmRIqlzBURHpHCgKutQKv3UbD1hVc5tDAoYwBjjod
+AVY8N8+AmX/nmJOVcch/dAnICkLrZn5Bm/q52/3xCAlnGkwNHyW4G99lZCfNEQrx
+sVAZ4FNrtMC9Xwtj0o73ojqKP4gxVkljbybnbuyNSXZo14EbXuJU
 -----END RSA PRIVATE KEY-----
diff --git a/docs/compute_testcases.rst b/docs/compute_testcases.rst
index 4463691b..6e91698d 100644
--- a/docs/compute_testcases.rst
+++ b/docs/compute_testcases.rst
@@ -15,7 +15,7 @@ All the compute benchmarks could be run in 2 scenarios:
 1. On Baremetal Machines provisioned by an OPNFV installer (Host machines)
 2. On Virtual Machines brought up through OpenStack on an OPNFV platform
 
-Note: The Compute benchmark suite constains relatively old benchmarks such as dhrystone and whetstone. The suite would be updated for better benchmarks such as Linbench for the OPNFV C release. 
+Note: The Compute benchmark suite constains relatively old benchmarks such as dhrystone and whetstone. The suite would be updated for better benchmarks such as Linbench for the OPNFV C release.
 
 ============
 Benchmarks
diff --git a/docs/how-to-use-docs/03-usage-guide.rst b/docs/how-to-use-docs/03-usage-guide.rst
index 2bd2f034..2829d669 100644
--- a/docs/how-to-use-docs/03-usage-guide.rst
+++ b/docs/how-to-use-docs/03-usage-guide.rst
@@ -10,10 +10,10 @@
 Guide to run QTIP:

 ==================

 

-This guide will serve as a first step to familiarize the user with how to 

-run QTIP the first time when the user clones QTIP on to their host machine. 

-In order to clone QTIP please follow the instructions in the 

-installation.rst located in docs/userguide/installation.rst. 

+This guide will serve as a first step to familiarize the user with how to

+run QTIP the first time when the user clones QTIP on to their host machine.

+In order to clone QTIP please follow the instructions in the

+installation.rst located in docs/userguide/installation.rst.

 

 QTIP Directory structure:

 -------------------------

@@ -26,10 +26,10 @@ test_cases/:
 ------------

 

 This folder is used to store all the config files which are used to setup the

- environment prior to a test. This folder is further divided into opnfv pods 

- which run QTIP. Inside each pod there are folders which contain the config 

+ environment prior to a test. This folder is further divided into opnfv pods

+ which run QTIP. Inside each pod there are folders which contain the config

  files segmented based on test cases. Namely, these include, `Compute`,

- `Network` and `Storage`. The default folder is there for the end user who 

+ `Network` and `Storage`. The default folder is there for the end user who

  is interested in testing their infrastructure but arent part of a opnfv pod.

 

 The structure of the directory for the user appears as follows

@@ -39,8 +39,8 @@ The structure of the directory for the user appears as follows
   test_cases/default/network

   test_cases/default/storage

 

-The benchmarks that are part of the QTIP framework are listed under these 

-folders. An example of the compute folder is shown below. 

+The benchmarks that are part of the QTIP framework are listed under these

+folders. An example of the compute folder is shown below.

 Their naming convention is <BENCHMARK>_<VM/BM>.yaml

 ::

 

@@ -55,16 +55,16 @@ Their naming convention is <BENCHMARK>_<VM/BM>.yaml
   dpi_vm.yaml

   dpi_bm.yaml

 

-The above listed files are used to configure the environment. The VM/BM tag 

-distinguishes between a test to be run on the Virtual Machine or the compute 

+The above listed files are used to configure the environment. The VM/BM tag

+distinguishes between a test to be run on the Virtual Machine or the compute

 node itself, respectively.

 

 

 test_list/:

 -----------

 

-This folder contains three files, namely `compute`, `network` and `storage`. 

-These files list the benchmarks are to be run by the QTIP framework. Sample 

+This folder contains three files, namely `compute`, `network` and `storage`.

+These files list the benchmarks are to be run by the QTIP framework. Sample

 compute test file is shown below

 ::

 

@@ -73,20 +73,20 @@ compute test file is shown below
   whetstone_vm.yaml

   ssl_bm.yaml

 

-The compute file will now run all the benchmarks listed above one after 

-another on the environment. `NOTE: Please ensure there are no blank lines 

+The compute file will now run all the benchmarks listed above one after

+another on the environment. `NOTE: Please ensure there are no blank lines

 in this file as that has been known to throw an exception`.

 

 Preparing a config file for test:

 ---------------------------------

 

-We will be using dhrystone as a example to list out the changes that the 

+We will be using dhrystone as a example to list out the changes that the

 user will need to do in order to run the benchmark.

 Dhrystone on Compute Nodes:

 ^^^^^^^^^^^^^^^^^^^^^^^^^^^

 

-QTIP framework can run benchmarks on the actual compute nodes as well. In 

-order to run dhrystone on the compute nodes we will be editing the 

+QTIP framework can run benchmarks on the actual compute nodes as well. In

+order to run dhrystone on the compute nodes we will be editing the

 dhrystone_bm.yaml file.

 

 ::

@@ -96,12 +96,12 @@ dhrystone_bm.yaml file.
     host: machine_1, machine_2

     server:

 

-The `Scenario` field is used by to specify the name of the benchmark to 

-run as done by `benchmark: dhrystone`. The `host` and `server` tag are 

-not used for the compute benchmarks but are included here to help the 

-user `IF` they wish to control the execution. By default both machine_1 

-and machine_2 will have dhrystone run on them in parallel but the user 

-can change this so that machine_1 run dhrystone before machine_2. This 

+The `Scenario` field is used by to specify the name of the benchmark to

+run as done by `benchmark: dhrystone`. The `host` and `server` tag are

+not used for the compute benchmarks but are included here to help the

+user `IF` they wish to control the execution. By default both machine_1

+and machine_2 will have dhrystone run on them in parallel but the user

+can change this so that machine_1 run dhrystone before machine_2. This

 will be elaborated in the `Context` tag.

 

 ::

@@ -120,13 +120,13 @@ will be elaborated in the `Context` tag.
      Virtual_Machines:

 

 The `Context` tag helps the user list the number of compute nodes they want

- to run dhrystone on. The user can list all the compute nodes under the 

- `Host_Machines` tag. All the machines under test must be listed under the 

- `Host_Machines` and naming it incrementally higher. The `ip:` tag is used 

- to specify the IP of the particular compute node. The `pw:` tag can be left 

- blank because QTIP uses its own key for ssh. In order to run dhrystone on 

- one compute node at a time the user needs to edit the `role:` tag. `role: 

- host` for machine_1 and `role: server` for machine_2 will allow for 

+ to run dhrystone on. The user can list all the compute nodes under the

+ `Host_Machines` tag. All the machines under test must be listed under the

+ `Host_Machines` and naming it incrementally higher. The `ip:` tag is used

+ to specify the IP of the particular compute node. The `pw:` tag can be left

+ blank because QTIP uses its own key for ssh. In order to run dhrystone on

+ one compute node at a time the user needs to edit the `role:` tag. `role:

+ host` for machine_1 and `role: server` for machine_2 will allow for

  dhrystone to be run on machine_1 and then run on machine_2.

 

 ::

@@ -136,11 +136,11 @@ The `Context` tag helps the user list the number of compute nodes they want
     Test_category: "Compute"

     Benchmark: "dhrystone"

     Overview: >

-        ''' This test will run the dhrystone benchmark in parallel  on 

+        ''' This test will run the dhrystone benchmark in parallel  on

         machine_1 and machine_2.

 

-The above field is purely for a description purpose to explain to the user 

-the working of the test and is not fed to the framework.         

+The above field is purely for a description purpose to explain to the user

+the working of the test and is not fed to the framework.

 

 Sample dhrystone_bm.yaml file:

 ------------------------------

@@ -169,12 +169,12 @@ Sample dhrystone_bm.yaml file:
     Test_category: "Compute"

     Benchmark: "dhrystone"

     Overview: >

-        ''' This test will run the dhrystone benchmark in parallel  on 

+        ''' This test will run the dhrystone benchmark in parallel  on

         machine_1 and machine_2.\n

 

 Dhrystone on Virtual Machine:

 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-To run dhrystone on the VMs we will be editing dhrystone_vm.yaml file. 

+To run dhrystone on the VMs we will be editing dhrystone_vm.yaml file.

 Snippets on the file are given below.

 

 ::

@@ -182,23 +182,23 @@ Snippets on the file are given below.
   Scenario:

   benchmark: dhrystone

   host: virtualmachine_1, virtualmachine_2

-  server: 

+  server:

 

 

-The `Scenario` field is used by to specify the name of the benchmark to 

-run as done by `benchmark: dhrystone`. The `host` and `server` tag are 

-not used for the compute benchmarks but are included here to help the 

-user `IF` they wish to control the execution. By default both 

-virtualmachine_1 and virtualmachine_2 will have dhrystone run on them 

-in parallel but the user can change this so that virtualmachine_1 run 

-dhrystone before virtualmachine_2. This will be elaborated in the 

+The `Scenario` field is used by to specify the name of the benchmark to

+run as done by `benchmark: dhrystone`. The `host` and `server` tag are

+not used for the compute benchmarks but are included here to help the

+user `IF` they wish to control the execution. By default both

+virtualmachine_1 and virtualmachine_2 will have dhrystone run on them

+in parallel but the user can change this so that virtualmachine_1 run

+dhrystone before virtualmachine_2. This will be elaborated in the

 `Context` tag.

 ::

 

   Context:

     Host_Machines:

 

-    Virtual_Machines:  

+    Virtual_Machines:

       virtualmachine_1:

         availability_zone: compute1

         public_network: 'net04_ext'

@@ -212,20 +212,20 @@ dhrystone before virtualmachine_2. This will be elaborated in the
         flavor: m1.large

         role: host

 

-The `Context` tag helps the user list the number of VMs and their 

-characteristic. The user can list all the VMs they want to bring up 

-under the `Virtual_Machines:` tag. In the above example we will be 

-bringing up two VMs. One on Compute1 and the other on Compute2. The 

-user can change this as desired `NOTE: Please ensure you have the 

-necessary compute nodes before listing under the 'availability_zone:' 

+The `Context` tag helps the user list the number of VMs and their

+characteristic. The user can list all the VMs they want to bring up

+under the `Virtual_Machines:` tag. In the above example we will be

+bringing up two VMs. One on Compute1 and the other on Compute2. The

+user can change this as desired `NOTE: Please ensure you have the

+necessary compute nodes before listing under the 'availability_zone:'

 tag`. The rest of the options do not need to be modified by the user.

 

 Running dhrystone sequentially (Optional):

 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

 

-In order to run dhrystone on one VM at a time the user needs to edit 

-the `role:` tag. `role: host` for virtualmachine_1 and `role: server` 

-for virtualmachine_2 will allow for dhrystone to be run on 

+In order to run dhrystone on one VM at a time the user needs to edit

+the `role:` tag. `role: host` for virtualmachine_1 and `role: server`

+for virtualmachine_2 will allow for dhrystone to be run on

 virtualmachine_1 and then run on virtualmachine_2.

 

 ::

@@ -233,11 +233,11 @@ virtualmachine_1 and then run on virtualmachine_2.
   Test_Description:

     Test_category: "Compute"

     Benchmark: "dhrystone"

-    Overview: 

-    This test will run the dhrystone benchmark in parallel on 

+    Overview:

+    This test will run the dhrystone benchmark in parallel on

     virtualmachine_1 and virtualmachine_2

 

-The above field is purely for a decription purpose to explain to 

+The above field is purely for a decription purpose to explain to

 the user the working of the test and is not fed to the framework.

 

 Sample dhrystone_vm.yaml file:

@@ -247,12 +247,12 @@ Sample dhrystone_vm.yaml file:
   Scenario:

   benchmark: dhrystone

   host: virtualmachine_1, virtualmachine_2

-  server: 

+  server:

 

   Context:

     Host_Machines:

 

-    Virtual_Machines:  

+    Virtual_Machines:

       virtualmachine_1:

         availability_zone: compute1

         public_network: 'net04_ext'

@@ -265,10 +265,49 @@ Sample dhrystone_vm.yaml file:
         OS_image: QTIP_CentOS

         flavor: m1.large

         role: host

-  

+

   Test_Description:

     Test_category: "Compute"

     Benchmark: "dhrystone"

     Overview: >

-    This test will run the dhrystone benchmark in parallel on 

+    This test will run the dhrystone benchmark in parallel on

     machine_1 and machine_2.\n

+

+Commands to run the Framework:

+==============================

+

+In order to start QTIP on the default lab please use the following commands (asssuming you have prepared the config files in the test_cases/default/ directory and listed the intended suite in the test_list/<RELEVANT-SUITE-FILE>):

+

+First step is to export the necessary information to the environment.

+::

+

+  source get_env_info.sh -n <INSTALLER_TYPE> -i <INSTALLER_IP>

+

+for running qtip on an openstack deployed using FUEL with the Installer IP 10.20.0.2

+::

+

+   source get_env_info.sh -n fuel -i 10.20.0.2

+

+This will generate the `opnfv-creds.sh` file needed to use the python clients for keystone, glance, nova, and neutron.

+::

+

+  source opnfv-creds.sh

+

+Running QTIP on the using `default` as the pod name and for the `compute` suite

+::

+

+  python qtip.py -l default -f compute

+

+Running QTIP on the using `default` as the pod name and for the `network` suite

+::

+

+  python qtip.py -l default -f network

+

+Running QTIP on the using `default` as the pod name and for the `storage` suite

+::

+

+  python qtip.py -l default -f network

+

+Results:

+========

+QTIP generates results in the `results/` directory are listed down under the particularly benchmark name. So all the results for dhrystone would be listed and time stamped.
\ No newline at end of file
diff --git a/docs/iperf_testcase.rst b/docs/network_testcases.rst
index fa2b44a4..ac68b11b 100644
--- a/docs/iperf_testcase.rst
+++ b/docs/network_testcases.rst
@@ -1,13 +1,13 @@
 NETWORK THROUGHPUT TESTCASE

 

 QTIP uses IPerf3 as the main tool for testing the network throughput.

-There are two tests that are run through the QTIP framework. 

+There are two tests that are run through the QTIP framework.

 

 Network Throughput for VMs

 Network Throughput for Compute Nodes

 

-For the throughout of the compute nodes we simply go into the systems-under-test 

-and install iperf3 on the nodes. One of the SUTs is used a server and the other as a 

+For the throughout of the compute nodes we simply go into the systems-under-test

+and install iperf3 on the nodes. One of the SUTs is used a server and the other as a

 client. The client pushes traffic to the server for a duration specified by the user

 configuration file for iperf. These files can be found in the test_cases/{POD}/network/

 directory. The bandwidth is limited only by the physical link layer speed available to the server.

@@ -32,11 +32,10 @@ involved in this topology, only the OVS (Integration bridge) is being benchmarke
 of 14-15 Gbps.

 

 For the topology where the VMs are spawned on different compute nodes, the path the packet takes becomes more cumbersome.

-The packet leaves a VM and makes its way to the Integration Bridge as in the first topology however the integration bridge 

+The packet leaves a VM and makes its way to the Integration Bridge as in the first topology however the integration bridge

 forwards the packet to the physical link through the ethernet bridge. The packet then gets a VLAN/Tunnel depending on the network

 and is forwarded to the particular Compute node where the second VM is spwaned. The packets enter the compute node through the physical

 ethernet port and makes its way to the VM through the integration bridge and linux bridge. As seen here the path is much more involved

 even when discussed without the mention of overheads faced at all the internfaces so we are seeing the results in the range of 2 Gbps.

 

 

- 
\ No newline at end of file
diff --git a/func/cli.py b/func/cli.py
index b8718407..9b140874 100644
--- a/func/cli.py
+++ b/func/cli.py
@@ -16,21 +16,21 @@ 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):
 
         return filepath
-    
+
     def _checkTestList(self, filename):
-    
+
         if os.path.isfile('test_list/'+filename):
             return True
         else:
@@ -44,7 +44,7 @@ class cli():
             return False
 
     def __init__(self):
-    
+
         suite=[]
         parser = argparse.ArgumentParser()
         parser.add_argument('-l ', '--lab', help='Name of Lab on which being tested, These can' \
@@ -60,7 +60,7 @@ class cli():
                                             '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)
@@ -85,7 +85,7 @@ class cli():
                 if os.path.isfile('./test_cases/'+args.lab.lower()+'/'+suite[0]+'/' +benchmarks[items]):
                     [benchmark, roles, vm_info, benchmark_details, pip] = obj.parse('./test_cases/'
                                                                     +args.lab.lower()+'/'+suite[0]+'/'+benchmarks[items])
-                    
+
                     if len(vm_info) != 0:
                         vmObj =''
                         vmObj = SpawnVM(vm_info)
diff --git a/func/driver.py b/func/driver.py
index 7ccbb0c0..d20c0e9f 100644
--- a/func/driver.py
+++ b/func/driver.py
@@ -18,6 +18,7 @@ class Driver:
     def __init__(self):
 
         print "Class driver initialized\n"
+        print os.environ['PWD']
         self.dic_json = defaultdict()
 
     def drive_bench(self, benchmark, roles, benchmark_detail= None, pip_dict = None):
@@ -30,6 +31,7 @@ class Driver:
         self.dic_json['ip1']=''
         self.dic_json['ip2']=''
         self.dic_json['installer']=str(os.environ['INSTALLER_TYPE'])
+        self.dic_json['workingdir']=str(os.environ['PWD'])
         for k,v in benchmark_detail:
             self.dic_json[k]=v
         for k, v in roles:
@@ -40,7 +42,7 @@ class Driver:
                     if k ==  '1-server':
                         print values, 'saving IP'
                         self.dic_json['ip'+str(index)]= str(values)
-                        if pip_dict[0][1][0]:    
+                        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'
diff --git a/func/env_setup.py b/func/env_setup.py
index 5676d05b..9fd7c106 100644
--- a/func/env_setup.py
+++ b/func/env_setup.py
@@ -59,7 +59,7 @@ class Env_setup():
                 os.system(ssh_c)
                 ssh_cmd = './data/qtip_creds.sh  {0}'.format(ipvar)
                 print ssh_cmd
-                res = os.system(ssh_cmd) 
+                res = os.system(ssh_cmd)
                 for infinity in range(100):
                     try :
                         ssh = paramiko.SSHClient()
@@ -70,7 +70,7 @@ class Env_setup():
                         break
                     except:
                         print 'Retrying aSSH'
-                        time.sleep(1)    
+                        time.sleep(1)
             if v == '':
                 print ('SSH->>>>>', k)
                 ssh_c = 'ssh-keyscan {0} >> ~/.ssh/known_hosts'.format(k)
diff --git a/func/fetchimg.py b/func/fetchimg.py
index 106dc7e8..1c621a3b 100644
--- a/func/fetchimg.py
+++ b/func/fetchimg.py
@@ -22,7 +22,7 @@ class FetchImg:
     def download(self):
         time.sleep(2)
         os.system(
-            'cd ./Temp_Img && wget http://artifacts.opnfv.org/qtip/QTIP_CentOS.qcow2')
+            'mkdir -p Temp_Img && wget http://artifacts.opnfv.org/qtip/QTIP_CentOS.qcow2 -P Temp_Img')
 
         filepath = './Temp_Img/QTIP_CentOS.qcow2'
         while not os.path.isfile(filepath):
diff --git a/func/spawn_vm.py b/func/spawn_vm.py
index 4723e999..9d1d0bad 100644
--- a/func/spawn_vm.py
+++ b/func/spawn_vm.py
@@ -43,20 +43,22 @@ class SpawnVM(Env_setup):
     def get_installer_type(self):
         print 'Getting Installer Name'
         return os.environ['INSTALLER_TYPE']
-    
+
     def get_public_network(self,installer_detected):
-    
+
         '''
         TODO: GET THE NAMES OF THE PUBLIC NETWORKS for OTHER PROJECTS
-        '''        
+        '''
         print 'Getting Public Network'
         if installer_detected.lower() == 'fuel':
             return 'net04_ext'
         if installer_detected.lower() == 'apex':
-            return 'net04_ext'
+            return 'external'
         if installer_detected.lower() == 'compass':
-            return 'net04_ext'
-            
+            return 'ext-net'
+        if installer_detected.lower() == 'joid':
+            return 'ext-net'
+
     def HeatTemplate_vm(self, vm_params, installer):
         try:
             Heat_Dic=''
@@ -73,7 +75,7 @@ class SpawnVM(Env_setup):
         fopenstr = fopenstr.rstrip()
         scriptcmd = '#!/bin/bash \n echo {0} >>  foo.txt \n echo {1} >> /root/.ssh/authorized_keys'.format(
             fopenstr, fopenstr)
-            
+
         netName = self.get_public_network(installer)
         print netName
         Heat_Dic['heat_template_version'] = '2014-10-16'
diff --git a/test_cases/default/compute/dhrystone_vm.yaml b/test_cases/default/compute/dhrystone_vm.yaml
index c14399b1..8f5a4165 100644
--- a/test_cases/default/compute/dhrystone_vm.yaml
+++ b/test_cases/default/compute/dhrystone_vm.yaml
@@ -6,7 +6,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-  
+
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
diff --git a/test_cases/default/compute/dpi_bm.yaml b/test_cases/default/compute/dpi_bm.yaml
index f161aa3f..1bc534b3 100644
--- a/test_cases/default/compute/dpi_bm.yaml
+++ b/test_cases/default/compute/dpi_bm.yaml
@@ -31,4 +31,4 @@ Test_Description:
           pw:
           role:
           '''
- 
+
diff --git a/test_cases/default/compute/dpi_vm.yaml b/test_cases/default/compute/dpi_vm.yaml
index 8a157e7a..10e86993 100644
--- a/test_cases/default/compute/dpi_vm.yaml
+++ b/test_cases/default/compute/dpi_vm.yaml
@@ -14,7 +14,7 @@ Context:
       role: 1Run
       flavor: m1.large
      virtualmachine_2:
-      availability_zone: compute4
+      availability_zone: compute2
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1Run
diff --git a/test_cases/default/compute/ramspeed_vm.yaml b/test_cases/default/compute/ramspeed_vm.yaml
index b79f4443..a6a4363f 100644
--- a/test_cases/default/compute/ramspeed_vm.yaml
+++ b/test_cases/default/compute/ramspeed_vm.yaml
@@ -6,7 +6,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-  
+
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
diff --git a/test_cases/default/compute/ssl_bm.yaml b/test_cases/default/compute/ssl_bm.yaml
index bded6d2d..dc038822 100644
--- a/test_cases/default/compute/ssl_bm.yaml
+++ b/test_cases/default/compute/ssl_bm.yaml
@@ -6,14 +6,14 @@ Context:
   Host_Machines:
     machine_1:
       ip: 10.20.0.4
-      pw: 
+      pw:
       role: 1Run
     machine_2:
       ip: 10.20.0.5
       pw:
       role: 1Run
   Virtual_Machines:
-      
+
 
 Test_Description:
   Test_category: "Compute"
@@ -28,4 +28,4 @@ Test_Description:
           OS_image:
           flavor:
           role:
-          '''   
+          '''
diff --git a/test_cases/default/compute/ssl_vm.yaml b/test_cases/default/compute/ssl_vm.yaml
index cbacf088..37824896 100644
--- a/test_cases/default/compute/ssl_vm.yaml
+++ b/test_cases/default/compute/ssl_vm.yaml
@@ -5,7 +5,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -33,4 +33,4 @@ Test_Description:
           OS_image:
           flavor:
           role:
-          '''   
+          '''
diff --git a/test_cases/default/compute/whetstone_bm.yaml b/test_cases/default/compute/whetstone_bm.yaml
index 136ac2b0..180d4e51 100644
--- a/test_cases/default/compute/whetstone_bm.yaml
+++ b/test_cases/default/compute/whetstone_bm.yaml
@@ -1,4 +1,4 @@
-  
+
 Scenario:
   benchmark: whetstone
   host: machine_1, machine_2
@@ -8,15 +8,15 @@ Context:
   Host_Machines:
     machine_1:
       ip: 10.20.0.4
-      pw: 
+      pw:
       role: host
     machine_2:
       ip: 10.20.0.5
       pw:
       role: host
-  Virtual_Machines:  
-   
-      
+  Virtual_Machines:
+
+
 
 Test_Description:
   Test_category: "Compute"
@@ -30,5 +30,5 @@ Test_Description:
           pw:
           role:
            '''
-  
- 
+
+
diff --git a/test_cases/default/compute/whetstone_vm.yaml b/test_cases/default/compute/whetstone_vm.yaml
index 17928fa1..0f1e8748 100644
--- a/test_cases/default/compute/whetstone_vm.yaml
+++ b/test_cases/default/compute/whetstone_vm.yaml
@@ -1,12 +1,12 @@
 Scenario:
   benchmark: whetstone
   host: virtualmachine_1, virtualmachine_1
-  server: 
+  server:
 
 Context:
   Host_Machines:
-    
-  Virtual_Machines:  
+
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-     
+
 
 Test_Description:
   Test_category: "Compute"
diff --git a/test_cases/default/network/iperf_vm_2.yaml b/test_cases/default/network/iperf_vm_2.yaml
index 90fd334d..c5b94715 100644
--- a/test_cases/default/network/iperf_vm_2.yaml
+++ b/test_cases/default/network/iperf_vm_2.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
 
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute2
@@ -27,7 +27,7 @@ Context:
       public_network: 'net04_ext'
       role: 2-host
       flavor: m1.large
-    
+
 Test_Description:
   Test_category: "network"
   Benchmark: "iperf"
diff --git a/test_cases/default/network/netperf.yaml b/test_cases/default/network/netperf.yaml
index 267b288d..f4ce396b 100644
--- a/test_cases/default/network/netperf.yaml
+++ b/test_cases/default/network/netperf.yaml
@@ -4,7 +4,7 @@ Scenario:
   server : virtualmachine_1
   client: virtualmachine_2
   benchmark_details:
-    duration: 10 
+    duration: 10
     teststream: udp_stream
 
 Context:
@@ -17,7 +17,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute2
@@ -25,7 +25,7 @@ Context:
       public_network: 'net04_ext'
       role: 2-host
       flavor: m1.large
-    
+
 Test_Description:
   Test_category: "network"
   Benchmark: "netperf"
diff --git a/test_cases/default/storage/fio_bm.yaml b/test_cases/default/storage/fio_bm.yaml
index 4778c385..5c5309e7 100644
--- a/test_cases/default/storage/fio_bm.yaml
+++ b/test_cases/default/storage/fio_bm.yaml
@@ -27,7 +27,7 @@ Test_Description:
          The job conists of an fio load of:
           1.50% rand read 50% rand write
           2.Asynch engine
-          3.Direct IO. 
+          3.Direct IO.
           4.Queing depth of 2
 
          if you wish to add another  machine add the following information under the Host_Machines tag
diff --git a/test_cases/default/storage/fio_vm.yaml b/test_cases/default/storage/fio_vm.yaml
index dcd27252..5ae90d2c 100644
--- a/test_cases/default/storage/fio_vm.yaml
+++ b/test_cases/default/storage/fio_vm.yaml
@@ -5,7 +5,7 @@ Scenario:
 
 Context:
   Host_Machines:
-    
+
   Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
@@ -29,11 +29,11 @@ Test_Description:
          The job conists of an fio load of:
           1.50% rand read 50% rand write
           2.Asynch engine
-          3.Direct IO. 
+          3.Direct IO.
           4.Queing depth of 2
 
          if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-  
+
         virtualmachine_3:
           availability_zone:
           public_network:
diff --git a/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml
index 022cf5ee..4c1fc962 100644
--- a/test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml
+++ b/test_cases/dell-us-deploying-bm3/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.4
-      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/dell-us-deploying-bm3/compute/dhrystone_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml
index c14399b1..8f5a4165 100644
--- a/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml
@@ -6,7 +6,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-  
+
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
diff --git a/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml
index f161aa3f..1bc534b3 100644
--- a/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml
@@ -31,4 +31,4 @@ Test_Description:
           pw:
           role:
           '''
- 
+
diff --git a/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml
index 8a157e7a..10e86993 100644
--- a/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml
@@ -14,7 +14,7 @@ Context:
       role: 1Run
       flavor: m1.large
      virtualmachine_2:
-      availability_zone: compute4
+      availability_zone: compute2
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1Run
diff --git a/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml
index 47b933b8..a63df3e2 100644
--- a/test_cases/dell-us-deploying-bm3/compute/ramspeed_bm.yaml
+++ b/test_cases/dell-us-deploying-bm3/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.4
-      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/dell-us-deploying-bm3/compute/ramspeed_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml
index b79f4443..a6a4363f 100644
--- a/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/ramspeed_vm.yaml
@@ -6,7 +6,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-  
+
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
diff --git a/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml
index bded6d2d..dc038822 100644
--- a/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml
@@ -6,14 +6,14 @@ Context:
   Host_Machines:
     machine_1:
       ip: 10.20.0.4
-      pw: 
+      pw:
       role: 1Run
     machine_2:
       ip: 10.20.0.5
       pw:
       role: 1Run
   Virtual_Machines:
-      
+
 
 Test_Description:
   Test_category: "Compute"
@@ -28,4 +28,4 @@ Test_Description:
           OS_image:
           flavor:
           role:
-          '''   
+          '''
diff --git a/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml
index cbacf088..37824896 100644
--- a/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml
@@ -5,7 +5,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -33,4 +33,4 @@ Test_Description:
           OS_image:
           flavor:
           role:
-          '''   
+          '''
diff --git a/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml
index 136ac2b0..180d4e51 100644
--- a/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml
@@ -1,4 +1,4 @@
-  
+
 Scenario:
   benchmark: whetstone
   host: machine_1, machine_2
@@ -8,15 +8,15 @@ Context:
   Host_Machines:
     machine_1:
       ip: 10.20.0.4
-      pw: 
+      pw:
       role: host
     machine_2:
       ip: 10.20.0.5
       pw:
       role: host
-  Virtual_Machines:  
-   
-      
+  Virtual_Machines:
+
+
 
 Test_Description:
   Test_category: "Compute"
@@ -30,5 +30,5 @@ Test_Description:
           pw:
           role:
            '''
-  
- 
+
+
diff --git a/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml b/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml
index 17928fa1..0f1e8748 100644
--- a/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml
+++ b/test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml
@@ -1,12 +1,12 @@
 Scenario:
   benchmark: whetstone
   host: virtualmachine_1, virtualmachine_1
-  server: 
+  server:
 
 Context:
   Host_Machines:
-    
-  Virtual_Machines:  
+
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-     
+
 
 Test_Description:
   Test_category: "Compute"
diff --git a/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml
index 3d2862bf..0a5be9af 100644
--- a/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml
+++ b/test_cases/dell-us-deploying-bm3/network/iperf_bm.yaml
@@ -20,7 +20,7 @@ Context:
         role: 2-host
 
   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/dell-us-deploying-bm3/network/iperf_vm.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml
index 14d50890..d7079e99 100644
--- a/test_cases/dell-us-deploying-bm3/network/iperf_vm.yaml
+++ b/test_cases/dell-us-deploying-bm3/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
 
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute1
@@ -27,7 +27,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_vm_2.yaml b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml
index 90fd334d..c5b94715 100644
--- a/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.yaml
+++ b/test_cases/dell-us-deploying-bm3/network/iperf_vm_2.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
 
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute2
@@ -27,7 +27,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/netperf.yaml b/test_cases/dell-us-deploying-bm3/network/netperf.yaml
index 267b288d..f4ce396b 100644
--- a/test_cases/dell-us-deploying-bm3/network/netperf.yaml
+++ b/test_cases/dell-us-deploying-bm3/network/netperf.yaml
@@ -4,7 +4,7 @@ Scenario:
   server : virtualmachine_1
   client: virtualmachine_2
   benchmark_details:
-    duration: 10 
+    duration: 10
     teststream: udp_stream
 
 Context:
@@ -17,7 +17,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute2
@@ -25,7 +25,7 @@ Context:
       public_network: 'net04_ext'
       role: 2-host
       flavor: m1.large
-    
+
 Test_Description:
   Test_category: "network"
   Benchmark: "netperf"
diff --git a/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml
index 4778c385..5c5309e7 100644
--- a/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml
+++ b/test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml
@@ -27,7 +27,7 @@ Test_Description:
          The job conists of an fio load of:
           1.50% rand read 50% rand write
           2.Asynch engine
-          3.Direct IO. 
+          3.Direct IO.
           4.Queing depth of 2
 
          if you wish to add another  machine add the following information under the Host_Machines tag
diff --git a/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml b/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml
index dcd27252..5ae90d2c 100644
--- a/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml
+++ b/test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml
@@ -5,7 +5,7 @@ Scenario:
 
 Context:
   Host_Machines:
-    
+
   Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
@@ -29,11 +29,11 @@ Test_Description:
          The job conists of an fio load of:
           1.50% rand read 50% rand write
           2.Asynch engine
-          3.Direct IO. 
+          3.Direct IO.
           4.Queing depth of 2
 
          if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-  
+
         virtualmachine_3:
           availability_zone:
           public_network:
diff --git a/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml
index ffe7b7ff..6824a6d3 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dhrystone_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/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,5 @@ Test_Description:
           OS_image:
           flavor:
           role: '''
-  
- 
+
+
diff --git a/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml
index c14399b1..8f5a4165 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/dhrystone_vm.yaml
@@ -6,7 +6,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-  
+
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
diff --git a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml
index 810224bc..6de46387 100644
--- a/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/dpi_bm.yaml
@@ -6,11 +6,11 @@ Context:
   Host_Machines:
      machine_1:
        ip: 10.20.0.6
-       pw: 
+       pw:
        role: 1host
      machine_2:
        ip: 10.20.0.5
-       pw: 
+       pw:
        role: 1host
   Virtual_Machines:
 Test_Description:
@@ -31,4 +31,4 @@ Test_Description:
           pw:
           role:
           '''
- 
+
diff --git a/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml
index a8d2cbfe..ce6d8921 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ramspeed_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/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/dell-us-testing-bm-1/compute/ramspeed_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml
index b79f4443..a6a4363f 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/ramspeed_vm.yaml
@@ -6,7 +6,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-  
+
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
diff --git a/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml
index 50c2f622..e3f336b3 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/ssl_bm.yaml
@@ -6,14 +6,14 @@ Context:
   Host_Machines:
     machine_1:
       ip: 10.20.0.6
-      pw: 
+      pw:
       role: 1Run
     machine_2:
       ip: 10.20.0.5
       pw:
       role: 1Run
   Virtual_Machines:
-      
+
 
 Test_Description:
   Test_category: "Compute"
@@ -28,4 +28,4 @@ Test_Description:
           OS_image:
           flavor:
           role:
-          '''   
+          '''
diff --git a/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml
index cbacf088..37824896 100644
--- a/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/ssl_vm.yaml
@@ -5,7 +5,7 @@ Scenario:
 Context:
   Host_Machines:
 
-  Virtual_Machines:  
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -33,4 +33,4 @@ Test_Description:
           OS_image:
           flavor:
           role:
-          '''   
+          '''
diff --git a/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml b/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml
index d4d2b244..d75dee64 100644
--- a/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/whetstone_bm.yaml
@@ -1,4 +1,4 @@
-  
+
 Scenario:
   benchmark: whetstone
   host: machine_1, machine_2
@@ -8,15 +8,15 @@ 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"
@@ -30,5 +30,5 @@ Test_Description:
           pw:
           role:
            '''
-  
- 
+
+
diff --git a/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml b/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml
index 17928fa1..0f1e8748 100644
--- a/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml
+++ b/test_cases/dell-us-testing-bm-1/compute/whetstone_vm.yaml
@@ -1,12 +1,12 @@
 Scenario:
   benchmark: whetstone
   host: virtualmachine_1, virtualmachine_1
-  server: 
+  server:
 
 Context:
   Host_Machines:
-    
-  Virtual_Machines:  
+
+  Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
       public_network: 'net04_ext'
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
-     
+
 
 Test_Description:
   Test_category: "Compute"
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
index 4fd3d7f5..6f0cf3b7 100644
--- a/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/network/iperf_bm.yaml
@@ -20,7 +20,7 @@ Context:
         role: 2-host
 
   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/dell-us-testing-bm-1/network/iperf_vm.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml
index 14d50890..d7079e99 100644
--- a/test_cases/dell-us-testing-bm-1/network/iperf_vm.yaml
+++ b/test_cases/dell-us-testing-bm-1/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
 
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute1
@@ -27,7 +27,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-testing-bm-1/network/iperf_vm_2.yaml b/test_cases/dell-us-testing-bm-1/network/iperf_vm_2.yaml
index 90fd334d..c5b94715 100644
--- 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
@@ -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
 
@@ -19,7 +19,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute2
@@ -27,7 +27,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-testing-bm-1/network/netperf.yaml b/test_cases/dell-us-testing-bm-1/network/netperf.yaml
index 267b288d..f4ce396b 100644
--- a/test_cases/dell-us-testing-bm-1/network/netperf.yaml
+++ b/test_cases/dell-us-testing-bm-1/network/netperf.yaml
@@ -4,7 +4,7 @@ Scenario:
   server : virtualmachine_1
   client: virtualmachine_2
   benchmark_details:
-    duration: 10 
+    duration: 10
     teststream: udp_stream
 
 Context:
@@ -17,7 +17,7 @@ Context:
       OS_image: QTIP_CentOS
       public_network: 'net04_ext'
       role: 1-server
-      flavor: m1.large   
+      flavor: m1.large
 
     virtualmachine_2:
       availability_zone: compute2
@@ -25,7 +25,7 @@ Context:
       public_network: 'net04_ext'
       role: 2-host
       flavor: m1.large
-    
+
 Test_Description:
   Test_category: "network"
   Benchmark: "netperf"
diff --git a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml b/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml
index 4b78f084..3346e398 100644
--- a/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml
+++ b/test_cases/dell-us-testing-bm-1/storage/fio_bm.yaml
@@ -7,11 +7,11 @@ Context:
   Host_Machines:
     machine_1:
       ip: 10.20.0.7
-      pw: 
+      pw:
       role: host
     machine_2:
       ip: 10.20.0.6
-      pw: 
+      pw:
       role: host
 
 
@@ -27,7 +27,7 @@ Test_Description:
          The job conists of an fio load of:
           1.50% rand read 50% rand write
           2.Asynch engine
-          3.Direct IO. 
+          3.Direct IO.
           4.Queing depth of 2
 
          if you wish to add another  machine add the following information under the Host_Machines tag
diff --git a/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml b/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml
index dcd27252..5ae90d2c 100644
--- a/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml
+++ b/test_cases/dell-us-testing-bm-1/storage/fio_vm.yaml
@@ -5,7 +5,7 @@ Scenario:
 
 Context:
   Host_Machines:
-    
+
   Virtual_Machines:
     virtualmachine_1:
       availability_zone: compute1
@@ -29,11 +29,11 @@ Test_Description:
          The job conists of an fio load of:
           1.50% rand read 50% rand write
           2.Asynch engine
-          3.Direct IO. 
+          3.Direct IO.
           4.Queing depth of 2
 
          if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-  
+
         virtualmachine_3:
           availability_zone:
           public_network:
diff --git a/test_list/compute b/test_list/compute
index 825ac680..044d8de6 100644
--- a/test_list/compute
+++ b/test_list/compute
@@ -1,7 +1,8 @@
-dhrystone_vm.yaml
 dhrystone_bm.yaml
+dhrystone_vm.yaml
 whetstone_bm.yaml
 whetstone_vm.yaml
 ssl_bm.yaml
+ssl_vm.yaml
 dpi_bm.yaml
-ramspeed_bm.yaml
+dpi_vm.yaml