Merge "[Plugins] Replace instance_dd_test.sh with instance_test.sh"

rally-jobs/extra/instance_dd_test.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-time_seconds(){ (time -p $1 ) 2>&1 |awk '/real/{print $2}'; }
-file=/tmp/test.img
-c=${1:-$SIZE}
-c=${c:-1000} #default is 1GB
-write_seq=$(time_seconds "dd if=/dev/zero of=$file bs=1M count=$c")
-read_seq=$(time_seconds "dd if=$file of=/dev/null bs=1M count=$c")
-[ -f $file ] && rm $file
-
-echo "{
-    \"write_seq_${c}m\": $write_seq,
-    \"read_seq_${c}m\": $read_seq
-    }"

rally-jobs/nova.yaml

@@ -1029,7 +1029,7 @@
             size: 2
         use_floating_ip: true
         command:
-          script_file: "~/.rally/extra/instance_dd_test.sh"
+          script_file: "~/.rally/extra/instance_test.sh"
           interpreter: "/bin/sh"
         username: "cirros"
       runner:
@@ -1052,7 +1052,7 @@
           name: {{image_name}}
         use_floating_ip: false
         command:
-          script_file: "~/.rally/extra/instance_dd_test.sh"
+          script_file: "~/.rally/extra/instance_test.sh"
           interpreter: "/bin/sh"
         username: "cirros"
       runner:

rally-jobs/rally-mos.yaml

@@ -311,7 +311,7 @@
         floating_network: "{{external_net}}"
         use_floating_ip: true
         command:
-          script_file: "~/.rally/extra/instance_dd_test.sh"
+          script_file: "~/.rally/extra/instance_test.sh"
           interpreter: "/bin/sh"
         username: "cirros"
       runner:

rally-jobs/rally-neutron-existing-users.yaml

@@ -355,7 +355,7 @@
         image:
             name: {{image_name}}
         command:
-          script_file: "~/.rally/extra/instance_dd_test.sh"
+          script_file: "~/.rally/extra/instance_test.sh"
           interpreter: "/bin/sh"
         username: "cirros"
       runner:

rally-jobs/rally-neutron.yaml

@@ -525,7 +525,7 @@
         image:
             name: {{image_name}}
         command:
-          script_file: "~/.rally/extra/instance_dd_test.sh"
+          script_file: "~/.rally/extra/instance_test.sh"
           interpreter: "/bin/sh"
         username: "cirros"
       runner:

samples/tasks/scenarios/vm/boot-runcommand-delete-custom-image.json

@@ -4,7 +4,7 @@
             "args": {
                 "flavor": {"name": "m1.small"},
                 "command": {
-                    "remote_path": "./instance_dd_test.sh"
+                    "remote_path": "./instance_test.sh"
                 },
                 "username": "root",
                 "userdata": "#cloud-config\ndisable_root: 0\nssh_pwauth: 1"

samples/tasks/scenarios/vm/boot-runcommand-delete-custom-image.yaml

@@ -3,7 +3,7 @@
     -
       args:
         command:
-          remote_path: "./instance_dd_test.sh"
+          remote_path: "./instance_test.sh"
         flavor:
           name: m1.small
         userdata: "#cloud-config\ndisable_root: 0\nssh_pwauth: 1"

samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.json

@@ -18,7 +18,7 @@
                 "force_delete": false,
                 "command": {
                     "interpreter": "/bin/sh",
-                    "script_file": "samples/tasks/support/instance_dd_test.sh"
+                    "script_file": "samples/tasks/support/instance_test.sh"
                 },
                 "username": "cirros"
             },

samples/tasks/scenarios/vm/boot-runcommand-delete-with-disk.yaml

@@ -15,7 +15,7 @@
         force_delete: false
         command:
             interpreter: "/bin/sh"
-            script_file: "samples/tasks/support/instance_dd_test.sh"
+            script_file: "samples/tasks/support/instance_test.sh"
         username: "cirros"
       runner:
         type: "constant"

samples/tasks/support/README.rst

@@ -1,11 +1,12 @@
 instance_linpack.sh
-=============
+===================
+
 instance_linpack.sh, will kick off a CPU intensive workload within a OpenStack instance.
 This script will return the avg gflops and max gflops Linpack reports in a JSON format.
 To run this workload, the VM must have linpack installed prior to running.
 
-instance_dd_test.sh
+instance_test.sh
-=============
+================
-instance_dd_test.sh, will kick off a IO intensive workload within an OpenStack instance.
+
-This script will return the write and read performance dd was able to achieve in a
+instance_test.sh loads server by spawning processes. Finally, it outputs
-JSON format.
+JSON data for HTML report charts, with values of CPU, memory and disk usage.

samples/tasks/support/instance_dd_test.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-time_seconds(){ (time -p $1 ) 2>&1 |awk '/real/{print $2}'; }
-file=/tmp/test.img
-c=${1:-$SIZE}
-c=${c:-1000} #default is 1GB
-write_seq=$(time_seconds "dd if=/dev/zero of=$file bs=1M count=$c")
-read_seq=$(time_seconds "dd if=$file of=/dev/null bs=1M count=$c")
-[ -f $file ] && rm $file
-
-echo "{
-    \"write_seq_${c}m\": $write_seq,
-    \"read_seq_${c}m\": $read_seq
-    }"