From 77aa0db4232e78ef3ee6db634ac1508565766423 Mon Sep 17 00:00:00 2001
From: Joe Talerico <jtaleric@redhat.com>
Date: Tue, 21 Jun 2016 14:07:23 -0400
Subject: [PATCH] Fix Rally-Plugins

Missing the Nova quota and fixing documentation

Change-Id: I7ecd772a8eb87f6d95bd9b00cc23b370c4921135
---
 rally/rally-plugins/README.md                 | 44 ++-----------------
 .../netcreate-boot/netcreate_boot.yml         |  5 +++
 2 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/rally/rally-plugins/README.md b/rally/rally-plugins/README.md
index 4fef60d01..c209d52b7 100644
--- a/rally/rally-plugins/README.md
+++ b/rally/rally-plugins/README.md
@@ -1,43 +1,5 @@
 # Rally Plugins Browbeat can use
 ## Current plugins
-### neutron-netcreate_nova-boot
-This Rally plugin utilizes both Neutron and Nova utilities This Rally plugin will create a network then. launch a guest within that network. This plugin will also attempt to ping the guest, to make sure connectivity works.
-
-#### Assumptions
-For this work, we suggest using the admin tenant. With Rally this can be done by creating a env file with the ExistingUsers field - [example json](rally-neutron/admintenant-env.json) . This plugin also assumes the following networking toplogy :
-```
-[ Rally Host ] --- Link to Rally tenant nework --- [ Router ] -- [ tenant networks ] -- Guests
-```
-We suggest this method, so you do not have to have a 1:1 connection:tenant network.
-
-*** The below JSON needs updating to show that we need to pass a router t othe plugin.
-
-#### Example json
-```
-{% set flavor_name = flavor_name or "m1.flavorname" %}
-{
-    "NeutronPlugin.create_network_nova_boot": [
-        {
-            "args": {
-                "flavor": {
-                    "name": "{{flavor_name}}"
-                },
-                "image": {
-                    "name": "image_name"
-                },
-                "network_create_args": {},
-            },
-            "runner": {
-                "type": "serial",
-                "times": 5,
-            },
-            "context": {
-                "users": {
-                    "tenants": 1,
-                    "users_per_tenant": 1
-                },
-            },
-        }
-    ]
-}
-```
+- netcreate-boot-ping ( not complete )
+- netcreate-boot
+- subnet-router-create
diff --git a/rally/rally-plugins/netcreate-boot/netcreate_boot.yml b/rally/rally-plugins/netcreate-boot/netcreate_boot.yml
index 3d66ff6ee..22c748e51 100644
--- a/rally/rally-plugins/netcreate-boot/netcreate_boot.yml
+++ b/rally/rally-plugins/netcreate-boot/netcreate_boot.yml
@@ -10,6 +10,7 @@ NeutronPlugin.create_network_nova_boot:
       image:
         name: '{{image_name}}'
       network_create_args: {}
+      num_networks: {{num_networks}}
     runner:
       concurrency: {{concurrency}}
       times: {{times}}
@@ -24,6 +25,10 @@ NeutronPlugin.create_network_nova_boot:
           port: -1
           router: -1
           subnet: -1
+        nova:
+          instances: -1
+          cores: -1
+          ram: -1
     sla:
       max_avg_duration: {{sla_max_avg_duration}}
       max_seconds_per_iteration: {{sla_max_seconds}}