Merge "Fix bug in scenario validation"

rally_openstack/scenario.py

@@ -31,7 +31,7 @@ CONF = cfg.CONF
 
 
 @context.add_default_context("users@openstack", {})
-@plugin.default_meta(inherit=False)
+@plugin.default_meta(inherit=True)
 class OpenStackScenario(scenario.Scenario):
     """Base class for all OpenStack scenarios."""
 

rally_openstack/scenarios/barbican/utils.py

@@ -26,3 +26,7 @@ class BarbicanBase(scenario.OpenStackScenario):
             self.admin_barbican = barbican.BarbicanService(
                 self._admin_clients, name_generator=self.generate_random_name,
                 atomic_inst=self.atomic_actions())
+        if hasattr(self, "_clients"):
+            self.barbican = barbican.BarbicanService(
+                self._clients, name_generator=self.generate_random_name,
+                atomic_inst=self.atomic_actions())

rally_openstack/scenarios/octavia/utils.py

@@ -22,6 +22,11 @@ class OctaviaBase(scenario.OpenStackScenario):
 
     def __init__(self, context=None, admin_clients=None, clients=None):
         super(OctaviaBase, self).__init__(context, admin_clients, clients)
-        self.octavia = octavia.Octavia(
+        if hasattr(self, "_admin_clients"):
-            self._clients, name_generator=self.generate_random_name,
+            self.admin_octavia = octavia.Octavia(
-            atomic_inst=self.atomic_actions())
+                self._admin_clients, name_generator=self.generate_random_name,
+                atomic_inst=self.atomic_actions())
+        if hasattr(self, "_clients"):
+            self.octavia = octavia.Octavia(
+                self._clients, name_generator=self.generate_random_name,
+                atomic_inst=self.atomic_actions())

samples/tasks/scenarios/barbican/create-and-delete-certificate.json

@@ -1,25 +1,22 @@
 {
     "BarbicanContainers.create_certificate_and_delete": [
         {
-           "args": {
+           "runner": {
-              "passphrase": "my_passphrase"
+               "type": "constant",
-            },
+               "times": 2,
-            "runner": {
+               "concurrency": 1
-                "type": "constant",
+           },
-                "times": 2,
+           "context": {
-                "concurrency": 1
+               "users": {
-            },
+                   "tenants": 1,
-            "context": {
+                   "users_per_tenant": 1
-                "users": {
+               }
-                    "tenants": 1,
+           },
-                    "users_per_tenant": 1
+           "sla": {
-                }
+               "failure_rate": {
-            },
+                   "max": 0
-            "sla": {
+               }
-                "failure_rate": {
+           }
-                    "max": 0
-                }
-            }
         }
     ]
 }

samples/tasks/scenarios/barbican/create-and-delete-certificate.yaml

@@ -1,8 +1,6 @@
 ---
   BarbicanContainers.create_certificate_and_delete:
     -
-      args:
-        passphrase: "my_passphrase"
       runner:
         type: "constant"
         times: 2