openstack/rally-openstack
Code Issues Proposed changes

Always assign a name to created images

Browse Source 
This is necessary for name-based cleanup. If a name is not specified,
one will be generated automatically. The ability to explicitly set a
name is necessary for the images context.

Implements: blueprint cleanup-refactoring
Change-Id: I895c72b1922bdb8a1e9b7b2955d0ff88b5017f3d
This commit is contained in:
Chris St. Pierre 2016-03-15 08:56:08 -05:00
parent fefa63cd50
commit 3601497fad
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/plugins/openstack/context/glance/images.py
View File

@ -99,7 +99,7 @@ class ImageGenerator(context.Context):
elif image_name:
cur_name = image_name
else:
cur_name = None
cur_name = self.generate_random_name()
image = glance_scenario._create_image(
image_container, image_url, image_type,

2
rally/plugins/openstack/scenarios/glance/utils.py
View File

@ -40,6 +40,8 @@ class GlanceScenario(scenario.OpenStackScenario):
:returns: image object
"""
if not kwargs.get("name"):
kwargs["name"] = self.generate_random_name()
client = glance_wrapper.wrap(self._clients.glance, self)
return client.create_image(container_format, image_location,
disk_format, **kwargs)

21
tests/unit/plugins/openstack/scenarios/glance/test_utils.py
View File

@ -14,6 +14,7 @@
import tempfile
import ddt
import mock
from rally.plugins.openstack.scenarios.glance import utils
@ -22,6 +23,7 @@ from tests.unit import test
GLANCE_UTILS = "rally.plugins.openstack.scenarios.glance.utils"
@ddt.ddt
class GlanceScenarioTestCase(test.ScenarioTestCase):
def setUp(self):
@ -40,21 +42,34 @@ class GlanceScenarioTestCase(test.ScenarioTestCase):
self._test_atomic_action_timer(scenario.atomic_actions(),
"glance.list_images")
@ddt.data({},
{"name": "foo"},
{"name": None},
{"name": ""},
{"name": "bar", "fakearg": "fakearg"},
{"fakearg": "fakearg"})
@mock.patch("rally.plugins.openstack.wrappers.glance.wrap")
def test_create_image(self, mock_wrap):
def test_create_image(self, create_args, mock_wrap):
image_location = tempfile.NamedTemporaryFile()
mock_wrap.return_value.create_image.return_value = self.image
scenario = utils.GlanceScenario(context=self.context,
clients=self.scenario_clients)
scenario.generate_random_name = mock.Mock()
return_image = scenario._create_image("container_format",
image_location.name,
"disk_format",
fakearg="fakearg")
**create_args)
expected_args = dict(create_args)
if not expected_args.get("name"):
expected_args["name"] = scenario.generate_random_name.return_value
self.assertEqual(self.image, return_image)
mock_wrap.assert_called_once_with(scenario._clients.glance, scenario)
mock_wrap.return_value.create_image.assert_called_once_with(
"container_format", image_location.name, "disk_format",
fakearg="fakearg")
**expected_args)
self._test_atomic_action_timer(scenario.atomic_actions(),
"glance.create_image")