Changed name for lab of dell-us-deploying-bm-3 77/6677/1
authorNauman_Ahad <Nauman_Ahad@dell.com>
Mon, 11 Jan 2016 11:23:29 +0000 (16:23 +0500)
committerNauman Ahad <Nauman_Ahad@dell.com>
Thu, 14 Jan 2016 11:55:12 +0000 (11:55 +0000)
Changed name from dell-us-deploying-bm-3 to
dell-us-deploying-bm3 in testcases.
Removed duplicate ramspeed playbook file "ramspeedbench.yaml"

Change-Id: Ieb49a0466e6f86bb02990962b382696cc7ae3e31
Signed-off-by: Nauman_Ahad <Nauman_Ahad@dell.com>
(cherry picked from commit ffa0be2adf6e9e44e2317f89dd5832aff96772ad)

29 files changed:
benchmarks/playbooks/ramspeed.yaml
benchmarks/playbooks/ramspeedbench.yaml [deleted file]
test_cases/default/compute/.whetstone_serial.yaml.swp [deleted file]
test_cases/default/compute/dhrystone_bm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/dhrystone_bm.yaml with 100% similarity]
test_cases/default/compute/dhrystone_vm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/dhrystone_vm.yaml with 100% similarity]
test_cases/default/compute/dpi_bm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/dpi_bm.yaml with 100% similarity]
test_cases/default/compute/dpi_vm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/dpi_vm.yaml with 100% similarity]
test_cases/default/compute/ramspeed_bm.yaml [moved from test_cases/default/compute/whetstone_serial.yaml with 51% similarity]
test_cases/default/compute/ssl_bm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/ssl_bm.yaml with 100% similarity]
test_cases/default/compute/ssl_serial.yaml [deleted file]
test_cases/default/compute/ssl_vm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/ssl_vm.yaml with 100% similarity]
test_cases/default/compute/whetstone_bm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/whetstone_bm.yaml with 100% similarity]
test_cases/default/compute/whetstone_vm.yaml [moved from test_cases/dell-us-deploying-bm-3/compute/whetstone_vm.yaml with 100% similarity]
test_cases/default/storage/fio_bm.yaml [moved from test_cases/dell-us-deploying-bm-3/storage/fio_bm.yaml with 100% similarity]
test_cases/dell-us-deploying-bm3/compute/dhrystone_bm.yaml [moved from test_cases/default/compute/dhrystone_serial.yaml with 57% similarity]
test_cases/dell-us-deploying-bm3/compute/dhrystone_vm.yaml [moved from test_cases/default/compute/dhrystone_parallel.yaml with 95% similarity]
test_cases/dell-us-deploying-bm3/compute/dpi_bm.yaml [moved from test_cases/default/compute/dpi_serial.yaml with 79% similarity]
test_cases/dell-us-deploying-bm3/compute/dpi_vm.yaml [moved from test_cases/default/compute/dpi_parallel.yaml with 99% similarity]
test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml [new file with mode: 0644]
test_cases/dell-us-deploying-bm3/compute/ssl_vm.yaml [moved from test_cases/default/compute/ssl_parallel.yaml with 95% similarity]
test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml [new file with mode: 0644]
test_cases/dell-us-deploying-bm3/compute/whetstone_vm.yaml [moved from test_cases/default/compute/whetstone_parallel.yaml with 81% similarity]
test_cases/dell-us-deploying-bm3/network/iperf_topology_1.yaml [moved from test_cases/dell-us-deploying-bm-3/network/iperf_topology_1.yaml with 100% similarity]
test_cases/dell-us-deploying-bm3/network/iperf_topology_2.yaml [moved from test_cases/dell-us-deploying-bm-3/network/iperf_topology_2.yaml with 100% similarity]
test_cases/dell-us-deploying-bm3/network/iperf_topology_3.yaml [moved from test_cases/dell-us-deploying-bm-3/network/iperf_topology_3.yaml with 100% similarity]
test_cases/dell-us-deploying-bm3/network/netperf.yaml [moved from test_cases/dell-us-deploying-bm-3/network/netperf.yaml with 100% similarity]
test_cases/dell-us-deploying-bm3/network/pktgen.yaml [moved from test_cases/dell-us-deploying-bm-3/network/pktgen.yaml with 100% similarity]
test_cases/dell-us-deploying-bm3/storage/fio_bm.yaml [moved from test_cases/default/storage/fio_baremetal.yaml with 100% similarity]
test_cases/dell-us-deploying-bm3/storage/fio_vm.yaml [moved from test_cases/dell-us-deploying-bm-3/storage/fio_vm.yaml with 100% similarity]

index 0321eb4..3ca4b14 100644 (file)
       fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest=../../{{Dest_dir}}/ramspeed/ramspeed_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
-
  - hosts: 127.0.0.1
    connection: local
    tasks:
@@ -78,4 +73,4 @@
     - name: extracting_log
       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
\ No newline at end of file
+      shell: rm -rf ../../{{Dest_dir}}/ramspeed/ramspeed_temp
diff --git a/benchmarks/playbooks/ramspeedbench.yaml b/benchmarks/playbooks/ramspeedbench.yaml
deleted file mode 100644 (file)
index d8136b0..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
- - hosts: "{{ role }}"
-
-   tasks:
-    - name: clean
-      shell: rm -rf /usr/bin/phoronix-test-suite
-      shell: rm -rf  /usr/share/doc/phoronix-test-suite/
-      shell: rm -rf  /usr/share/phoronix-test-suite
-      shell: rm -rf  /root/photmp/
-    - name: clean previous results
-      file: path=/root/results path=absent
-    - name: make direc
-      file: path=/root/photmp/ state=directory
-    - name: Fetch Phornonix 
-      shell: cd /root/photmp/ && wget https://www.dropbox.com/s/5kks513ozxy7vvs/phoronix-suite.tar.gz
-    - name: unarchive Phoronix
-      shell: cd /root/photmp/ && tar -zxvf  phoronix-suite.tar.gz
-    - name: Phornonix Dependencies
-      shell: yum install php php-xml php-client php-process -y
-    - name: Install Phornonix
-      shell: cd /root/photmp/phoronix-test-suite-master/&&./install-sh    
-    - name: batchSetup
-      shell: phoronix-test-suite batch-setup
-    - name: install
-      shell: phoronix-test-suite batch-install ramspeed
-    - name: run
-      shell:  phoronix-test-suite batch-run ramspeed
-    - name: making directory
-      file: path=/root/results state=directory
-    - name: copying result to temp directory
-      shell: cp -r /var/lib/phoronix-test-suite/test-results/* /root/results/
-    - name: registering files
-      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}}/dhrystone
-      with_items: files_to_copy.stdout_lines
-
diff --git a/test_cases/default/compute/.whetstone_serial.yaml.swp b/test_cases/default/compute/.whetstone_serial.yaml.swp
deleted file mode 100644 (file)
index bbfd3be..0000000
Binary files a/test_cases/default/compute/.whetstone_serial.yaml.swp and /dev/null differ
@@ -1,28 +1,28 @@
   
 Scenario:
-  benchmark: whetstone
-  host: machine_1,
-  server: virtualmachine_1
+  benchmark: ramspeed
+  host: machine_1, machine_2
+  server: 
 
 Context:
   Host_Machines:
     machine_1:
-      ip: 172.18.0.16
-      pw: Op3nStack
+      ip: 10.20.0.4
+      pw: 
       role: host
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: host
+
   Virtual_Machines:  
-    virtualmachine_1:
-      availability_zone: nova
-      public_network: 'net04_ext'
-      OS_image: QTIP_CentOS
-      flavor: m1.large
-      role: server
+    
 
 Test_Description:
   Test_category: "Compute"
-  Benchmark: "whetstone"
+  Benchmark: "dhrystone"
   Overview: >
-        ''' This test will run the whetstone benchmark in serial on machine_1 and machine_2.\n
+        ''' This test will run the dhrystone benchmark in parallel  on machine_1 and machine_2.\n
          if you wish to add a virtual machine add the following information under the Virtual_Machine tag
 
         virtualmachine_1:
diff --git a/test_cases/default/compute/ssl_serial.yaml b/test_cases/default/compute/ssl_serial.yaml
deleted file mode 100644 (file)
index 4d92526..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-Scenario:
-  benchmark: ssl
-  1Run: machine_1
-  2Run: virtualmachine_1 
-
-Context:
-  Host_Machines:
-    machine_1:
-      ip: 10.20.0.7
-      pw: r00tme
-      role: 1Run
-  Virtual_Machines:  
-    virtualmachine_1:
-      availability_zone: compute1
-      public_network: net04_ext
-      OS_image: QTIP_Centos
-      flavor: m1.large
-      role: 1Run
-Test_Description:
-  Test_category: "Compute"
-  Benchmark: "ssl"
-  Overview: >
-        '''This test will run the SSL benchmark in serial on virtualmachine_1 and machine_1.
-           The Test will run first on the Host_Machine and then on the Virtual Machine.
-           if you wish to add a virtual machine add the following information under the Virtual_Machine tag
-
-        virtualmachine_1:
-          availability_zone:
-          public_network:
-          OS_image:
-          flavor:
-          role:
-          '''   
@@ -1,28 +1,28 @@
   
 Scenario:
   benchmark: dhrystone
-  host: machine_1, machine_2, virtualmachine_1
+  host: machine_1, machine_2
   server: 
 
 Context:
   Host_Machines:
     machine_1:
-      ip: 172.18.0.16
-      pw: Op3nStack
+      ip: 10.20.0.4
+      pw: 
       role: host
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: host
+
   Virtual_Machines:  
-    virtualmachine_1:
-      availability_zone: nova
-      public_network: 'net04_ext'
-      OS_image: QTIP_CentOS
-      flavor: m1.large
-      role: server
+    
 
 Test_Description:
   Test_category: "Compute"
   Benchmark: "dhrystone"
   Overview: >
-        ''' This test will run the dhrystone benchmark in serial on machine_1 and machine_2.\n
+        ''' This test will run the dhrystone benchmark in parallel  on machine_1 and machine_2.\n
          if you wish to add a virtual machine add the following information under the Virtual_Machine tag
 
         virtualmachine_1:
@@ -1,6 +1,6 @@
 Scenario:
   benchmark: dhrystone
-  host: machine_1, machine_2
+  host: virtualmachine_1, virtualmachine_2
   server: blakc
 
 Context:
@@ -1,18 +1,17 @@
 Scenario:
   benchmark: dpi
-  host: virtualmachine_1
-  server: virtualmachine_2
+  host: machine_1,machine_2
 
 Context:
   Host_Machines:
      machine_1:
-      ip: 172.18.0.17
-      pw: Op3nStack
-      role: 1host
+       ip: 10.20.0.4
+       pw: Op3nStack
+       role: 1host
      machine_2:
-      ip: 172.18.0.16
-      pw: Op3nStack
-      role: 1host
+       ip: 10.20.0.5
+       pw: Op3nStack
+       role: 1host
   Virtual_Machines:
 Test_Description:
   Test_category: "Compute"
@@ -1,7 +1,6 @@
 Scenario:
   benchmark: dpi
   1Run : virtualmachine_1, virtualmachine_2
-  2Run:
 
 Context:
   Host_Machines:
diff --git a/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/ssl_bm.yaml
new file mode 100644 (file)
index 0000000..bded6d2
--- /dev/null
@@ -0,0 +1,31 @@
+Scenario:
+  benchmark: ssl
+  1Run: machine_1,machine_2
+
+Context:
+  Host_Machines:
+    machine_1:
+      ip: 10.20.0.4
+      pw: 
+      role: 1Run
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: 1Run
+  Virtual_Machines:
+      
+
+Test_Description:
+  Test_category: "Compute"
+  Benchmark: "ssl"
+  Overview: >
+        '''This test will run the SSL benchmark in parallel on machine_1 and machine_1.
+           If you wish to add a virtual machine add the following information under the Virtual_Machine tag
+
+        virtualmachine_1:
+          availability_zone:
+          public_network:
+          OS_image:
+          flavor:
+          role:
+          '''   
@@ -1,7 +1,6 @@
 Scenario:
   benchmark: ssl
-  host: machine_1, machine_2
-  server: 
+  host: virtualmachine_1, virtualmachine_2
 
 Context:
   Host_Machines:
diff --git a/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml b/test_cases/dell-us-deploying-bm3/compute/whetstone_bm.yaml
new file mode 100644 (file)
index 0000000..136ac2b
--- /dev/null
@@ -0,0 +1,34 @@
+  
+Scenario:
+  benchmark: whetstone
+  host: machine_1, machine_2
+
+
+Context:
+  Host_Machines:
+    machine_1:
+      ip: 10.20.0.4
+      pw: 
+      role: host
+    machine_2:
+      ip: 10.20.0.5
+      pw:
+      role: host
+  Virtual_Machines:  
+   
+      
+
+Test_Description:
+  Test_category: "Compute"
+  Benchmark: "whetstone"
+  Overview: >
+        ''' This test will run the whetstone benchmark in parallel  on machine_1 and machine_2.\n
+         if you wish to add a baremetal  machine add the following information under the Virtual_Machine tag
+
+        machine_3:
+          ip:
+          pw:
+          role:
+           '''
+  
@@ -1,19 +1,11 @@
 Scenario:
   benchmark: whetstone
-  host: machine_1, virtualmachine_1
+  host: virtualmachine_1, virtualmachine_1
   server: 
 
 Context:
   Host_Machines:
-    machine_1:
-      ip: 172.18.0.76
-      pw: r00tme
-      role: host
-    machine_2:
-      ip: 172.18.0.75
-      pw: r00tme
-      role: host
-
+    
   Virtual_Machines:  
     virtualmachine_1:
       availability_zone: compute1
@@ -21,6 +13,13 @@ Context:
       OS_image: QTIP_CentOS
       flavor: m1.large
       role: host
+    virtualmachine_2:
+      availability_zone: compute2
+      public_network: 'net04_ext'
+      OS_image: QTIP_CentOS
+      flavor: m1.large
+      role: host
+     
 
 Test_Description:
   Test_category: "Compute"