changed playbook to save results

docs/apidocs/downloads.html

@@ -72,7 +72,7 @@
   <h1 class="page-header">Files and Libraries</h1>
 
   <h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
-  <p class="lead">Created March 31, 2017</p>
+  <p class="lead">Created April 3, 2017</p>
   <p>  <p>
     The <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> JSON Overlay library provides the JSON Overlays that
     can be used to access the Web service API for this application.
@@ -97,7 +97,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
-  <p class="lead">Created March 31, 2017</p>
+  <p class="lead">Created April 3, 2017</p>
   <p><p>
   The Java client-side library is used to provide the set of Java objects that can be serialized
   to/from JSON using <a href="http://jackson.codehaus.org/">Jackson</a>.  This is useful for accessing the
@@ -127,7 +127,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
-  <p class="lead">Created March 31, 2017</p>
+  <p class="lead">Created April 3, 2017</p>
   <p><p>
   The Java client-side library is used to access the Web service API for this application using Java.
 </p>
@@ -155,7 +155,7 @@
     </tbody>
   </table>
   <h3 id="artifact_js_client_library">JavaScript Client Library</h3>
-  <p class="lead">Created March 31, 2017</p>
+  <p class="lead">Created April 3, 2017</p>
   <p><p>
   The JavaScript client-side library defines classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -190,7 +190,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_json_client_library">PHP JSON Client Library</h3>
-  <p class="lead">Created March 31, 2017</p>
+  <p class="lead">Created April 3, 2017</p>
   <p><p>
   The PHP JSON client-side library defines the PHP classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -219,7 +219,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_xml_client_library">PHP XML Client Library</h3>
-  <p class="lead">Created March 31, 2017</p>
+  <p class="lead">Created April 3, 2017</p>
   <p><p>
   The PHP client-side library defines the PHP classes that can be (de)serialized to/from XML.
   This is useful for accessing the resources that are published by this application, but only
@@ -251,7 +251,7 @@
     </tbody>
   </table>
   <h3 id="artifact_ruby_json_client_library">Ruby JSON Client Library</h3>
-  <p class="lead">Created March 31, 2017</p>
+  <p class="lead">Created April 3, 2017</p>
   <p><p>
   The Ruby JSON client-side library defines the Ruby classes that can be (de)serialized to/from JSON.
   This is useful for accessing the REST endpoints that are published by this application, but only

drip-deployer/ansible_playbook.py

@@ -17,10 +17,6 @@
 
 __author__ = 'S. Koulouzis'
 
-import paramiko, os
-import threading
-import ansible.runner
-from results_collector import ResultsCollector
 import json
 from collections import namedtuple
 from ansible.parsing.dataloader import DataLoader
@@ -36,9 +32,12 @@ import ansible.plugins.callback
 import ansible.vars
 from ansible.executor.playbook_executor import PlaybookExecutor
 from ansible.plugins import callback_loader
+import os
+import paramiko
 import logging
 import yaml
 import sys
+from results_collector import ResultsCollector
 
 
 def install_prerequisites(vm):

drip-deployer/playbook.yml

@@ -25,43 +25,38 @@
       become: true
 
 
-    #- name: Count vCPU
-      #command: nproc
-      #register: vcpunumber
-      #become: true
-    #- debug: msg="{{ vcpunumber.stdout }}"
+    - name: Count vCPU
+      command: nproc
+      register: vcpunumber
+      become: true
+    - debug: msg="{{ vcpunumber.stdout }}"
 
 
-    #- name: Run sysbench
-      #command: sysbench --test=cpu --cpu-max-prime=100000 --num-threads={{ vcpunumber.stdout }} run
-      #register: sysbenchoutput
-      #become: true
-    #- debug: msg="{{ sysbenchoutput.stdout }}"
-    #- local_action: copy content="{{ sysbenchoutput.stdout }}" dest="{{ resultslocation }}sysbench"
+    - name: Run sysbench
+      command: sysbench --test=cpu --cpu-max-prime=100000 --num-threads={{ vcpunumber.stdout }} run
+      register: sysbenchoutput
+      become: true
+    - debug: msg="{{ sysbenchoutput.stdout }}"
 
 
     - name: Run stream
-      command: expect -c "spawn phoronix-test-suite run-test stream; expect \"Type:\"; send \"4\n\"; expect \"\(Y/n\):\"; send -- \"y\r\"; expect \"Enter a name to save these results under: \"; send -- \"out\r\"; expect \"Enter a unique name to describe this test run / configuration:\"; send -- \"unique\r\"; expect \"New Description:\"; send  \"\r\";interact;"
+      command: expect -c "spawn phoronix-test-suite run-test stream; expect \"Type:\"; send \"4\n\"; expect \"\(Y/n\):\"; send -- \"y\r\"; expect \"Enter a name to save these results under:\"; send \"out\n\"; expect \"Enter a unique name to describe this test run / configuration:\"; send -- \"unique\r\"; expect \"New Description:\"; send  \"\r\"; expect \"Would you like to upload the results to OpenBenchmarking.org (Y/n):\"; send  \"n\r\"; interact;"
       register: streamoutput
       become: true
     - debug: msg="{{ streamoutput.stdout }}"
     
-    
+
+    - name: Run iozone
+      command: expect -c "spawn phoronix-test-suite run-test iozone; expect \"Record Size:\"; send \"2\n\"; expect \"File Size:\"; send \"2\n\"; expect \"Disk Test:\"; send \"3\n\";  expect \"\(Y/n\):\"; send -- \"y\r\"; expect \"Enter a name to save these results under:\"; send \"out\n\"; expect \"Enter a unique name to describe this test run / configuration:\"; send -- \"unique\r\"; expect \"New Description:\"; send  \"\r\"; expect \"Would you like to upload the results to OpenBenchmarking.org (Y/n):\"; send  \"n\r\"; interact;"
+      register: iozoneoutput
+      become: true
+      
     - name: Get stream results
-      command: expect -c ""
+      command: phoronix-test-suite result-file-to-csv out
       register: streamoutput
       become: true
     - debug: msg="{{ streamoutput.stdout }}"
-    
-
-    #- name: Run iozone
-      #command: expect -c "spawn phoronix-test-suite run-test iozone; expect \"Record Size:\"; send \"2\n\"; expect \"File Size:\"; send \"2\n\"; expect \"Disk Test:\"; send \"3\n\";  expect \"\(Y/n\):\"; send \"n\n\"; interact;"
-      #register: iozoneoutput
-      #become: true
 
 
     #- debug: msg="{{ iozoneoutput.stdout }}"
-    #- local_action: copy content="{{ iozoneoutput.stdout }}" dest="{{ resultslocation }}iozone"
-
-
-
+#- local_action: copy content="{{ iozoneoutput.stdout }}" dest="{{ resultslocation }}iozone"
\ No newline at end of file

drip-deployer/rpc_server.py

@@ -21,9 +21,9 @@ else:
     rabbitmq_host = '127.0.0.1'
     
 
-#connection = pika.BlockingConnection(pika.ConnectionParameters(host=rabbitmq_host))
-#channel = connection.channel()
-#channel.queue_declare(queue='deployer_queue')
+connection = pika.BlockingConnection(pika.ConnectionParameters(host=rabbitmq_host))
+channel = connection.channel()
+channel.queue_declare(queue='deployer_queue')
 
 path = os.path.dirname(os.path.abspath(__file__)) + "/"
 
@@ -111,18 +111,15 @@ def on_request(ch, method, props, body):
                      body=str(response))
     ch.basic_ack(delivery_tag = method.delivery_tag)
 
-#channel.basic_qos(prefetch_count=1)
-#channel.basic_consume(on_request, queue='deployer_queue')
+channel.basic_qos(prefetch_count=1)
+channel.basic_consume(on_request, queue='deployer_queue')
 
 
-#thread = Thread(target = threaded_function, args = (1, ))
-#thread.start()
+thread = Thread(target = threaded_function, args = (1, ))
+thread.start()
 
 print(" [x] Awaiting RPC requests")
-f = open("../docs/json_samples/deployer_invocation.json","r")
-body=f.read()
-response = handleDelivery(body)
 
 
-#channel.start_consuming()
-#thread.stop()
\ No newline at end of file
+channel.start_consuming()
+thread.stop()
\ No newline at end of file