openstack/rally-openstack
Code Issues Proposed changes

Merge "Use "visibility" param in create_image() for V1"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 23:45:08 +00:00 committed by Gerrit Code Review
commit 1586068932
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rally/plugins/openstack/wrappers/glance.py
View File

@ -62,7 +62,10 @@ class GlanceWrapper(object):
@abc.abstractmethod
def create_image(self, container_format, image_location, disk_format):
"""Creates new image."""
"""Creates new image.
Accepts all Glance v2 parameters.
"""
@abc.abstractmethod
def delete_image(self, image):
@ -86,6 +89,9 @@ class GlanceV1Wrapper(GlanceWrapper):
kw.update(kwargs)
if "name" not in kw:
kw["name"] = self.owner.generate_random_name()
if "visibility" in kw:
kw["is_public"] = kw.pop("visibility") == "public"
image_location = os.path.expanduser(image_location)
try:

14
tests/unit/plugins/openstack/wrappers/test_glance.py
View File

@ -62,10 +62,10 @@ class GlanceV1WrapperTestCase(test.ScenarioTestCase):
self.wrapped_client = glance_wrapper.wrap(self.client, self.owner)
@ddt.data(
{"location": "image_location"},
{"location": "image_location", "visibility": "private"},
{"location": "image_location", "fakearg": "fake"},
{"location": "image_location", "name": "image_name"},
{"location": _tempfile.name})
{"location": _tempfile.name, "visibility": "public"})
@ddt.unpack
@mock.patch("six.moves.builtins.open")
def test_create_image(self, mock_open, location, **kwargs):
@ -73,7 +73,7 @@ class GlanceV1WrapperTestCase(test.ScenarioTestCase):
location,
"disk_format",
**kwargs)
call_args = dict(kwargs)
call_args = kwargs
call_args["container_format"] = "container_format"
call_args["disk_format"] = "disk_format"
if location.startswith("/"):
@ -84,6 +84,8 @@ class GlanceV1WrapperTestCase(test.ScenarioTestCase):
call_args["copy_from"] = location
if "name" not in kwargs:
call_args["name"] = self.owner.generate_random_name.return_value
if "visibility" in kwargs:
call_args["is_public"] = call_args.pop("visibility") == "public"
self.client().images.create.assert_called_once_with(**call_args)
@ -174,10 +176,10 @@ class GlanceV2WrapperTestCase(test.ScenarioTestCase):
self.client.return_value.images.get.assert_called_once_with(image.id)
@ddt.data(
{"location": "image_location"},
{"location": "image_location", "visibility": "private"},
{"location": "image_location", "fakearg": "fake"},
{"location": "image_location", "name": "image_name"},
{"location": _tempfile.name})
{"location": _tempfile.name, "visibility": "public"})
@ddt.unpack
@mock.patch("six.moves.builtins.open")
@mock.patch("requests.get")
@ -193,7 +195,7 @@ class GlanceV2WrapperTestCase(test.ScenarioTestCase):
location,
"disk_format",
**kwargs)
create_args = dict(kwargs)
create_args = kwargs
create_args["container_format"] = "container_format"
create_args["disk_format"] = "disk_format"
if "name" not in kwargs: