Merge "Fix bug in scenario validation"

This commit is contained in:
Zuul 2019-03-01 04:06:08 +00:00 committed by Gerrit Code Review
commit 9993d0b684
5 changed files with 29 additions and 25 deletions

View File

@ -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."""

View File

@ -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())

View File

@ -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(
self._clients, name_generator=self.generate_random_name,
atomic_inst=self.atomic_actions())
if hasattr(self, "_admin_clients"):
self.admin_octavia = octavia.Octavia(
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())

View File

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

View File

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