openstack/rally-openstack
Code Issues Proposed changes

Merge "Allow create image params in glance scenario"

Browse Source
This commit is contained in:
Jenkins 2016-11-16 03:58:05 +00:00 committed by Gerrit Code Review
commit 460c69a547
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rally/plugins/openstack/scenarios/glance/images.py
View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from rally.common import logging
from rally import consts
from rally.plugins.openstack import scenario
from rally.plugins.openstack.scenarios.glance import utils
@ -20,6 +21,7 @@ from rally.plugins.openstack.scenarios.nova import utils as nova_utils
from rally.task import types
from rally.task import validation
LOG = logging.getLogger(__name__)
"""Scenarios for Glance images."""
@ -108,7 +110,8 @@ class CreateImageAndBootInstances(utils.GlanceScenario,
nova_utils.NovaScenario):
def run(self, container_format, image_location, disk_format,
flavor, number_instances, **kwargs):
flavor, number_instances, create_image_kwargs=None,
boot_server_kwargs=None, **kwargs):
"""Create an image and boot several instances from it.
:param container_format: container format of image. Acceptable
@ -118,10 +121,22 @@ class CreateImageAndBootInstances(utils.GlanceScenario,
ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, and iso
:param flavor: Nova flavor to be used to launch an instance
:param number_instances: number of Nova servers to boot
:param kwargs: optional parameters to create server
:param create_image_kwargs: optional parameters to create image
:param boot_server_kwargs: optional parameters to boot server
:param kwargs: optional parameters to create server (deprecated)
"""
create_image_kwargs = create_image_kwargs or {}
boot_server_kwargs = boot_server_kwargs or kwargs or {}
if kwargs:
LOG.warning("'kwargs' is deprecated in Rally v0.8.0: Use "
"'boot_server_kwargs' for additional parameters when "
"booting servers.")
image = self._create_image(container_format,
image_location,
disk_format)
disk_format,
**create_image_kwargs)
image_id = image.id
self._boot_servers(image_id, flavor, number_instances, **kwargs)
self._boot_servers(image_id, flavor, number_instances,
**boot_server_kwargs)

12
tests/unit/plugins/openstack/scenarios/glance/test_images.py
View File

@ -70,10 +70,14 @@ class GlanceImagesTestCase(test.ScenarioTestCase):
fake_servers = [mock.Mock() for i in range(5)]
mock_create_image.return_value = fake_image
mock_boot_servers.return_value = fake_servers
kwargs = {"fakearg": "f"}
create_image_kwargs = {"fakeimagearg": "f"}
boot_server_kwargs = {"fakeserverarg": "f"}
images.CreateImageAndBootInstances(self.context).run(
"cf", "url", "df", "fid", 5, **kwargs)
mock_create_image.assert_called_once_with("cf", "url", "df")
"cf", "url", "df", "fid", 5,
create_image_kwargs=create_image_kwargs,
boot_server_kwargs=boot_server_kwargs)
mock_create_image.assert_called_once_with("cf", "url", "df",
**create_image_kwargs)
mock_boot_servers.assert_called_once_with("image-id-0", "fid",
5, **kwargs)
5, **boot_server_kwargs)