From dd2a435c2e7e193b2b145a38d72faa16e9e913e5 Mon Sep 17 00:00:00 2001
From: Alexander Maretskiy <amaretskiy@mirantis.com>
Date: Mon, 29 Dec 2014 19:45:23 +0200
Subject: [PATCH] Improvements for scenario VMTasks.boot_runcommand_delete

Allow to run this scenario for neutron-based cluster, add support
of network context, and generally simplify its usage by making networking
configuration as simple as possible.
So user gets rid of confusing configration and focus on main job -
running arbitrary script on VM.

Changes:
  * neutron support (this scenario run only for nova-network before)
  * usage of rally.benchmark.wrappers.network, so networking implementation
    details are behind the scenes now and scenario code is simplier
  * scenario args `fixed_network' and `use_floating_ip' are removed
    because they make sense only for devstack where fixed network
    is available, so that is absolutely unusable on any real OpenStack
    and even confusing, so scenario will always use floating ip
  * default `start_cidr' values are set to C-class network
  * improvements in rally.benchmark.wrappers.network

Change-Id: I3ce9875dee3e62713afcab14cb8af35c27a2d083
---
 rally-jobs/rally-neutron.yaml                 | 22 ++++++++++++++++++-
 rally-jobs/rally.yaml                         |  6 ++---
 .../scenarios/vm/boot-runcommand-delete.json  |  4 ++--
 .../scenarios/vm/boot-runcommand-delete.yaml  |  3 +--
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/rally-jobs/rally-neutron.yaml b/rally-jobs/rally-neutron.yaml
index d91d3fbc..035f95b6 100644
--- a/rally-jobs/rally-neutron.yaml
+++ b/rally-jobs/rally-neutron.yaml
@@ -351,7 +351,7 @@
           tenants: 3
           users_per_tenant: 2
         network:
-          start_cidr: "100.1.0.0/26"
+          start_cidr: "10.2.0.0/24"
           networks_per_tenant: 2
       sla:
         failure_rate:
@@ -573,3 +573,23 @@
       sla:
         failure_rate:
           max: 0
+
+  VMTasks.boot_runcommand_delete:
+    -
+      args:
+        flavor:
+            name: "m1.tiny"
+        image:
+            name: {{image_name}}
+        script: "/home/jenkins/.rally/extra/instance_dd_test.sh"
+        interpreter: "/bin/sh"
+        username: "cirros"
+      runner:
+        type: "constant"
+        times: 4
+        concurrency: 2
+      context:
+        users:
+          tenants: 3
+          users_per_tenant: 2
+        network: {}
diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index b735e579..84a74171 100755
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -774,7 +774,7 @@
           tenants: 3
           users_per_tenant: 2
         network:
-          start_cidr: "100.100.0.0/24"
+          start_cidr: "10.2.0.0/24"
           networks_per_tenant: 2
 
     -
@@ -995,9 +995,7 @@
           name: "m1.tiny"
         image:
           name: {{image_name}}
-        fixed_network: "private"
         floating_network: "public"
-        use_floatingip: true
         script: "/home/jenkins/.rally/extra/instance_dd_test.sh"
         interpreter: "/bin/sh"
         username: "cirros"
@@ -1133,7 +1131,7 @@
           tenants: 3
           users_per_tenant: 2
         network:
-          start_cidr: "100.1.0.0/26"
+          start_cidr: "10.2.0.0/24"
         quotas:
           nova:
             security_groups: -1
diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.json b/samples/tasks/scenarios/vm/boot-runcommand-delete.json
index a2930107..5e3015cd 100644
--- a/samples/tasks/scenarios/vm/boot-runcommand-delete.json
+++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.json
@@ -8,9 +8,7 @@
                 "image": {
                     "name": "^cirros.*uec$"
                 },
-                "fixed_network": "private",
                 "floating_network": "public",
-                "use_floatingip": true,
                 "force_delete": false,
                 "script": "doc/samples/tasks/support/instance_dd_test.sh",
                 "interpreter": "/bin/sh",
@@ -25,6 +23,8 @@
                 "users": {
                     "tenants": 3,
                     "users_per_tenant": 2
+                },
+                "network": {
                 }
             }
         }
diff --git a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml
index 8347ce99..fa222705 100644
--- a/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml
+++ b/samples/tasks/scenarios/vm/boot-runcommand-delete.yaml
@@ -6,9 +6,7 @@
             name: "m1.nano"
         image:
             name: "^cirros.*uec$"
-        fixed_network: "private"
         floating_network: "public"
-        use_floatingip: true
         force_delete: false
         script: "doc/samples/tasks/support/instance_dd_test.sh"
         interpreter: "/bin/sh"
@@ -21,3 +19,4 @@
         users:
           tenants: 3
           users_per_tenant: 2
+        network: {}