From b236f8b06bd02f2e5b8247ad155f55c75df70f80 Mon Sep 17 00:00:00 2001 From: maxinjian Date: Tue, 18 Oct 2016 00:09:49 -0400 Subject: [PATCH] Add CinderVolumes.create_volume_and_update_readonly_flag Create a volume and then update its readonly flag. Change-Id: I5dec43468fe75a59850582876b0088fb724c1696 --- rally-jobs/cinder.yaml | 34 +++++++++++++++++++ .../openstack/scenarios/cinder/utils.py | 12 +++++++ .../openstack/scenarios/cinder/volumes.py | 25 ++++++++++++++ .../create-and-update-readonly-flag.json | 26 ++++++++++++++ .../create-and-update-readonly-flag.yaml | 17 ++++++++++ .../openstack/scenarios/cinder/test_utils.py | 9 +++++ .../scenarios/cinder/test_volumes.py | 10 ++++++ 7 files changed, 133 insertions(+) create mode 100644 samples/tasks/scenarios/cinder/create-and-update-readonly-flag.json create mode 100644 samples/tasks/scenarios/cinder/create-and-update-readonly-flag.yaml diff --git a/rally-jobs/cinder.yaml b/rally-jobs/cinder.yaml index b6ca3df2..cf7ca1b7 100755 --- a/rally-jobs/cinder.yaml +++ b/rally-jobs/cinder.yaml @@ -166,6 +166,40 @@ failure_rate: max: 0 + CinderVolumes.create_volume_and_update_readonly_flag: + - + args: + size: 1 + read_only: true + runner: + type: "constant" + times: 3 + concurrency: 2 + context: + users: + tenants: 2 + users_per_tenant: 2 + sla: + failure_rate: + max: 0 + - + args: + size: 1 + read_only: false + image: + name: {{image_name}} + runner: + type: "constant" + times: 3 + concurrency: 2 + context: + users: + tenants: 2 + users_per_tenant: 2 + sla: + failure_rate: + max: 0 + CinderVolumes.create_and_list_volume: - args: diff --git a/rally/plugins/openstack/scenarios/cinder/utils.py b/rally/plugins/openstack/scenarios/cinder/utils.py index 3a042196..7a1f2991 100644 --- a/rally/plugins/openstack/scenarios/cinder/utils.py +++ b/rally/plugins/openstack/scenarios/cinder/utils.py @@ -175,6 +175,18 @@ class CinderScenario(scenario.OpenStackScenario): client = cinder_wrapper.wrap(self._clients.cinder, self) client.update_volume(volume, **update_volume_args) + @atomic.action_timer("cinder.update_readonly_flag") + def _update_readonly_flag(self, volume, read_only): + """Update the read-only access mode flag of the specified volume. + + :param volume: The UUID of the volume to update. + :param read_only: The value to indicate whether to update volume to + read-only access mode. + :returns: A tuple of http Response and body + """ + return self.clients("cinder").volumes.update_readonly_flag( + volume, read_only) + @atomic.action_timer("cinder.delete_volume") def _delete_volume(self, volume): """Delete the given volume. diff --git a/rally/plugins/openstack/scenarios/cinder/volumes.py b/rally/plugins/openstack/scenarios/cinder/volumes.py index 7a8e650c..21e19636 100755 --- a/rally/plugins/openstack/scenarios/cinder/volumes.py +++ b/rally/plugins/openstack/scenarios/cinder/volumes.py @@ -721,3 +721,28 @@ class CreateVolumeFromSnapshot(cinder_utils.CinderScenario, if do_delete: self._delete_snapshot(snapshot) self._delete_volume(volume) + + +@types.convert(image={"type": "glance_image"}) +@validation.image_exists("image", nullable=True) +@validation.required_services(consts.Service.CINDER) +@validation.required_openstack(users=True) +@scenario.configure(context={"cleanup": ["cinder"]}, + name="CinderVolumes.create_volume_" + "and_update_readonly_flag") +class CreateVolumeAndUpdateReadonlyFlag(cinder_utils.CinderScenario, + glance_utils.GlanceScenario): + + def run(self, size, image=None, read_only=True, **kwargs): + """Create a volume and then update its readonly flag. + + :param size: volume size (integer, in GB) + :param image: image to be used to create volume + :param read_only:The value to indicate whether to update volume to + read-only access mode + :param kwargs: optional args to create a volume + """ + if image: + kwargs["imageRef"] = image + volume = self._create_volume(size, **kwargs) + self._update_readonly_flag(volume.id, read_only) diff --git a/samples/tasks/scenarios/cinder/create-and-update-readonly-flag.json b/samples/tasks/scenarios/cinder/create-and-update-readonly-flag.json new file mode 100644 index 00000000..8ed6a5fa --- /dev/null +++ b/samples/tasks/scenarios/cinder/create-and-update-readonly-flag.json @@ -0,0 +1,26 @@ +{ + "CinderVolumes.create_volume_and_update_readonly_flag": [ + { + "args": { + "size": 1, + "read_only": true + }, + "runner": { + "type": "constant", + "times": 3, + "concurrency": 2 + }, + "context": { + "users": { + "tenants": 2, + "users_per_tenant": 2 + } + }, + "sla": { + "failure_rate": { + "max": 0 + } + } + } + ] +} diff --git a/samples/tasks/scenarios/cinder/create-and-update-readonly-flag.yaml b/samples/tasks/scenarios/cinder/create-and-update-readonly-flag.yaml new file mode 100644 index 00000000..f8edb26a --- /dev/null +++ b/samples/tasks/scenarios/cinder/create-and-update-readonly-flag.yaml @@ -0,0 +1,17 @@ +--- + CinderVolumes.create_volume_and_update_readonly_flag: + - + args: + size: 1 + read_only: true + runner: + type: "constant" + times: 3 + concurrency: 2 + context: + users: + tenants: 2 + users_per_tenant: 2 + sla: + failure_rate: + max: 0 diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py b/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py index 012f4166..19fdc723 100644 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py @@ -152,6 +152,15 @@ class CinderScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(self.scenario.atomic_actions(), "cinder.update_volume") + def test__update_readonly_flag(self): + fake_volume = mock.MagicMock() + self.scenario._update_readonly_flag(fake_volume, "fake_flag") + self.clients( + "cinder").volumes.update_readonly_flag.assert_called_once_with( + fake_volume, "fake_flag") + self._test_atomic_action_timer(self.scenario.atomic_actions(), + "cinder.update_readonly_flag") + def test__delete_volume(self): cinder = mock.Mock() self.scenario._delete_volume(cinder) diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py b/tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py index 8e1f55e4..72f451f8 100755 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py +++ b/tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py @@ -71,6 +71,16 @@ class CinderServersTestCase(test.ScenarioTestCase): scenario._update_volume.assert_called_once_with(fake_volume, **volume_update_args) + def test_create_volume_and_update_readonly_flag(self): + scenario = volumes.CreateVolumeAndUpdateReadonlyFlag(self.context) + fake_volume = mock.MagicMock() + scenario._create_volume = mock.MagicMock(return_value=fake_volume) + scenario._update_readonly_flag = mock.MagicMock() + scenario.run(1, None, True, fakearg="f") + scenario._create_volume.assert_called_once_with(1, fakearg="f") + scenario._update_readonly_flag.assert_called_once_with( + fake_volume.id, True) + def test_create_and_delete_volume(self): fake_volume = mock.MagicMock()