diff --git a/rally-jobs/nova.yaml b/rally-jobs/nova.yaml index 6419626f..6263fa96 100644 --- a/rally-jobs/nova.yaml +++ b/rally-jobs/nova.yaml @@ -1,3 +1,4 @@ +{%- set cirros_image_url = "http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img" %} {% set image_name = "^(cirros.*uec|TestVM)$" %} --- Authenticate.validate_nova: @@ -525,6 +526,33 @@ sla: failure_rate: max: 0 + - + args: + flavor: + name: "m1.tiny" + image: + name: "rally-named-image-from-context" + runner: + type: "constant" + times: 5 + concurrency: 2 + context: + users: + tenants: 1 + users_per_tenant: 2 + roles: + - admin + images: + image_url: "{{ cirros_image_url }}" + image_type: "qcow2" + image_container: "bare" + images_per_tenant: 1 + image_name: "rally-named-image-from-context" + image_args: + is_public: True + sla: + failure_rate: + max: 0 NovaHypervisors.list_hypervisors: - diff --git a/rally/plugins/openstack/scenarios/glance/utils.py b/rally/plugins/openstack/scenarios/glance/utils.py index eb5e101e..1ac563c7 100644 --- a/rally/plugins/openstack/scenarios/glance/utils.py +++ b/rally/plugins/openstack/scenarios/glance/utils.py @@ -42,7 +42,7 @@ class GlanceScenario(scenario.OpenStackScenario): """ client = glance_wrapper.wrap(self._clients.glance, self) return client.create_image(container_format, image_location, - disk_format) + disk_format, **kwargs) @atomic.action_timer("glance.delete_image") def _delete_image(self, image): diff --git a/tests/unit/plugins/openstack/scenarios/glance/test_utils.py b/tests/unit/plugins/openstack/scenarios/glance/test_utils.py index a2020ac5..11297e8b 100644 --- a/tests/unit/plugins/openstack/scenarios/glance/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/glance/test_utils.py @@ -48,11 +48,13 @@ class GlanceScenarioTestCase(test.ScenarioTestCase): clients=self.scenario_clients) return_image = scenario._create_image("container_format", image_location.name, - "disk_format") + "disk_format", + fakearg="fakearg") 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") + "container_format", image_location.name, "disk_format", + fakearg="fakearg") self._test_atomic_action_timer(scenario.atomic_actions(), "glance.create_image")