openstack/rally-openstack
Code Issues Proposed changes

Merge "Make sure VolumeGenerator uses the api version info while cleanup"

Browse Source
This commit is contained in:
Jenkins
2016-02-24 08:07:36 +00:00
committed by Gerrit Code Review
parent 13abe5129c 3e7e3271b4
commit df4d7a56f5
2 changed files with 57 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rally/plugins/openstack/context/cinder/volumes.py
View File

@@ -68,5 +68,7 @@ class VolumeGenerator(context.Context):
@logging.log_task_wrapper(LOG.info, _("Exit context: `Volumes`"))
def cleanup(self):
# TODO(boris-42): Delete only resources created by this context
resource_manager.cleanup(names=["cinder.volumes"],
users=self.context.get("users", []))
resource_manager.cleanup(
names=["cinder.volumes"],
users=self.context.get("users", []),
api_versions=self.context["config"].get("api_versions"))

54
tests/unit/plugins/openstack/context/cinder/test_volumes.py
View File

@@ -129,4 +129,56 @@ class VolumeGeneratorTestCase(test.ScenarioTestCase):
volumes_ctx.cleanup()
mock_cleanup.assert_called_once_with(names=["cinder.volumes"],
users=self.context["users"])
users=self.context["users"],
api_versions=None)
@mock.patch("%s.cinder.volumes.resource_manager.cleanup" % CTX)
def test_cleanup_api_versions(self, mock_cleanup):
tenants_count = 2
users_per_tenant = 5
volumes_per_tenant = 5
tenants = self._gen_tenants(tenants_count)
users = []
for id_ in tenants.keys():
for i in range(users_per_tenant):
users.append({"id": i, "tenant_id": id_,
"credential": "credential"})
tenants[id_].setdefault("volumes", [])
for j in range(volumes_per_tenant):
tenants[id_]["volumes"].append({"id": "uuid"})
api_version = {
"cinder": {
"version": 1,
"service_type": "volume"
}
}
self.context.update({
"config": {
"users": {
"tenants": 2,
"users_per_tenant": 5,
"concurrent": 10,
},
"volumes": {
"size": 1,
"volumes_per_tenant": 5,
},
"api_versions": api_version
},
"admin": {
"credential": mock.MagicMock()
},
"users": users,
"tenants": tenants
})
volumes_ctx = volumes.VolumeGenerator(self.context)
volumes_ctx.cleanup()
mock_cleanup.assert_called_once_with(
names=["cinder.volumes"],
users=self.context["users"],
api_versions=api_version)