openstack/rally
Code Issues Proposed changes

Merge "Refactored atomic action in authenticate scenario"

Browse Source
This commit is contained in:
Jenkins 2016-03-04 17:43:48 +00:00 committed by Gerrit Code Review
commit 04b491f8d3
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
rally/plugins/openstack/scenarios/authenticate/authenticate.py
View File

@ -46,8 +46,9 @@ class Authenticate(scenario.OpenStackScenario):
"""
glance_client = self.clients("glance")
image_name = "__intentionally_non_existent_image___"
for i in range(repetitions):
with atomic.ActionTimer(self, "authenticate.validate_glance"):
with atomic.ActionTimer(self, "authenticate.validate_glance_%s_times" %
repetitions):
for i in range(repetitions):
list(glance_client.images.list(name=image_name))
@validation.number("repetitions", minval=1)
@ -62,8 +63,9 @@ class Authenticate(scenario.OpenStackScenario):
:param repetitions: number of times to validate
"""
nova_client = self.clients("nova")
for i in range(repetitions):
with atomic.ActionTimer(self, "authenticate.validate_nova"):
with atomic.ActionTimer(self, "authenticate.validate_nova_%s_times" %
repetitions):
for i in range(repetitions):
nova_client.flavors.list()
@validation.number("repetitions", minval=1)
@ -78,8 +80,9 @@ class Authenticate(scenario.OpenStackScenario):
:param repetitions: number of times to validate
"""
cinder_client = self.clients("cinder")
for i in range(repetitions):
with atomic.ActionTimer(self, "authenticate.validate_cinder"):
with atomic.ActionTimer(self, "authenticate.validate_cinder_%s_times"
% repetitions):
for i in range(repetitions):
cinder_client.volume_types.list()
@validation.number("repetitions", minval=1)
@ -94,8 +97,9 @@ class Authenticate(scenario.OpenStackScenario):
:param repetitions: number of times to validate
"""
neutron_client = self.clients("neutron")
for i in range(repetitions):
with atomic.ActionTimer(self, "authenticate.validate_neutron"):
with atomic.ActionTimer(self, "authenticate.validate_neutron_%s_times"
% repetitions):
for i in range(repetitions):
neutron_client.list_networks()
@validation.number("repetitions", minval=1)
@ -110,8 +114,9 @@ class Authenticate(scenario.OpenStackScenario):
:param repetitions: number of times to validate
"""
heat_client = self.clients("heat")
for i in range(repetitions):
with atomic.ActionTimer(self, "authenticate.validate_heat"):
with atomic.ActionTimer(self, "authenticate.validate_heat_%s_times"
% repetitions):
for i in range(repetitions):
list(heat_client.stacks.list(limit=0))
@validation.number("repetitions", minval=1)
@ -127,6 +132,7 @@ class Authenticate(scenario.OpenStackScenario):
:param repetitions: number of times to validate
"""
monasca_client = self.clients("monasca")
for i in range(repetitions):
with atomic.ActionTimer(self, "authenticate.validate_monasca"):
with atomic.ActionTimer(self, "authenticate.validate_monasca_%s_times"
% repetitions):
for i in range(repetitions):
list(monasca_client.metrics.list(limit=0))

12
tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py
View File

@ -47,14 +47,14 @@ class AuthenticateTestCase(test.ScenarioTestCase):
self.clients("glance").images.list.call_args_list,
[mock.call(name=mock.ANY)] * 5)
self._test_atomic_action_timer(scenario_inst.atomic_actions(),
"authenticate.validate_glance")
"authenticate.validate_glance_5_times")
def test_validate_nova(self):
scenario_inst = authenticate.Authenticate()
scenario_inst.validate_nova(5)
self.clients("nova").flavors.list.assert_has_calls([mock.call()] * 5)
self._test_atomic_action_timer(scenario_inst.atomic_actions(),
"authenticate.validate_nova")
"authenticate.validate_nova_5_times")
def test_validate_cinder(self):
scenario_inst = authenticate.Authenticate()
@ -62,7 +62,7 @@ class AuthenticateTestCase(test.ScenarioTestCase):
self.clients("cinder").volume_types.list.assert_has_calls(
[mock.call()] * 5)
self._test_atomic_action_timer(scenario_inst.atomic_actions(),
"authenticate.validate_cinder")
"authenticate.validate_cinder_5_times")
def test_validate_neutron(self):
scenario_inst = authenticate.Authenticate()
@ -70,7 +70,7 @@ class AuthenticateTestCase(test.ScenarioTestCase):
self.clients("neutron").list_networks.assert_has_calls(
[mock.call()] * 5)
self._test_atomic_action_timer(scenario_inst.atomic_actions(),
"authenticate.validate_neutron")
"authenticate.validate_neutron_5_times")
def test_validate_heat(self):
scenario_inst = authenticate.Authenticate()
@ -79,7 +79,7 @@ class AuthenticateTestCase(test.ScenarioTestCase):
self.clients("heat").stacks.list.call_args_list,
[mock.call(limit=0)] * 5)
self._test_atomic_action_timer(scenario_inst.atomic_actions(),
"authenticate.validate_heat")
"authenticate.validate_heat_5_times")
def test_validate_monasca(self):
scenario_inst = authenticate.Authenticate()
@ -88,4 +88,4 @@ class AuthenticateTestCase(test.ScenarioTestCase):
self.clients("monasca").metrics.list.call_args_list,
[mock.call(limit=0)] * 5)
self._test_atomic_action_timer(scenario_inst.atomic_actions(),
"authenticate.validate_monasca")
"authenticate.validate_monasca_5_times")