diff --git a/openstack_dashboard/api/base.py b/openstack_dashboard/api/base.py index b7526b251d..3cae884a3e 100644 --- a/openstack_dashboard/api/base.py +++ b/openstack_dashboard/api/base.py @@ -133,7 +133,7 @@ class APIResourceWrapper(object): def to_dict(self): obj = {} for key in self._attrs: - obj[key] = getattr(self._apiresource, key, None) + obj[key] = getattr(self, key, None) return obj diff --git a/openstack_dashboard/test/unit/api/rest/test_cinder.py b/openstack_dashboard/test/unit/api/rest/test_cinder.py index febc694795..a2b91d26be 100644 --- a/openstack_dashboard/test/unit/api/rest/test_cinder.py +++ b/openstack_dashboard/test/unit/api/rest/test_cinder.py @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import json from django.conf import settings import mock @@ -21,6 +20,7 @@ from openstack_dashboard.api.base import Quota from openstack_dashboard.api.cinder import VolTypeExtraSpec from openstack_dashboard.api.rest import cinder from openstack_dashboard.test import helpers as test +from openstack_dashboard.usage import quotas class CinderRestTestCase(test.TestCase): @@ -38,43 +38,45 @@ class CinderRestTestCase(test.TestCase): filters = {'status': 'available'} self._test_volumes_get(False, filters) - @mock.patch.object(cinder.api, 'cinder') - def _test_volumes_get(self, all, filters, cc): - if all: + @test.create_mocks({api.cinder: ['volume_list_paged']}) + def _test_volumes_get(self, all_, filters): + if all_: request = self.mock_rest_request(GET={'all_projects': 'true'}) else: request = self.mock_rest_request(**{'GET': filters}) - cc.volume_list_paged.return_value = [ - mock.Mock(**{'to_dict.return_value': {'id': 'test123'}}), - ], False, False - cc.Volume.return_value = mock.Mock( - **{'to_dict.return_value': {"id": "test123"}}) + volumes = [self.cinder_volumes.first()] + self.maxDiff = None + self.mock_volume_list_paged.return_value = volumes, False, False + response = cinder.Volumes().get(request) + self.assertStatusCode(response, 200) - self.assertEqual(response.json, - {"items": [{"id": "test123"}], - "has_more_data": False, - "has_prev_data": False}) - if all: - cc.volume_list_paged.assert_called_once_with(request, - {'all_tenants': 1}) + self.assertEqual({'items': [v.to_dict() for v in volumes], + 'has_more_data': False, + 'has_prev_data': False}, + response.json) + if all_: + self.mock_volume_list_paged.assert_called_once_with( + request, {'all_tenants': 1}) else: - cc.volume_list_paged.assert_called_once_with(request, - search_opts=filters) + self.mock_volume_list_paged.assert_called_once_with( + request, search_opts=filters) - @mock.patch.object(cinder.api, 'cinder') - def test_volume_get(self, cc): + @test.create_mocks({api.cinder: ['volume_get']}) + def test_volume_get(self): request = self.mock_rest_request(**{'GET': {}}) - cc.volume_get.return_value = mock.Mock( - **{'to_dict.return_value': {'id': 'one'}}) - response = cinder.Volume().get(request, '1') - self.assertStatusCode(response, 200) - self.assertEqual(response.json, {"id": "one"}) - cc.volume_get.assert_called_once_with(request, '1') + vol = self.cinder_volumes.first() + self.mock_volume_get.return_value = vol - @mock.patch.object(cinder.api, 'cinder') - def test_volume_create(self, cc): + response = cinder.Volume().get(request, '1') + + self.assertStatusCode(response, 200) + self.assertEqual(vol.to_dict(), response.json) + self.mock_volume_get.assert_called_once_with(request, '1') + + @test.create_mocks({api.cinder: ['volume_create']}) + def test_volume_create(self): mock_body = '''{ "size": "", "name": "", @@ -87,34 +89,31 @@ class CinderRestTestCase(test.TestCase): "source_volid": "" }''' - mock_volume_create_response = { - "size": "" - } - - mock_post_response = '{"size": ""}' - request = self.mock_rest_request(POST={}, body=mock_body) - cc.volume_create.return_value = \ - mock.Mock(**{'to_dict.return_value': mock_volume_create_response}) + vol = self.cinder_volumes.first() + self.mock_volume_create.return_value = vol response = cinder.Volumes().post(request) self.assertStatusCode(response, 201) - self.assertEqual(response.content.decode("utf-8"), mock_post_response) + self.assertEqual(vol.to_dict(), response.json) - @mock.patch.object(cinder.api, 'cinder') - def test_volume_get_metadata(self, cc): + @test.create_mocks({api.cinder: ['volume_get']}) + def test_volume_get_metadata(self): request = self.mock_rest_request(**{'GET': {}}) - cc.volume_get.return_value = mock.Mock( - **{'to_dict.return_value': {'id': 'one', - 'metadata': {'foo': 'bar'}}}) - response = cinder.VolumeMetadata().get(request, '1') - self.assertStatusCode(response, 200) - self.assertEqual(response.json, {'foo': 'bar'}) - cc.volume_get.assert_called_once_with(request, '1') + vol = self.cinder_volumes.first() + vol._apiresource.metadata = {'foo': 'bar'} + self.mock_volume_get.return_value = vol - @mock.patch.object(cinder.api, 'cinder') - def test_volume_update_metadata(self, cc): + response = cinder.VolumeMetadata().get(request, '1') + + self.assertStatusCode(response, 200) + self.assertEqual(vol.to_dict()['metadata'], response.json) + self.mock_volume_get.assert_called_once_with(request, '1') + + @test.create_mocks({api.cinder: ['volume_set_metadata', + 'volume_delete_metadata']}) + def test_volume_update_metadata(self): request = self.mock_rest_request( body='{"updated": {"a": "1", "b": "2"}, ' '"removed": ["c", "d"]}' @@ -122,67 +121,68 @@ class CinderRestTestCase(test.TestCase): response = cinder.VolumeMetadata().patch(request, '1') self.assertStatusCode(response, 204) self.assertEqual(b'', response.content) - cc.volume_set_metadata.assert_called_once_with( + self.mock_volume_set_metadata.assert_called_once_with( request, '1', {'a': '1', 'b': '2'} ) - cc.volume_delete_metadata.assert_called_once_with( + self.mock_volume_delete_metadata.assert_called_once_with( request, '1', ['c', 'd'] ) # # Volume Types # - @mock.patch.object(cinder.api, 'cinder') - def test_volume_types_get(self, cc): + @test.create_mocks({api.cinder: ['volume_type_list']}) + def test_volume_types_get(self): request = self.mock_rest_request(**{'GET': {}}) - cc.VolumeType.return_value = mock.Mock( - **{'to_dict.return_value': {'id': 'one'}}) - cc.volume_type_list.return_value = [{'id': 'one'}] + types = self.cinder_volume_types.list() + self.mock_volume_type_list.return_value = types + response = cinder.VolumeTypes().get(request) - self.assertStatusCode(response, 200) - self.assertEqual(response.json, {"items": [{"id": "one"}]}) - cc.volume_type_list.assert_called_once_with(request) - cc.VolumeType.assert_called_once_with({'id': 'one'}) - @mock.patch.object(cinder.api, 'cinder') - def test_volume_type_get(self, cc): + self.assertStatusCode(response, 200) + self.assertEqual([api.cinder.VolumeType(t).to_dict() for t in types], + response.json['items']) + self.mock_volume_type_list.assert_called_once_with(request) + + @test.create_mocks({api.cinder: ['volume_type_get']}) + def test_volume_type_get(self): request = self.mock_rest_request(**{'GET': {}}) - cc.volume_type_get.return_value = {'name': 'one'} - cc.VolumeType.return_value = mock.Mock( - **{'to_dict.return_value': {'id': 'one'}}) + type_ = self.cinder_volume_types.first() + self.mock_volume_type_get.return_value = type_ + response = cinder.VolumeType().get(request, '1') - self.assertStatusCode(response, 200) - self.assertEqual(response.json, {"id": "one"}) - cc.volume_type_get.assert_called_once_with(request, '1') - cc.VolumeType.assert_called_once_with({'name': 'one'}) - @mock.patch.object(cinder.api, 'cinder') - def test_volume_type_get_default(self, cc): + self.assertStatusCode(response, 200) + self.assertEqual(api.cinder.VolumeType(type_).to_dict(), + response.json) + self.mock_volume_type_get.assert_called_once_with(request, '1') + + @test.create_mocks({api.cinder: ['volume_type_default']}) + def test_volume_type_get_default(self): request = self.mock_rest_request(**{'GET': {}}) - cc.volume_type_default.return_value = {'name': 'one'} - cc.VolumeType.return_value = mock.Mock( - **{'to_dict.return_value': {'id': 'one'}}) + type_ = self.cinder_volume_types.first() + self.mock_volume_type_default.return_value = type_ + response = cinder.VolumeType().get(request, 'default') + self.assertStatusCode(response, 200) - self.assertEqual(response.json, {"id": "one"}) - cc.volume_type_default.assert_called_once_with(request) - cc.VolumeType.assert_called_once_with({'name': 'one'}) + self.assertEqual(api.cinder.VolumeType(type_).to_dict(), + response.json) + self.mock_volume_type_default.assert_called_once_with(request) - @mock.patch.object(cinder.api, 'cinder') - def test_volume_type_get_metadata(self, cc): + @test.create_mocks({api.cinder: ['volume_type_extra_get']}) + def test_volume_type_get_metadata(self): request = self.mock_rest_request(**{'GET': {}}) - cc.volume_type_extra_get = mock.Mock() - - cc.volume_type_extra_get.return_value = \ + self.mock_volume_type_extra_get.return_value = \ [VolTypeExtraSpec(1, 'foo', 'bar')] - # cc.volume_type_extra_get.side_effect = [{'foo': 'bar'}] response = cinder.VolumeTypeMetadata().get(request, '1') self.assertStatusCode(response, 200) self.assertEqual(response.json, {'foo': 'bar'}) - cc.volume_type_extra_get.assert_called_once_with(request, '1') + self.mock_volume_type_extra_get.assert_called_once_with(request, '1') - @mock.patch.object(cinder.api, 'cinder') - def test_volume_type_update_metadata(self, cc): + @test.create_mocks({api.cinder: ['volume_type_extra_set', + 'volume_type_extra_delete']}) + def test_volume_type_update_metadata(self): request = self.mock_rest_request( body='{"updated": {"a": "1", "b": "2"}, ' '"removed": ["c", "d"]}' @@ -190,81 +190,91 @@ class CinderRestTestCase(test.TestCase): response = cinder.VolumeTypeMetadata().patch(request, '1') self.assertStatusCode(response, 204) self.assertEqual(b'', response.content) - cc.volume_type_extra_set.assert_called_once_with( + self.mock_volume_type_extra_set.assert_called_once_with( request, '1', {'a': '1', 'b': '2'} ) - cc.volume_type_extra_delete.assert_called_once_with( + self.mock_volume_type_extra_delete.assert_called_once_with( request, '1', ['c', 'd'] ) # # Volume Snapshots # - @mock.patch.object(cinder.api, 'cinder') - def test_volume_snaps_get(self, cc): + @test.create_mocks({api.cinder: ['volume_snapshot_list']}) + def test_volume_snaps_get(self): request = self.mock_rest_request(**{'GET': {}}) - cc.volume_snapshot_list.return_value = [ - mock.Mock(**{'to_dict.return_value': {'id': 'one'}}), - mock.Mock(**{'to_dict.return_value': {'id': 'two'}}), - ] - response = cinder.VolumeSnapshots().get(request) - self.assertStatusCode(response, 200) - self.assertEqual(response.json, - {"items": [{"id": "one"}, {"id": "two"}]}) - cc.volume_snapshot_list.assert_called_once_with(request, - search_opts={}) + snapshots = self.cinder_volume_snapshots.list() + self.mock_volume_snapshot_list.return_value = snapshots - @mock.patch.object(cinder.api, 'cinder') - def test_volume_snaps_get_with_filters(self, cc): + response = cinder.VolumeSnapshots().get(request) + + self.assertStatusCode(response, 200) + self.assertEqual([s.to_dict() for s in snapshots], + response.json['items']) + self.mock_volume_snapshot_list.assert_called_once_with(request, + search_opts={}) + + @test.create_mocks({api.cinder: ['volume_snapshot_list']}) + def test_volume_snaps_get_with_filters(self): filters = {'status': 'available'} request = self.mock_rest_request(**{'GET': dict(filters)}) - cc.volume_snapshot_list.return_value = [ - mock.Mock(**{'to_dict.return_value': {'id': 'one'}}), - mock.Mock(**{'to_dict.return_value': {'id': 'two'}}), - ] + snapshots = self.cinder_volume_snapshots.list() + self.mock_volume_snapshot_list.return_value = snapshots + response = cinder.VolumeSnapshots().get(request) - self.assertStatusCode(response, 200) - self.assertEqual(response.json, - {"items": [{"id": "one"}, {"id": "two"}]}) - cc.volume_snapshot_list.assert_called_once_with(request, - search_opts=filters) - @mock.patch.object(cinder.api, 'cinder') - def test_volume_snapshot_get_metadata(self, cc): + self.assertStatusCode(response, 200) + self.assertEqual([s.to_dict() for s in snapshots], + response.json['items']) + self.mock_volume_snapshot_list.assert_called_once_with( + request, search_opts=filters) + + @test.create_mocks({api.cinder: ['volume_snapshot_get']}) + def test_volume_snapshot_get_metadata(self): request = self.mock_rest_request(**{'GET': {}}) - cc.volume_snapshot_get.return_value = mock.Mock( - **{'to_dict.return_value': {'id': 'one', - 'metadata': {'foo': 'bar'}}}) - response = cinder.VolumeSnapshotMetadata().get(request, '1') - self.assertStatusCode(response, 200) - self.assertEqual(response.json, {'foo': 'bar'}) - cc.volume_snapshot_get.assert_called_once_with(request, '1') + # 4th item contains metadata + snapshot = self.cinder_volume_snapshots.list()[3] + # Ensure metadata is contained in test data + assert 'metadata' in snapshot.to_dict() + self.mock_volume_snapshot_get.return_value = snapshot - @mock.patch.object(cinder.api, 'cinder') - def test_volume_snapshot_update_metadata(self, cc): + response = cinder.VolumeSnapshotMetadata().get(request, '1') + + self.assertStatusCode(response, 200) + self.assertEqual(snapshot.metadata, response.json) + self.mock_volume_snapshot_get.assert_called_once_with(request, '1') + + @test.create_mocks({api.cinder: ['volume_snapshot_set_metadata', + 'volume_snapshot_delete_metadata']}) + def test_volume_snapshot_update_metadata(self): request = self.mock_rest_request( body='{"updated": {"a": "1", "b": "2"}, ' '"removed": ["c", "d"]}' ) + self.mock_volume_snapshot_set_metadata.return_value = None + self.mock_volume_snapshot_delete_metadata.return_value = None response = cinder.VolumeSnapshotMetadata().patch(request, '1') self.assertStatusCode(response, 204) self.assertEqual(b'', response.content) - cc.volume_snapshot_set_metadata.assert_called_once_with( + self.mock_volume_snapshot_set_metadata.assert_called_once_with( request, '1', {'a': '1', 'b': '2'} ) - cc.volume_snapshot_delete_metadata.assert_called_once_with( + self.mock_volume_snapshot_delete_metadata.assert_called_once_with( request, '1', ['c', 'd'] ) # # Extensions # - @mock.patch.object(cinder.api, 'cinder') + # TODO(amotoki): This is actually not tested. Make this work. + # TODO(amotoki): There is no such setting named + # OPENSTACK_CINDER_EXTENSIONS_BLACKLIST. + @test.create_mocks({api.cinder: ['list_extensions']}) @mock.patch.object(settings, 'OPENSTACK_CINDER_EXTENSIONS_BLACKLIST', ['baz']) - def _test_extension_list(self, cc): + def _test_extension_list(self): request = self.mock_rest_request() - cc.list_extensions.return_value = [ + self.mock_list_extensions.return_value = [ mock.Mock(**{'to_dict.return_value': {'name': 'foo'}}), mock.Mock(**{'to_dict.return_value': {'name': 'bar'}}), mock.Mock(**{'to_dict.return_value': {'name': 'baz'}}), @@ -273,89 +283,89 @@ class CinderRestTestCase(test.TestCase): self.assertStatusCode(response, 200) self.assertEqual(response.content, '{"items": [{"name": "foo"}, {"name": "bar"}]}') - cc.list_extensions.assert_called_once_with(request) + self.mock_list_extensions.assert_called_once_with(request) - @mock.patch.object(cinder.api, 'cinder') - def test_qos_specs_get(self, cc): + @test.create_mocks({api.cinder: ['qos_specs_list']}) + def test_qos_specs_get(self): request = self.mock_rest_request(GET={}) - cc.qos_specs_list.return_value = [ - mock.Mock(**{'to_dict.return_value': {'id': 'one'}}), - mock.Mock(**{'to_dict.return_value': {'id': 'two'}}), - ] + qos_specs = self.cinder_qos_specs.list() + self.mock_qos_specs_list.return_value = qos_specs response = cinder.QoSSpecs().get(request) self.assertStatusCode(response, 200) - self.assertEqual(response.content.decode("utf-8"), - '{"items": [{"id": "one"}, {"id": "two"}]}') - cc.qos_specs_list.assert_called_once_with(request) + self.assertEqual([spec.to_dict() for spec in qos_specs], + response.json['items']) + self.mock_qos_specs_list.assert_called_once_with(request) - @mock.patch.object(cinder.api, 'cinder') - def test_tenant_absolute_limits_get(self, cc): + @test.create_mocks({api.cinder: ['tenant_absolute_limits']}) + def test_tenant_absolute_limits_get(self): request = self.mock_rest_request(GET={}) - cc.tenant_absolute_limits.return_value = \ - {'id': 'one', 'val': float('inf')} + limits = self.cinder_limits['absolute'] + # Ensure to have float(inf) to test it is handled properly + limits['maxTotalVolumes'] = float('inf') + self.mock_tenant_absolute_limits.return_value = limits response = cinder.TenantAbsoluteLimits().get(request) self.assertStatusCode(response, 200) - response_as_json = json.loads(response.content.decode('utf-8')) - self.assertEqual(response_as_json['id'], 'one') - self.assertEqual(response_as_json['val'], 1e+999) - cc.tenant_absolute_limits.assert_called_once_with(request) + self.assertEqual(limits, response.json) + self.mock_tenant_absolute_limits.assert_called_once_with(request) # # Services # - @mock.patch.object(api.base, 'is_service_enabled') - @mock.patch.object(cinder.api, 'cinder') - def test_services_get(self, cc, mock_service_enabled): + @test.create_mocks({api.base: ['is_service_enabled'], + api.cinder: ['service_list', + 'extension_supported']}) + def test_services_get(self): request = self.mock_rest_request(GET={}) - cc.service_list.return_value = [mock.Mock( - binary='binary_1', - host='host_1', - zone='zone_1', - updated_at='updated_at_1', - status='status_1', - state='state_1' - ), mock.Mock( - binary='binary_2', - host='host_2', - zone='zone_2', - updated_at='updated_at_2', - status='status_2', - state='state_2' - )] - mock_service_enabled.return_value = True + services = self.cinder_services.list() + self.mock_service_list.return_value = services + self.mock_is_service_enabled.return_value = True + self.mock_extension_supported.return_value = True response = cinder.Services().get(request) - self.assertStatusCode(response, 200) - response_as_json = json.loads(response.content.decode('utf-8')) - self.assertEqual(response_as_json['items'][0]['id'], 1) - self.assertEqual(response_as_json['items'][0]['binary'], 'binary_1') - self.assertEqual(response_as_json['items'][1]['id'], 2) - self.assertEqual(response_as_json['items'][1]['binary'], 'binary_2') - cc.service_list.assert_called_once_with(request) - mock_service_enabled.assert_called_once_with(request, 'volume') - @mock.patch.object(api.base, 'is_service_enabled') - def test_services_get_disabled(self, mock_service_enabled): + def _convert_service(service, idx): + return {'binary': service.binary, + 'host': service.host, + 'zone': service.zone, + 'updated_at': service.updated_at, + 'status': service.status, + 'state': service.state, + 'id': idx + 1} + + self.assertStatusCode(response, 200) + self.assertEqual([_convert_service(s, i) + for i, s in enumerate(services)], + response.json['items']) + + self.mock_service_list.assert_called_once_with(request) + self.mock_is_service_enabled.assert_called_once_with(request, 'volume') + self.mock_extension_supported.assert_called_once_with(request, + 'Services') + + @test.create_mocks({api.base: ['is_service_enabled']}) + def test_services_get_disabled(self): request = self.mock_rest_request(GET={}) - mock_service_enabled.return_value = False + self.mock_is_service_enabled.return_value = False response = cinder.Services().get(request) self.assertStatusCode(response, 501) + self.mock_is_service_enabled.assert_called_once_with(request, 'volume') - @mock.patch.object(cinder.api, 'cinder') - def test_quota_sets_defaults_get_when_service_is_enabled(self, cc): + @test.create_mocks({api.cinder: ['is_volume_service_enabled', + 'default_quota_get']}) + def test_quota_sets_defaults_get_when_service_is_enabled(self): self.maxDiff = None filters = {'user': {'tenant_id': 'tenant'}} request = self.mock_rest_request(**{'GET': dict(filters)}) - cc.is_service_enabled.return_value = True - cc.default_quota_get.return_value = [Quota("volumes", 1), - Quota("snapshots", 2), - Quota("gigabytes", 3), - Quota("some_other_1", 100), - Quota("yet_another", 101)] + self.mock_is_volume_service_enabled.return_value = True + self.mock_default_quota_get.return_value = [Quota("volumes", 1), + Quota("snapshots", 2), + Quota("gigabytes", 3), + Quota("some_other_1", 100), + Quota("yet_another", 101)] response = cinder.DefaultQuotaSets().get(request) @@ -378,15 +388,17 @@ class CinderRestTestCase(test.TestCase): "display_name": "Yet Another", "name": "yet_another"}]}) - cc.default_quota_get.assert_called_once_with(request, - request.user.tenant_id) + self.mock_is_volume_service_enabled.assert_called_once_with(request) + self.mock_default_quota_get.assert_called_once_with( + request, request.user.tenant_id) - @mock.patch.object(cinder.api, 'cinder') - def test_quota_sets_defaults_get_when_service_is_disabled(self, cc): + @test.create_mocks({api.cinder: ['is_volume_service_enabled', + 'default_quota_get']}) + def test_quota_sets_defaults_get_when_service_is_disabled(self): filters = {'user': {'tenant_id': 'tenant'}} request = self.mock_rest_request(**{'GET': dict(filters)}) - cc.is_volume_service_enabled.return_value = False + self.mock_is_volume_service_enabled.return_value = False response = cinder.DefaultQuotaSets().get(request) @@ -394,35 +406,38 @@ class CinderRestTestCase(test.TestCase): self.assertEqual(response.content.decode('utf-8'), '"Service Cinder is disabled."') - cc.default_quota_get.assert_not_called() + self.mock_is_volume_service_enabled.assert_called_once_with(request) + self.mock_default_quota_get.assert_not_called() - @mock.patch.object(cinder.api, 'cinder') - def test_quota_sets_defaults_patch_when_service_is_enabled(self, cc): + @test.create_mocks({api.cinder: ['is_volume_service_enabled', + 'default_quota_update']}) + def test_quota_sets_defaults_patch_when_service_is_enabled(self): request = self.mock_rest_request(body=''' {"volumes": "15", "snapshots": "5000", - "gigabytes": "5", "cores": "10"} + "gigabytes": "5"} ''') - cc.is_volume_service_enabled.return_value = True + self.mock_is_volume_service_enabled.return_value = True + self.mock_default_quota_update.return_value = None response = cinder.DefaultQuotaSets().patch(request) self.assertStatusCode(response, 204) self.assertEqual(response.content.decode('utf-8'), '') - cc.default_quota_update.assert_called_once_with(request, - volumes='15', - snapshots='5000', - gigabytes='5') + self.mock_is_volume_service_enabled.assert_called_once_with(request) + self.mock_default_quota_update.assert_called_once_with( + request, volumes='15', snapshots='5000', gigabytes='5') - @mock.patch.object(cinder.api, 'cinder') - def test_quota_sets_defaults_patch_when_service_is_disabled(self, cc): + @test.create_mocks({api.cinder: ['is_volume_service_enabled', + 'default_quota_update']}) + def test_quota_sets_defaults_patch_when_service_is_disabled(self): request = self.mock_rest_request(body=''' {"volumes": "15", "snapshots": "5000", - "gigabytes": "5", "cores": "10"} + "gigabytes": "5"} ''') - cc.is_volume_service_enabled.return_value = False + self.mock_is_volume_service_enabled.return_value = False response = cinder.DefaultQuotaSets().patch(request) @@ -430,72 +445,62 @@ class CinderRestTestCase(test.TestCase): self.assertEqual(response.content.decode('utf-8'), '"Service Cinder is disabled."') - cc.default_quota_update.assert_not_called() - - @mock.patch.object(cinder.api, 'cinder') - @mock.patch.object(cinder, 'quotas') - def test_quota_sets_patch(self, qc, cc): - quota_set = self.cinder_quotas.list()[0] - quota_data = {} - - for quota in quota_set: - quota_data[quota.name] = quota.limit + self.mock_is_volume_service_enabled.assert_called_once_with(request) + self.mock_default_quota_update.assert_not_called() + @test.create_mocks({api.cinder: ['tenant_quota_update', + 'is_volume_service_enabled'], + quotas: ['get_disabled_quotas']}) + def test_quota_sets_patch(self): request = self.mock_rest_request(body=''' {"volumes": "15", "snapshots": "5000", - "gigabytes": "5", "cores": "10"} + "gigabytes": "5"} ''') - qc.get_disabled_quotas.return_value = [] - qc.CINDER_QUOTA_FIELDS = {n for n in quota_data} - cc.is_volume_service_enabled.return_value = True + self.mock_get_disabled_quotas.return_value = [] + self.mock_is_volume_service_enabled.return_value = True + self.mock_tenant_quota_update.return_value = None response = cinder.QuotaSets().patch(request, 'spam123') self.assertStatusCode(response, 204) self.assertEqual(response.content.decode('utf-8'), '') - cc.tenant_quota_update.assert_called_once_with(request, 'spam123', - volumes='15', - snapshots='5000', - gigabytes='5') - - @mock.patch.object(cinder.api, 'cinder') - @mock.patch.object(cinder, 'quotas') - def test_quota_sets_when_service_is_disabled(self, qc, cc): - quota_set = self.cinder_quotas.list()[0] - quota_data = {} - - for quota in quota_set: - quota_data[quota.name] = quota.limit + self.mock_get_disabled_quotas.assert_called_once_with(request) + self.mock_is_volume_service_enabled.assert_called_once_with(request) + self.mock_tenant_quota_update.assert_called_once_with( + request, 'spam123', volumes='15', snapshots='5000', gigabytes='5') + @test.create_mocks({api.cinder: ['tenant_quota_update', + 'is_volume_service_enabled'], + quotas: ['get_disabled_quotas']}) + def test_quota_sets_when_service_is_disabled(self): request = self.mock_rest_request(body=''' {"volumes": "15", "snapshots": "5000", - "gigabytes": "5", "cores": "10"} + "gigabytes": "5"} ''') - qc.get_disabled_quotas.return_value = [] - qc.CINDER_QUOTA_FIELDS = {n for n in quota_data} - cc.is_volume_service_enabled.return_value = False + self.mock_get_disabled_quotas.return_value = [] + self.mock_is_volume_service_enabled.return_value = False + self.mock_tenant_quota_update.return_value = None response = cinder.QuotaSets().patch(request, 'spam123') self.assertStatusCode(response, 501) self.assertEqual(response.content.decode('utf-8'), '"Service Cinder is disabled."') - cc.tenant_quota_update.assert_not_called() + self.mock_tenant_quota_update.assert_not_called() + self.mock_get_disabled_quotas.assert_called_once_with(request) + self.mock_is_volume_service_enabled.assert_called_once_with(request) - @mock.patch.object(cinder.api, 'cinder') - def test_availability_zones_get(self, cc): + @test.create_mocks({api.cinder: ['availability_zone_list']}) + def test_availability_zones_get(self): request = self.mock_rest_request(GET={}) - mock_az = mock.Mock() - mock_az.to_dict.return_value = { - 'name': 'cinder', - 'status': 'available' - } - cc.availability_zone_list.return_value = [mock_az] + az_list = self.cinder_availability_zones.list() + self.mock_availability_zone_list.return_value = az_list response = cinder.AvailabilityZones().get(request) self.assertStatusCode(response, 200) - response_as_json = json.loads(response.content.decode('utf-8')) - self.assertEqual(response_as_json['items'][0]['name'], 'cinder') - cc.availability_zone_list.assert_called_once_with(request, False) + self.assertEqual([az.to_dict() for az in az_list], + response.json['items']) + self.mock_availability_zone_list.assert_called_once_with( + request, False)