Removed Root previlages

QTIP now uses a key of its own to ssh into VMs
The ssh for the baremetal servers still needs work

Change-Id: I1aa37e07c4f9b3f7f4902d16cdbf74f39eb6c698
Signed-off-by: Mofassir Arif <Mofassir_arif@dellteam.com>

Conflicts:
	.gitignore

10 files changed, 39 insertions, 188 deletions

diff --git a/benchmarks/playbooks/dhrystone.yaml b/benchmarks/playbooks/dhrystone.yaml
index 34ccfd89..d825e878 100644
--- a/benchmarks/playbooks/dhrystone.yaml
+++ b/benchmarks/playbooks/dhrystone.yaml
@@ -2,9 +2,9 @@
    connection: local
    tasks:
     - name: making dhrystone directory
-      file: path={{Dest_dir}}/dhrystone/dhrystone_temp state=directory
+      file: path=../../{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
     - name: making temporary dhrystone directory
-      file: path={{Dest_dir}}/dhrystone/dhrystone_temp state=directory
+      file: path=../../{{Dest_dir}}/dhrystone/dhrystone_temp state=directory
  
  - hosts:  "{{role}}"
 
@@ -19,11 +19,8 @@
     - name: make directory
       shell: mkdir $HOME/qtip_result
     - include: ./sys_info_pbook.yaml
-<<<<<<< HEAD
       vars:
           network: false
-=======
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
     - name: Installing UnixBench dependencies if CentOS
       shell: yum install git gcc  patch perl-Time-HiRes -y
       when: ansible_os_family == "RedHat"
@@ -56,13 +53,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}}/dhrystone/dhrystone_temp
+      fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{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=../../{{Dest_dir}}/dhrystone/dhrystone_temp
       with_items: copy_log_results.stdout_lines
      
     - name: cleaning tempT
@@ -75,18 +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  ../../{{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dhrystone/)
     - name: making_logs_folder
-      shell: mkdir -p {{Dest_dir}}/dhrystone/logs
+      shell: mkdir -p ../../{{Dest_dir}}/dhrystone/logs
     - name: extracting_log
-      shell: ( find {{Dest_dir}}/dhrystone/dhrystone_temp/ -name "*.log"  | xargs cp -t {{Dest_dir}}/dhrystone/logs)
+      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: rm -rf ../../{{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 b2c87d35..3bc6e017 100644
--- a/benchmarks/playbooks/dpi.yaml
+++ b/benchmarks/playbooks/dpi.yaml
@@ -2,9 +2,9 @@
    connection: local
    tasks: 
     - name: making dpi directory
-      file: path={{Dest_dir}}/dpi state=directory
+      file: path=../../{{Dest_dir}}/dpi state=directory
     - name: making temporary whetstone directory
-      file: path={{Dest_dir}}/dpi/dpi_temp state=directory
+      file: path=../../{{Dest_dir}}/dpi/dpi_temp state=directory
  
  - hosts: "{{role}}"
    tasks:
@@ -19,11 +19,8 @@
     - name: make qtip_result
       shell: mkdir $HOME/qtip_result
     - include: ./sys_info_pbook.yaml
-<<<<<<< HEAD
       vars:
           network: false
-=======
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
     - name: Installing nDPI dependencies if CentOS
       shell: yum install git gcc patch  perl-Time-HiRes autofconf automake libpcap-devel libtool -y
       when: ansible_os_family == "RedHat"
@@ -61,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=../../{{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=../../{{Dest_dir}}/dpi/dpi_temp
       with_items: copy_log_results.stdout_lines
 
  #   - name: cleaning tempD
@@ -80,11 +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  ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/dpi/)
     - name: making_logs_folder
-      shell: mkdir -p {{Dest_dir}}/dpi/logs
+      shell: mkdir -p ../../{{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 ../../{{Dest_dir}}/dpi/dpi_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/dpi/logs)
     - name: removing dpi_temp
-      shell: rm -rf {{Dest_dir}}/dpi/dpi_temp
-
+      shell: rm -rf ../../{{Dest_dir}}/dpi/dpi_temp
\ No newline at end of file
diff --git a/benchmarks/playbooks/info_script/info_collect.py b/benchmarks/playbooks/info_script/info_collect.py
index 6dbb51b3..e286d683 100644
--- a/benchmarks/playbooks/info_script/info_collect.py
+++ b/benchmarks/playbooks/info_script/info_collect.py
@@ -3,97 +3,8 @@ import pickle
 import time
 import datetime
 import json
-<<<<<<< HEAD
 import sys
 
-os.system('inxi -b -c0 -n > $PWD/est_2')
-est_ob=open("est_2","r+")
-est_ob2=open("est_1","w+")
-in_string= est_ob.read().replace('\n',' ')
-cpu_idle=float(os.popen("""top -bn1 | grep "Cpu(s)" | awk '{print $8}'""").read().rstrip())
-cpu_usage= 100-cpu_idle
-est_ob2.write(in_string);
-est_ob.close()
-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_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()
-inxi_HD=os.popen(""" cat $PWD/est_1 | grep -o -P '(?<=HDD Total Size:).*(?=Info:)' """).read().rstrip().lstrip()
-inxi_product=os.popen(""" cat $PWD/est_1 | grep -o -P '(?<=product:).*(?=Mobo:)' """).read().rstrip().lstrip()
-
-
-
-Info_dict['1_Hostname']=inxi_host
-Info_dict['2_Product']=inxi_product
-Info_dict['3_OS Distribution']=inxi_distro
-Info_dict['4_Kernel']=inxi_kernel
-Info_dict['5_CPU']=inxi_cpu
-Info_dict['6_CPU_Usage']=str(round(cpu_usage,3))+'%'
-Info_dict['7_Memory Usage']=inxi_mem
-Info_dict['8_Disk usage']=inxi_HD
-network_flag=str(sys.argv[1]).rstrip()
-
-if (network_flag == 'n'):
-    
-    Info_dict['9_Network_Interfaces']={};
-    tem_2=""" cat $PWD/est_1 | grep -o -P '(?<=Network:).*(?=Info:)'"""
-    print os.system(tem_2+' > Hello')
-    i=int(os.popen(tem_2+" | grep -o 'Card' | wc -l ").read())
-    print i
-
-
-    for x in range (1,i+1):
-            tem=""" cat $PWD/est_1 | grep -o -P '(?<=Card-"""+str(x)+""":).*(?=Card-"""+str(x+1)+""")'"""
-            if i == 1:
-                tem=""" cat $PWD/est_1 | grep -o -P '(?<=Network:).*(?=Info:)'"""
-                inxi_card_1=((os.popen(tem+" | grep -o -P '(?<=Card:).*(?=Drives:)'|sed 's/ *driver:.*//'").read().rstrip().lstrip()))
-                print inxi_card_1
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]={};
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]['1_Network_Card']=inxi_card_1
-                inxi_card_2=((os.popen(tem+"| grep -o -P '(?<=Card:).*(?=Drives:)'|sed -e 's/^.*IF: //'").read())).rstrip().lstrip()
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]['2_Interface_info']=inxi_card_2
-            elif x < (i):
-                print "two"
-                #inxi_Card_temp=((os.popen(""" cat $PWD/est_1 | grep -o -P '(?<=Card-"""+str(x)+""":).*(?=Card-"""+str(x+1)+""")' """).read().rstrip().lstrip()))
-                inxi_card_1=((os.popen(tem+"| sed 's/ *driver:.*//'").read().rstrip().lstrip()))
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]={};
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]['1_Network_Card']=inxi_card_1
-                inxi_card_2=((os.popen(tem+"|sed -e 's/^.*IF: //'").read())).rstrip().lstrip()
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]['2_Interface_info']=inxi_card_2
-            elif x == i:
-                print "Three"
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]={};
-                inxi_card_1=((os.popen(""" cat $PWD/est_1 | grep -o -P '(?<=Card-"""+str(x)+""":).*(?=Drives:)'| sed 's/ *driver:.*//' """).read().rstrip().lstrip()))
-                Info_dict['9_Network_Interfaces']['Interface_'+str(x)]['1_Network_Card']=inxi_card_1
-                inxi_card_2=((os.popen(""" cat $PWD/est_1 | grep -o -P '(?<=Card-"""+str(x)+""":).*(?=Drives:)'| sed -e 's/^.*IF: //' """).read().rstrip().lstrip()))
-                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")
-    n_interface=int(os.popen(" cat bwm_dump | grep -v 'total' |  wc -l ").read().rstrip())
-    interface={};
-    for x in range (1,n_interface):
-        interface_name=os.popen(" cat bwm_dump | awk 'NR=="+str(x)+"' | awk '{print $1}' ").read().rstrip().replace(':','')
-        interface[str(interface_name)]={};
-        interface[str(interface_name)]['Rx (KB/s)']=os.popen(" cat bwm_dump | awk 'NR=="+str(x)+"' | awk '{print $2}' ").read().rstrip()
-        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
-
-print Info_dict
-    
-with open('./sys_info_temp','w+')as out_info:
-    pickle.dump(Info_dict,out_info)
-
-with open('temp','w+') as result_json:
-    json.dump(Info_dict,result_json,indent=4,sort_keys=True)
-
-=======
 
 os.system('inxi -b -c0 -n > $PWD/est_2')
 est_ob = open("est_2", "r+")
@@ -195,4 +106,4 @@ with open('./sys_info_temp', 'w+')as out_info:
     pickle.dump(Info_dict, out_info)
 
 #	 json.dump(Info_dict, out_json, sort_keys=True,separators=(',',':'),indent=4)
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
+
diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml
index 9d4d185c..dd5c2b0f 100644
--- a/benchmarks/playbooks/iperf.yaml
+++ b/benchmarks/playbooks/iperf.yaml
@@ -34,6 +34,8 @@
     - name: making  results temporary directory
       shell: mkdir $HOME/qtip_result
     - include: ./sys_info_pbook.yaml
+      vars:
+        network: true
     - name: Installing Epel-release when CentOS
       shell: yum install epel-release -y
       when: ansible_os_family == "RedHat"
@@ -84,4 +86,4 @@
         when: role is defined
     - name: extracting_json
       shell: ( find  ../../{{Dest_dir}}/iperf/iperf_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/iperf/)
-      when: rolename == "2-host"
+      when: rolename == "2-host"
\ No newline at end of file
diff --git a/benchmarks/playbooks/ramspeed.yaml b/benchmarks/playbooks/ramspeed.yaml
index ce2ac25d..6e317ec5 100644
--- a/benchmarks/playbooks/ramspeed.yaml
+++ b/benchmarks/playbooks/ramspeed.yaml
@@ -2,9 +2,9 @@
    connection: local
    tasks:
     - name: making ramspeed  directory
-      file: path={{Dest_dir}}/ramspeed state=directory
+      file: path=../../{{Dest_dir}}/ramspeed state=directory
     - name: making temporary ramspeed directory
-      file: path={{Dest_dir}}/ramspeed/ramspeed_temp state=directory
+      file: path=../../{{Dest_dir}}/ramspeed/ramspeed_temp state=directory
  
 
  - hosts:  "{{role}}"
@@ -65,18 +65,18 @@
 
   
     - name: copy results
-      fetch:  src=/root/results/{{item}}  dest={{Dest_dir}}/ssl
+      fetch:  src=/root/results/{{item}}  dest=../../{{Dest_dir}}/ssl
       with_items: files_to_copy.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  ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ramspeed/)
     - name: making_logs_folder
-      shell: mkdir -p {{Dest_dir}}/ramspeed/logs
+      shell: mkdir -p ../../{{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 ../../{{Dest_dir}}/ramspeed/ramspeed_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ramspeed/logs)
     - name: removing ramspeed_log
-      shell: rm -rf {{Dest_dir}}/ramspeed/ramspeed_temp
+      shell: rm -rf ../../{{Dest_dir}}/ramspeed/ramspeed_temp
 
diff --git a/benchmarks/playbooks/result_transform/dpi/dpi_transform.py b/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
index 2aa45757..b95e0e23 100644
--- a/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
+++ b/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
@@ -46,9 +46,4 @@ result = {}
 result['DPI_benchmark(M pps)'] = round(dpi_result_pps, 3)
 result['DPI_benchmark(Gb/s)'] = round(dpi_result_bps, 3)
 with open('./result_temp', 'w+') as result_file:
-    pickle.dump(result, result_file)
-<<<<<<< HEAD
-
-=======
-print json.dumps(result, indent=4, sort_keys=True)
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
+    pickle.dump(result, result_file)
\ No newline at end of file
diff --git a/benchmarks/playbooks/result_transform/ssl/ssl_transform.py b/benchmarks/playbooks/result_transform/ssl/ssl_transform.py
index 575b94a0..20ca5cff 100644
--- a/benchmarks/playbooks/result_transform/ssl/ssl_transform.py
+++ b/benchmarks/playbooks/result_transform/ssl/ssl_transform.py
@@ -35,11 +35,7 @@ aes_1024B = os.popen(
 aes_8192B = os.popen(
     "cat AES-128-CBC_dump | grep  'aes-128-cbc  ' | awk '{print $6}' ").read().rstrip()
 
-<<<<<<< HEAD
 
-=======
-#    def get_nova_client(self):
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
 hostname = os.popen("hostname").read().rstrip()
 time_stamp = str(datetime.datetime.utcnow().isoformat())
 
@@ -47,13 +43,7 @@ time_stamp = str(datetime.datetime.utcnow().isoformat())
 os.system("mv RSA_dump " + hostname + "-" + time_stamp + ".log")
 os.system("cat AES-128-CBC_dump >> " + hostname + "-" + time_stamp + ".log")
 
-<<<<<<< HEAD
-=======
-#      if self._glance_client is None:
-##          keystone = self.get_keystone_client()
-#         nova = client.Client('2', token = keystone.auth_token)
 
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
 
 result = {}
 
@@ -75,9 +65,3 @@ result['3. AES-128-cbc throughput']['5. 16 Bytes block (B/sec)'] = [aes_8192B]
 with open('./result_temp', 'w+') as result_file:
     pickle.dump(result, result_file)
 
-<<<<<<< HEAD
-
-=======
-# print json.dumps(result, indent=4, sort_keys=True)
-# print result.items()
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml
index 8b5b427b..d27a967d 100644
--- a/benchmarks/playbooks/ssl.yaml
+++ b/benchmarks/playbooks/ssl.yaml
@@ -2,17 +2,9 @@
    connection: local
    tasks:
     - name: making ssl directory
-<<<<<<< HEAD
-      file: path={{Dest_dir}}/ssl state=directory
-    - name: making temporary ssl directory
-      file: path={{Dest_dir}}/ssl/ssl_temp state=directory
-=======
       file: path=../../{{Dest_dir}}/ssl state=directory
     - name: making temporary ssl directory
       file: path=../../{{Dest_dir}}/ssl/ssl_temp state=directory
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
- 
-
  - hosts: "{{role}}"
    tasks:
    
@@ -28,11 +20,8 @@
     - name: making  results temporary directory
       shell: mkdir $HOME/qtip_result 
     - include: ./sys_info_pbook.yaml
-<<<<<<< HEAD
       vars:
           network: false
-=======
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
     - name: Installing OpenSSL dependencies when CentOS
       shell: yum install git  wget gcc patch  perl-Time-HiRes autofconf automake libpcap-devel libtool -y
       when: ansible_os_family == "RedHat"
@@ -40,19 +29,19 @@
       shell: apt-get  install git gcc wget   perl autoconf automake libpcap-dev libtool -y
       when: ansible_os_family == "Debian"
     - name: Fetching OpenSSL
-      shell: cd $HOME/Open_SSL/ && wget https://www.openssl.org/source/openssl-1.0.2d.tar.gz
+      shell: cd $HOME/Open_SSL/ && wget https://www.openssl.org/source/openssl-1.0.2e.tar.gz
     - name: Untar OpenSSL
-      shell: cd $HOME/Open_SSL/ && tar -zxvf openssl-1.0.2d.tar.gz
+      shell: cd $HOME/Open_SSL/ && tar -zxvf openssl-1.0.2e.tar.gz
     - name: configure
-      shell: cd $HOME/Open_SSL/openssl-1.0.2d  && ./config
+      shell: cd $HOME/Open_SSL/openssl-1.0.2e  && ./config
     - name: make 
-      shell: cd  $HOME/Open_SSL/openssl-1.0.2d && make 
+      shell: cd  $HOME/Open_SSL/openssl-1.0.2e && make 
     - name: make install
-      shell: cd  $HOME/Open_SSL/openssl-1.0.2d && make install
+      shell: cd  $HOME/Open_SSL/openssl-1.0.2e  && make install
     - name: Benchmarking RSA signatures
-      shell: cd $HOME/Open_SSL/openssl-1.0.2d/apps  &&  ./openssl speed rsa >> $HOME/qtip_result/RSA_dump
+      shell: cd $HOME/Open_SSL/openssl-1.0.2e/apps  &&  ./openssl speed rsa >> $HOME/qtip_result/RSA_dump
     - name: Benchmaring AES-128-cbc cipher encryption  throughput
-      shell: cd $HOME/Open_SSL/openssl-1.0.2d/apps  &&  ./openssl speed -evp aes-128-cbc >> $HOME/qtip_result/AES-128-CBC_dump
+      shell: cd $HOME/Open_SSL/openssl-1.0.2e/apps  &&  ./openssl speed -evp aes-128-cbc >> $HOME/qtip_result/AES-128-CBC_dump
     - name: Fetching result transformation script
       copy: src=./result_transform/ssl/ssl_transform.py dest={{home_dir.stdout}}/qtip_result
     - name: Transforming result
@@ -83,21 +72,10 @@
    connection: local
    tasks:
     - name: extracting_json
-<<<<<<< HEAD
-      shell: ( find  {{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{Dest_dir}}/ssl/)
-    - name: making_logs_folder
-      shell: mkdir -p {{Dest_dir}}/ssl/logs
-    - name: extracting_log
-      shell: ( find {{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t {{Dest_dir}}/ssl/logs)
-    - name: removing ssl_temp
-      shell: rm -rf {{Dest_dir}}/ssl/ssl_temp
-=======
       shell: ( find  ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t ../../{{Dest_dir}}/ssl/)
     - name: making_logs_folder
-      shell: mkdir -p {{../../Dest_dir}}/ssl/logs
+      shell: mkdir -p ../../{{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 ../../{{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t ../../{{Dest_dir}}/ssl/logs)
     - name: removing ssl_temp
-      shell: rm -rf {{../../Dest_dir}}/ssl/ssl_temp
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
-
+      shell: rm -rf ../../{{Dest_dir}}/ssl/ssl_temp
\ No newline at end of file
diff --git a/benchmarks/playbooks/sys_info_pbook.yaml b/benchmarks/playbooks/sys_info_pbook.yaml
index 9eca0bc3..19c811c7 100644
--- a/benchmarks/playbooks/sys_info_pbook.yaml
+++ b/benchmarks/playbooks/sys_info_pbook.yaml
@@ -7,7 +7,6 @@
    - name: system info collection tool install when Ubuntu
      shell: apt-get install inxi -y
      when: ansible_os_family  == "Debian"
-<<<<<<< HEAD
    - name: Install ansible copy dependencies if remote host has selinux enabled
      shell: yum  install libselinux-python -y
      when: ansible_os_family == "RedHat"
@@ -22,11 +21,8 @@
    - name: collecting system information for network test  cases
      shell: cd $HOME/qtip_result && python info_collect.py n
      when: network
-=======
    - name: system_info script copy
      copy: src=./info_script/info_collect.py dest={{home_dir.stdout}}/qtip_result/
    - name: collecting_sys_info
-     shell: cd $HOME/qtip_result &&  python info_collect.py
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
-   
+     shell: cd $HOME/qtip_result &&  python info_collect.py   
 
diff --git a/benchmarks/playbooks/whetstone.yaml b/benchmarks/playbooks/whetstone.yaml
index 71063815..c22ea433 100644
--- a/benchmarks/playbooks/whetstone.yaml
+++ b/benchmarks/playbooks/whetstone.yaml
@@ -20,11 +20,8 @@
     - name: make directory
       shell: mkdir $HOME/qtip_result
     - include: ./sys_info_pbook.yaml
-<<<<<<< HEAD
       vars:
           network: false
-=======
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
     - name: Installing UnixBench dependencies if CentOS
       shell: yum install git gcc patch perl-Time-HiRes -y
       when: ansible_os_family == "RedHat"