diff --git a/shade/_adapter.py b/shade/_adapter.py index be687cd5d..025103ce3 100644 --- a/shade/_adapter.py +++ b/shade/_adapter.py @@ -138,7 +138,7 @@ class ShadeAdapter(adapter.Adapter): if isinstance(result_json, list): self._log_request_id(response) - return meta.obj_list_to_dict(result_json) + return meta.obj_list_to_munch(result_json) result = None if isinstance(result_json, dict): @@ -158,9 +158,9 @@ class ShadeAdapter(adapter.Adapter): self._log_request_id(response, result) if isinstance(result, list): - return meta.obj_list_to_dict(result) + return meta.obj_list_to_munch(result) elif isinstance(result, dict): - return meta.obj_to_dict(result) + return meta.obj_to_munch(result) return result def request( diff --git a/shade/_utils.py b/shade/_utils.py index 265ff5afc..1e7e768db 100644 --- a/shade/_utils.py +++ b/shade/_utils.py @@ -249,7 +249,7 @@ def normalize_keystone_services(services): 'enabled': service['enabled'] } ret.append(new_service) - return meta.obj_list_to_dict(ret) + return meta.obj_list_to_munch(ret) def localhost_supports_ipv6(): @@ -277,7 +277,7 @@ def normalize_users(users): description=user.get('description') ) for user in users ] - return meta.obj_list_to_dict(ret) + return meta.obj_list_to_munch(ret) def normalize_domains(domains): @@ -289,7 +289,7 @@ def normalize_domains(domains): enabled=domain.get('enabled'), ) for domain in domains ] - return meta.obj_list_to_dict(ret) + return meta.obj_list_to_munch(ret) def normalize_groups(domains): @@ -302,7 +302,7 @@ def normalize_groups(domains): domain_id=domain.get('domain_id'), ) for domain in domains ] - return meta.obj_list_to_dict(ret) + return meta.obj_list_to_munch(ret) def normalize_role_assignments(assignments): @@ -363,7 +363,7 @@ def normalize_roles(roles): name=role.get('name'), ) for role in roles ] - return meta.obj_list_to_dict(ret) + return meta.obj_list_to_munch(ret) def normalize_flavor_accesses(flavor_accesses): diff --git a/shade/meta.py b/shade/meta.py index 826df5158..207de980f 100644 --- a/shade/meta.py +++ b/shade/meta.py @@ -505,7 +505,7 @@ def _log_request_id(obj, request_id): return obj -def obj_to_dict(obj): +def obj_to_munch(obj): """ Turn an object with attributes into a dict suitable for serializing. Some of the things that are returned in OpenStack are objects with @@ -517,7 +517,7 @@ def obj_to_dict(obj): if obj is None: return None elif isinstance(obj, munch.Munch) or hasattr(obj, 'mock_add_spec'): - # If we obj_to_dict twice, don't fail, just return the munch + # If we obj_to_munch twice, don't fail, just return the munch # Also, don't try to modify Mock objects - that way lies madness return obj elif isinstance(obj, dict): @@ -545,14 +545,20 @@ def obj_to_dict(obj): return instance -def obj_list_to_dict(obj_list): +obj_to_dict = obj_to_munch + + +def obj_list_to_munch(obj_list): """Enumerate through lists of objects and return lists of dictonaries. Some of the objects returned in OpenStack are actually lists of objects, and in order to expose the data structures as JSON, we need to facilitate the conversion to lists of dictonaries. """ - return [obj_to_dict(obj) for obj in obj_list] + return [obj_to_munch(obj) for obj in obj_list] + + +obj_list_to_dict = obj_list_to_munch def warlock_to_dict(obj): @@ -562,7 +568,7 @@ def warlock_to_dict(obj): # # glanceclient v2 uses warlock to construct its objects. Warlock does # deep black magic to attribute look up to support validation things that - # means we cannot use normal obj_to_dict + # means we cannot use normal obj_to_munch obj_dict = munch.Munch() for (key, value) in obj.items(): if isinstance(value, NON_CALLABLES) and not key.startswith('_'): @@ -578,7 +584,7 @@ def get_and_munchify(key, data): """ result = data.get(key, []) if isinstance(result, list): - return obj_list_to_dict(result) + return obj_list_to_munch(result) elif isinstance(result, dict): - return obj_to_dict(result) + return obj_to_munch(result) return result diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index 13343e843..8324a9ee2 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -2013,13 +2013,13 @@ class OpenStackCloud( # If this doesn't work - we just let the exception propagate response = self._compute_client.get('/images/detail') while 'next' in response: - image_list.extend(meta.obj_list_to_dict(response['images'])) + image_list.extend(meta.obj_list_to_munch(response['images'])) endpoint = response['next'] # Use the raw endpoint from the catalog not the one from # version discovery so that the next links will work right response = self._raw_image_client.get(endpoint) if 'images' in response: - image_list.extend(meta.obj_list_to_dict(response['images'])) + image_list.extend(meta.obj_list_to_munch(response['images'])) else: image_list.extend(response) diff --git a/shade/task_manager.py b/shade/task_manager.py index 9546653fb..885df8be5 100644 --- a/shade/task_manager.py +++ b/shade/task_manager.py @@ -143,9 +143,9 @@ class Task(BaseTask): return self._result if _is_listlike(self._result): - return meta.obj_list_to_dict(self._result) + return meta.obj_list_to_munch(self._result) elif _is_objlike(self._result): - return meta.obj_to_dict(self._result) + return meta.obj_to_munch(self._result) else: return self._result @@ -184,10 +184,10 @@ class RequestTask(BaseTask): return self._result if _is_listlike(self._result): - return meta.obj_list_to_dict( + return meta.obj_list_to_munch( self._result, request_id=self._request_id) elif _is_objlike(self._result): - return meta.obj_to_dict(self._result, request_id=self._request_id) + return meta.obj_to_munch(self._result, request_id=self._request_id) return self._result diff --git a/shade/tests/fakes.py b/shade/tests/fakes.py index c037e2f7f..c79f784fe 100644 --- a/shade/tests/fakes.py +++ b/shade/tests/fakes.py @@ -214,7 +214,7 @@ def make_fake_image( def make_fake_machine(machine_name, machine_id=None): if not machine_id: machine_id = uuid.uuid4().hex - return meta.obj_to_dict(FakeMachine( + return meta.obj_to_munch(FakeMachine( id=machine_id, name=machine_name)) diff --git a/shade/tests/unit/test_caching.py b/shade/tests/unit/test_caching.py index 4a7f629aa..d4bcaffad 100644 --- a/shade/tests/unit/test_caching.py +++ b/shade/tests/unit/test_caching.py @@ -98,7 +98,7 @@ class TestMemoryCache(base.RequestsMockTestCase): cloud_config_fixture='clouds_cache.yaml') def _image_dict(self, fake_image): - return self.cloud._normalize_image(meta.obj_to_dict(fake_image)) + return self.cloud._normalize_image(meta.obj_to_munch(fake_image)) def _munch_images(self, fake_image): return self.cloud._normalize_images([fake_image]) @@ -127,18 +127,18 @@ class TestMemoryCache(base.RequestsMockTestCase): self.assertEqual( self.cloud._normalize_projects( - meta.obj_list_to_dict(first_response['projects'])), + meta.obj_list_to_munch(first_response['projects'])), self.cloud.list_projects()) self.assertEqual( self.cloud._normalize_projects( - meta.obj_list_to_dict(first_response['projects'])), + meta.obj_list_to_munch(first_response['projects'])), self.cloud.list_projects()) # invalidate the list_projects cache self.cloud.list_projects.invalidate(self.cloud) # ensure the new values are now retrieved self.assertEqual( self.cloud._normalize_projects( - meta.obj_list_to_dict(second_response['projects'])), + meta.obj_list_to_munch(second_response['projects'])), self.cloud.list_projects()) self.assert_calls() @@ -163,18 +163,18 @@ class TestMemoryCache(base.RequestsMockTestCase): self.assertEqual( self.cloud._normalize_projects( - meta.obj_list_to_dict(first_response['tenants'])), + meta.obj_list_to_munch(first_response['tenants'])), self.cloud.list_projects()) self.assertEqual( self.cloud._normalize_projects( - meta.obj_list_to_dict(first_response['tenants'])), + meta.obj_list_to_munch(first_response['tenants'])), self.cloud.list_projects()) # invalidate the list_projects cache self.cloud.list_projects.invalidate(self.cloud) # ensure the new values are now retrieved self.assertEqual( self.cloud._normalize_projects( - meta.obj_list_to_dict(second_response['tenants'])), + meta.obj_list_to_munch(second_response['tenants'])), self.cloud.list_projects()) self.assert_calls() @@ -194,10 +194,10 @@ class TestMemoryCache(base.RequestsMockTestCase): def test_list_volumes(self): fake_volume = fakes.FakeVolume('volume1', 'available', 'Volume 1 Display Name') - fake_volume_dict = meta.obj_to_dict(fake_volume) + fake_volume_dict = meta.obj_to_munch(fake_volume) fake_volume2 = fakes.FakeVolume('volume2', 'available', 'Volume 2 Display Name') - fake_volume2_dict = meta.obj_to_dict(fake_volume2) + fake_volume2_dict = meta.obj_to_munch(fake_volume2) self.register_uris([ dict(method='GET', uri=self.get_mock_url( @@ -224,10 +224,10 @@ class TestMemoryCache(base.RequestsMockTestCase): def test_list_volumes_creating_invalidates(self): fake_volume = fakes.FakeVolume('volume1', 'creating', 'Volume 1 Display Name') - fake_volume_dict = meta.obj_to_dict(fake_volume) + fake_volume_dict = meta.obj_to_munch(fake_volume) fake_volume2 = fakes.FakeVolume('volume2', 'available', 'Volume 2 Display Name') - fake_volume2_dict = meta.obj_to_dict(fake_volume2) + fake_volume2_dict = meta.obj_to_munch(fake_volume2) self.register_uris([ dict(method='GET', uri=self.get_mock_url( @@ -247,12 +247,12 @@ class TestMemoryCache(base.RequestsMockTestCase): self.assert_calls() def test_create_volume_invalidates(self): - fake_volb4 = meta.obj_to_dict( + fake_volb4 = meta.obj_to_munch( fakes.FakeVolume('volume1', 'available', '')) _id = '12345' - fake_vol_creating = meta.obj_to_dict( + fake_vol_creating = meta.obj_to_munch( fakes.FakeVolume(_id, 'creating', '')) - fake_vol_avail = meta.obj_to_dict( + fake_vol_avail = meta.obj_to_munch( fakes.FakeVolume(_id, 'available', '')) def now_deleting(request, context): diff --git a/shade/tests/unit/test_create_server.py b/shade/tests/unit/test_create_server.py index 4df7990db..ff64a1a41 100644 --- a/shade/tests/unit/test_create_server.py +++ b/shade/tests/unit/test_create_server.py @@ -176,7 +176,7 @@ class TestCreateServer(base.RequestsMockTestCase): ]) self.assertEqual( self.cloud._normalize_server( - meta.obj_to_dict(fake_server)), + meta.obj_to_munch(fake_server)), self.cloud.create_server( name='server-name', image=dict(id='image=id'), @@ -215,7 +215,7 @@ class TestCreateServer(base.RequestsMockTestCase): ]) self.assertEqual( self.cloud._normalize_server( - meta.obj_to_dict(fake_create_server)), + meta.obj_to_munch(fake_create_server)), self.cloud.create_server( name='server-name', image=dict(id='image=id'), flavor=dict(id='flavor-id'), admin_pass='ooBootheiX0edoh')) @@ -243,7 +243,7 @@ class TestCreateServer(base.RequestsMockTestCase): mock_nova.servers.get.return_value = fake_server # The wait returns non-password server mock_wait.return_value = self.cloud._normalize_server( - meta.obj_to_dict(fake_server)) + meta.obj_to_munch(fake_server)) server = self.cloud.create_server( name='server-name', image=dict(id='image-id'), @@ -257,7 +257,7 @@ class TestCreateServer(base.RequestsMockTestCase): self.assertEqual( server, self.cloud._normalize_server( - meta.obj_to_dict(fake_server_with_pass)) + meta.obj_to_munch(fake_server_with_pass)) ) self.assert_calls() diff --git a/shade/tests/unit/test_create_volume_snapshot.py b/shade/tests/unit/test_create_volume_snapshot.py index 49882fdad..2d1636f2f 100644 --- a/shade/tests/unit/test_create_volume_snapshot.py +++ b/shade/tests/unit/test_create_volume_snapshot.py @@ -34,10 +34,10 @@ class TestCreateVolumeSnapshot(base.RequestsMockTestCase): volume_id = '1234' build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating', 'foo', 'derpysnapshot') - build_snapshot_dict = meta.obj_to_dict(build_snapshot) + build_snapshot_dict = meta.obj_to_munch(build_snapshot) fake_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'available', 'foo', 'derpysnapshot') - fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) + fake_snapshot_dict = meta.obj_to_munch(fake_snapshot) self.register_uris([ dict(method='POST', @@ -70,7 +70,7 @@ class TestCreateVolumeSnapshot(base.RequestsMockTestCase): volume_id = '1234' build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating', 'foo', 'derpysnapshot') - build_snapshot_dict = meta.obj_to_dict(build_snapshot) + build_snapshot_dict = meta.obj_to_munch(build_snapshot) self.register_uris([ dict(method='POST', @@ -99,10 +99,10 @@ class TestCreateVolumeSnapshot(base.RequestsMockTestCase): volume_id = '1234' build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating', 'bar', 'derpysnapshot') - build_snapshot_dict = meta.obj_to_dict(build_snapshot) + build_snapshot_dict = meta.obj_to_munch(build_snapshot) error_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'error', 'blah', 'derpysnapshot') - error_snapshot_dict = meta.obj_to_dict(error_snapshot) + error_snapshot_dict = meta.obj_to_munch(error_snapshot) self.register_uris([ dict(method='POST', diff --git a/shade/tests/unit/test_delete_volume_snapshot.py b/shade/tests/unit/test_delete_volume_snapshot.py index 355e08e01..3d7920b6a 100644 --- a/shade/tests/unit/test_delete_volume_snapshot.py +++ b/shade/tests/unit/test_delete_volume_snapshot.py @@ -32,7 +32,7 @@ class TestDeleteVolumeSnapshot(base.RequestsMockTestCase): """ fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available', 'foo', 'derpysnapshot') - fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) + fake_snapshot_dict = meta.obj_to_munch(fake_snapshot) self.register_uris([ dict(method='GET', @@ -56,7 +56,7 @@ class TestDeleteVolumeSnapshot(base.RequestsMockTestCase): """ fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available', 'foo', 'derpysnapshot') - fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) + fake_snapshot_dict = meta.obj_to_munch(fake_snapshot) self.register_uris([ dict(method='GET', uri=self.get_mock_url( @@ -81,7 +81,7 @@ class TestDeleteVolumeSnapshot(base.RequestsMockTestCase): """ fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available', 'foo', 'derpysnapshot') - fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) + fake_snapshot_dict = meta.obj_to_munch(fake_snapshot) self.register_uris([ dict(method='GET', diff --git a/shade/tests/unit/test_floating_ip_common.py b/shade/tests/unit/test_floating_ip_common.py index d208afcb0..4e813cf11 100644 --- a/shade/tests/unit/test_floating_ip_common.py +++ b/shade/tests/unit/test_floating_ip_common.py @@ -38,7 +38,7 @@ class TestFloatingIP(base.TestCase): server = FakeServer( id='server-id', name='test-server', status="ACTIVE", addresses={} ) - server_dict = meta.obj_to_dict(server) + server_dict = meta.obj_to_munch(server) floating_ip_dict = { "id": "this-is-a-floating-ip-id", "fixed_ip_address": None, @@ -64,7 +64,7 @@ class TestFloatingIP(base.TestCase): server = FakeServer( id='romeo', name='test-server', status="ACTIVE", addresses={} ) - server_dict = meta.obj_to_dict(server) + server_dict = meta.obj_to_munch(server) pool = 'nova' mock_nova_client.servers.get.return_value = server @@ -102,7 +102,7 @@ class TestFloatingIP(base.TestCase): } ) server_dict = meta.add_server_interfaces( - self.cloud, meta.obj_to_dict(server)) + self.cloud, meta.obj_to_munch(server)) new_server = self.cloud.add_ips_to_server(server=server_dict) mock_get_floating_ip.assert_not_called() @@ -143,7 +143,7 @@ class TestFloatingIP(base.TestCase): } ) server_dict = meta.add_server_interfaces( - self.cloud, meta.obj_to_dict(server)) + self.cloud, meta.obj_to_munch(server)) new_server = self.cloud.add_ips_to_server(server=server_dict) mock_get_floating_ip.assert_not_called() @@ -180,7 +180,7 @@ class TestFloatingIP(base.TestCase): } ) server_dict = meta.add_server_interfaces( - self.cloud, meta.obj_to_dict(server)) + self.cloud, meta.obj_to_munch(server)) new_server = self.cloud.add_ips_to_server(server=server_dict) mock_get_floating_ip.assert_not_called() @@ -194,7 +194,7 @@ class TestFloatingIP(base.TestCase): server = FakeServer( id='server-id', name='test-server', status="ACTIVE", addresses={} ) - server_dict = meta.obj_to_dict(server) + server_dict = meta.obj_to_munch(server) ips = ['203.0.113.29', '172.24.4.229'] mock_nova_client.servers.get.return_value = server @@ -211,7 +211,7 @@ class TestFloatingIP(base.TestCase): server = FakeServer( id='server-id', name='test-server', status="ACTIVE", addresses={} ) - server_dict = meta.obj_to_dict(server) + server_dict = meta.obj_to_munch(server) mock_nova_client.servers.get.return_value = server # TODO(mordred) REMOVE THIS MOCK WHEN THE NEXT PATCH LANDS diff --git a/shade/tests/unit/test_floating_ip_neutron.py b/shade/tests/unit/test_floating_ip_neutron.py index 72e5c515f..5588bfcb3 100644 --- a/shade/tests/unit/test_floating_ip_neutron.py +++ b/shade/tests/unit/test_floating_ip_neutron.py @@ -136,7 +136,7 @@ class TestFloatingIP(base.RequestsMockTestCase): def setUp(self): super(TestFloatingIP, self).setUp() - self.fake_server = meta.obj_to_dict( + self.fake_server = meta.obj_to_munch( fakes.FakeServer( 'server-id', '', 'ACTIVE', addresses={u'test_pnztt_net': [{ diff --git a/shade/tests/unit/test_floating_ip_nova.py b/shade/tests/unit/test_floating_ip_nova.py index cc0acd18d..afbbbf5f4 100644 --- a/shade/tests/unit/test_floating_ip_nova.py +++ b/shade/tests/unit/test_floating_ip_nova.py @@ -68,7 +68,7 @@ class TestFloatingIP(base.RequestsMockTestCase): def setUp(self): super(TestFloatingIP, self).setUp() - self.fake_server = meta.obj_to_dict( + self.fake_server = meta.obj_to_munch( fakes.FakeServer( 'server-id', '', 'ACTIVE', addresses={u'test_pnztt_net': [{ diff --git a/shade/tests/unit/test_image.py b/shade/tests/unit/test_image.py index 8f4bdc0c0..4d16fc01d 100644 --- a/shade/tests/unit/test_image.py +++ b/shade/tests/unit/test_image.py @@ -301,7 +301,7 @@ class TestImage(BaseTestImage): self.assert_calls() def _image_dict(self, fake_image): - return self.cloud._normalize_image(meta.obj_to_dict(fake_image)) + return self.cloud._normalize_image(meta.obj_to_munch(fake_image)) def _munch_images(self, fake_image): return self.cloud._normalize_images([fake_image]) diff --git a/shade/tests/unit/test_inventory.py b/shade/tests/unit/test_inventory.py index 34914fdb6..9a5632953 100644 --- a/shade/tests/unit/test_inventory.py +++ b/shade/tests/unit/test_inventory.py @@ -101,7 +101,7 @@ class TestInventory(base.TestCase): inv = inventory.OpenStackInventory() server = self.cloud._normalize_server( - meta.obj_to_dict(fakes.FakeServer( + meta.obj_to_munch(fakes.FakeServer( '1234', 'test', 'ACTIVE', addresses={}))) self.assertIsInstance(inv.clouds, list) self.assertEqual(1, len(inv.clouds)) diff --git a/shade/tests/unit/test_keypair.py b/shade/tests/unit/test_keypair.py index 2d8698554..8094d7d56 100644 --- a/shade/tests/unit/test_keypair.py +++ b/shade/tests/unit/test_keypair.py @@ -36,7 +36,7 @@ class TestKeypair(base.TestCase): mock_nova.keypairs.create.assert_called_once_with( name=keyname, public_key=pub_key ) - self.assertEqual(meta.obj_to_dict(key), new_key) + self.assertEqual(meta.obj_to_munch(key), new_key) @patch.object(shade.OpenStackCloud, 'nova_client') def test_create_keypair_exception(self, mock_nova): diff --git a/shade/tests/unit/test_meta.py b/shade/tests/unit/test_meta.py index 4ea2da865..1b50dd37d 100644 --- a/shade/tests/unit/test_meta.py +++ b/shade/tests/unit/test_meta.py @@ -267,7 +267,7 @@ class TestMeta(base.RequestsMockTestCase): addrs, key_name='public', ext_tag='fixed', version=6)) def test_get_server_ip(self): - srv = meta.obj_to_dict(standard_fake_server) + srv = meta.obj_to_munch(standard_fake_server) self.assertEqual( PRIVATE_V4, meta.get_server_ip(srv, ext_tag='fixed')) self.assertEqual( @@ -286,7 +286,7 @@ class TestMeta(base.RequestsMockTestCase): json={'subnets': SUBNETS_WITH_NAT}) ]) - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'private': [{'OS-EXT-IPS:type': 'fixed', 'addr': PRIVATE_V4, @@ -315,7 +315,7 @@ class TestMeta(base.RequestsMockTestCase): shared_mac = '11:22:33:44:55:66' distinct_mac = '66:55:44:33:22:11' - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'test-net': [{'OS-EXT-IPS:type': 'fixed', 'OS-EXT-IPS-MAC:mac_addr': distinct_mac, @@ -383,7 +383,7 @@ class TestMeta(base.RequestsMockTestCase): json={'security_groups': []}) ]) - srv = self.cloud.get_openstack_vars(meta.obj_to_dict(fakes.FakeServer( + srv = self.cloud.get_openstack_vars(meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', flavor={u'id': u'1'}, image={ @@ -433,7 +433,7 @@ class TestMeta(base.RequestsMockTestCase): json={'security_groups': []}) ]) - srv = self.cloud.get_openstack_vars(meta.obj_to_dict(fakes.FakeServer( + srv = self.cloud.get_openstack_vars(meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', flavor={u'id': u'1'}, image={ @@ -483,7 +483,7 @@ class TestMeta(base.RequestsMockTestCase): json={'security_groups': []}) ]) - srv = self.cloud.get_openstack_vars(meta.obj_to_dict(fakes.FakeServer( + srv = self.cloud.get_openstack_vars(meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', flavor={u'id': u'1'}, image={ @@ -551,7 +551,7 @@ class TestMeta(base.RequestsMockTestCase): json={'security_groups': []}) ]) - srv = self.cloud.get_openstack_vars(meta.obj_to_dict(fakes.FakeServer( + srv = self.cloud.get_openstack_vars(meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', flavor={u'id': u'1'}, image={ @@ -588,7 +588,7 @@ class TestMeta(base.RequestsMockTestCase): json={'security_groups': []}) ]) - srv = self.cloud.get_openstack_vars(meta.obj_to_dict(fakes.FakeServer( + srv = self.cloud.get_openstack_vars(meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', flavor={u'id': u'1'}, image={ @@ -647,7 +647,7 @@ class TestMeta(base.RequestsMockTestCase): json={'security_groups': []}) ]) - srv = self.cloud.get_openstack_vars(meta.obj_to_dict(fakes.FakeServer( + srv = self.cloud.get_openstack_vars(meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', flavor={u'id': u'1'}, image={ @@ -690,7 +690,7 @@ class TestMeta(base.RequestsMockTestCase): uri='https://network.example.com/v2.0/subnets.json', json={'subnets': SUBNETS_WITH_NAT}) ]) - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'test-net': [{ 'addr': PUBLIC_V4, @@ -717,7 +717,7 @@ class TestMeta(base.RequestsMockTestCase): json={'subnets': SUBNETS_WITH_NAT}) ]) - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'test-net': [{ 'addr': PUBLIC_V4, @@ -744,7 +744,7 @@ class TestMeta(base.RequestsMockTestCase): uri='https://network.example.com/v2.0/subnets.json', json={'subnets': SUBNETS_WITH_NAT}) ]) - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'test-net': [{ 'addr': PRIVATE_V4, @@ -772,7 +772,7 @@ class TestMeta(base.RequestsMockTestCase): json={'subnets': SUBNETS_WITH_NAT}) ]) - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'test-net': [{ 'addr': PUBLIC_V4, @@ -784,7 +784,7 @@ class TestMeta(base.RequestsMockTestCase): self.assert_calls() def test_get_server_external_ipv4_neutron_accessIPv4(self): - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', accessIPv4=PUBLIC_V4)) ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv) @@ -792,7 +792,7 @@ class TestMeta(base.RequestsMockTestCase): self.assertEqual(PUBLIC_V4, ip) def test_get_server_external_ipv4_neutron_accessIPv6(self): - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', accessIPv6=PUBLIC_V6)) ip = meta.get_server_external_ipv6(server=srv) @@ -806,7 +806,7 @@ class TestMeta(base.RequestsMockTestCase): uri='https://network.example.com/v2.0/networks.json', status_code=404)]) - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'public': [{'addr': PUBLIC_V4, 'version': 4}]} )) @@ -819,7 +819,7 @@ class TestMeta(base.RequestsMockTestCase): # Testing Clouds w/o Neutron and a network named public self.cloud.cloud_config.config['has_network'] = False - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'public': [{'addr': PUBLIC_V4, 'version': 4}]})) ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv) @@ -830,7 +830,7 @@ class TestMeta(base.RequestsMockTestCase): # Testing Clouds w/o Neutron or a globally routable IP self.cloud.cloud_config.config['has_network'] = False - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={'test-net': [{'addr': PRIVATE_V4}]})) ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv) @@ -838,7 +838,7 @@ class TestMeta(base.RequestsMockTestCase): self.assertIsNone(ip) def test_get_server_external_ipv6(self): - srv = meta.obj_to_dict(fakes.FakeServer( + srv = meta.obj_to_munch(fakes.FakeServer( id='test-id', name='test-name', status='ACTIVE', addresses={ 'test-net': [ @@ -866,12 +866,12 @@ class TestMeta(base.RequestsMockTestCase): 'test-name_test-region_test-az'], meta.get_groups_from_server( FakeCloud(), - meta.obj_to_dict(standard_fake_server), + meta.obj_to_munch(standard_fake_server), server_vars ) ) - def test_obj_list_to_dict(self): + def test_obj_list_to_munch(self): """Test conversion of a list of objects to a list of dictonaries""" class obj0(object): value = 0 @@ -880,7 +880,7 @@ class TestMeta(base.RequestsMockTestCase): value = 1 list = [obj0, obj1] - new_list = meta.obj_list_to_dict(list) + new_list = meta.obj_list_to_munch(list) self.assertEqual(new_list[0]['value'], 0) self.assertEqual(new_list[1]['value'], 1) @@ -894,7 +894,7 @@ class TestMeta(base.RequestsMockTestCase): mock_list_server_security_groups.return_value = [ {'name': 'testgroup', 'id': '1'}] - server = meta.obj_to_dict(standard_fake_server) + server = meta.obj_to_munch(standard_fake_server) hostvars = meta.get_hostvars_from_server(FakeCloud(), server) mock_list_server_security_groups.assert_called_once_with(server) @@ -911,7 +911,7 @@ class TestMeta(base.RequestsMockTestCase): hostvars = meta.get_hostvars_from_server( FakeCloud(), self.cloud._normalize_server( - meta.obj_to_dict(standard_fake_server))) + meta.obj_to_munch(standard_fake_server))) self.assertNotIn('links', hostvars) self.assertEqual(PRIVATE_V4, hostvars['private_v4']) self.assertEqual(PUBLIC_V4, hostvars['public_v4']) @@ -946,7 +946,7 @@ class TestMeta(base.RequestsMockTestCase): fake_cloud = FakeCloud() fake_cloud.force_ipv4 = True hostvars = meta.get_hostvars_from_server( - fake_cloud, meta.obj_to_dict(standard_fake_server)) + fake_cloud, meta.obj_to_munch(standard_fake_server)) self.assertEqual(PUBLIC_V4, hostvars['interface_ip']) @mock.patch.object(shade.meta, 'get_server_external_ipv4') @@ -956,7 +956,7 @@ class TestMeta(base.RequestsMockTestCase): cloud = FakeCloud() cloud.private = True hostvars = meta.get_hostvars_from_server( - cloud, meta.obj_to_dict(standard_fake_server)) + cloud, meta.obj_to_munch(standard_fake_server)) self.assertEqual(PRIVATE_V4, hostvars['interface_ip']) @mock.patch.object(shade.meta, 'get_server_external_ipv4') @@ -966,14 +966,14 @@ class TestMeta(base.RequestsMockTestCase): server = standard_fake_server server.image = 'fake-image-id' hostvars = meta.get_hostvars_from_server( - FakeCloud(), meta.obj_to_dict(server)) + FakeCloud(), meta.obj_to_munch(server)) self.assertEqual('fake-image-id', hostvars['image']['id']) def test_az(self): server = standard_fake_server server.__dict__['OS-EXT-AZ:availability_zone'] = 'az1' - hostvars = self.cloud._normalize_server(meta.obj_to_dict(server)) + hostvars = self.cloud._normalize_server(meta.obj_to_munch(server)) self.assertEqual('az1', hostvars['az']) def test_current_location(self): @@ -1005,10 +1005,10 @@ class TestMeta(base.RequestsMockTestCase): status='available', name='Volume 1 Display Name', attachments=[{'device': '/dev/sda0'}]) - fake_volume_dict = meta.obj_to_dict(fake_volume) + fake_volume_dict = meta.obj_to_munch(fake_volume) mock_cloud.get_volumes.return_value = [fake_volume_dict] hostvars = meta.get_hostvars_from_server( - mock_cloud, meta.obj_to_dict(standard_fake_server)) + mock_cloud, meta.obj_to_munch(standard_fake_server)) self.assertEqual('volume1', hostvars['volumes'][0]['id']) self.assertEqual('/dev/sda0', hostvars['volumes'][0]['device']) @@ -1016,7 +1016,7 @@ class TestMeta(base.RequestsMockTestCase): fake_cloud = FakeCloud() fake_cloud.service_val = False hostvars = meta.get_hostvars_from_server( - fake_cloud, meta.obj_to_dict(standard_fake_server)) + fake_cloud, meta.obj_to_munch(standard_fake_server)) self.assertEqual([], hostvars['volumes']) def test_unknown_volume_exception(self): @@ -1032,12 +1032,12 @@ class TestMeta(base.RequestsMockTestCase): FakeException, meta.get_hostvars_from_server, mock_cloud, - meta.obj_to_dict(standard_fake_server)) + meta.obj_to_munch(standard_fake_server)) - def test_obj_to_dict(self): + def test_obj_to_munch(self): cloud = FakeCloud() cloud.server = standard_fake_server - cloud_dict = meta.obj_to_dict(cloud) + cloud_dict = meta.obj_to_munch(cloud) self.assertEqual(FakeCloud.name, cloud_dict['name']) self.assertNotIn('_unused', cloud_dict) self.assertNotIn('get_flavor_name', cloud_dict) @@ -1045,11 +1045,11 @@ class TestMeta(base.RequestsMockTestCase): self.assertTrue(hasattr(cloud_dict, 'name')) self.assertEqual(cloud_dict.name, cloud_dict['name']) - def test_obj_to_dict_subclass(self): + def test_obj_to_munch_subclass(self): class FakeObjDict(dict): additional = 1 obj = FakeObjDict(foo='bar') - obj_dict = meta.obj_to_dict(obj) + obj_dict = meta.obj_to_munch(obj) self.assertIn('additional', obj_dict) self.assertIn('foo', obj_dict) self.assertEqual(obj_dict['additional'], 1) diff --git a/shade/tests/unit/test_rebuild_server.py b/shade/tests/unit/test_rebuild_server.py index f9d0714d6..9000c4815 100644 --- a/shade/tests/unit/test_rebuild_server.py +++ b/shade/tests/unit/test_rebuild_server.py @@ -92,7 +92,7 @@ class TestRebuildServer(base.RequestsMockTestCase): """ rebuild_server = fakes.FakeServer('1234', '', 'REBUILD') mock_nova.servers.rebuild.return_value = rebuild_server - self.assertEqual(meta.obj_to_dict(rebuild_server), + self.assertEqual(meta.obj_to_munch(rebuild_server), self.cloud.rebuild_server("a", "b")) @mock.patch.object(OpenStackCloud, 'nova_client') @@ -104,7 +104,7 @@ class TestRebuildServer(base.RequestsMockTestCase): adminPass='ooBootheiX0edoh') mock_nova.servers.rebuild.return_value = rebuild_server self.assertEqual( - meta.obj_to_dict(rebuild_server), + meta.obj_to_munch(rebuild_server), self.cloud.rebuild_server( 'a', 'b', admin_pass='ooBootheiX0edoh')) @@ -141,7 +141,7 @@ class TestRebuildServer(base.RequestsMockTestCase): self.cloud.name = 'cloud-name' self.assertEqual( self.cloud._normalize_server( - meta.obj_to_dict(ret_active_server)), + meta.obj_to_munch(ret_active_server)), self.cloud.rebuild_server( "1234", "b", wait=True, admin_pass='ooBootheiX0edoh')) # TODO(slaweq): change do_count to True when all nova mocks will be @@ -179,7 +179,7 @@ class TestRebuildServer(base.RequestsMockTestCase): self.cloud.name = 'cloud-name' self.assertEqual( self.cloud._normalize_server( - meta.obj_to_dict(active_server)), + meta.obj_to_munch(active_server)), self.cloud.rebuild_server("1234", "b", wait=True)) # TODO(slaweq): change do_count to True when all nova mocks will be # replaced with request_mocks also diff --git a/shade/tests/unit/test_security_groups.py b/shade/tests/unit/test_security_groups.py index a09517d5c..cad328edf 100644 --- a/shade/tests/unit/test_security_groups.py +++ b/shade/tests/unit/test_security_groups.py @@ -20,7 +20,7 @@ from shade.tests import fakes # TODO(mordred): Make a fakes.make_fake_nova_security_group and a # fakes.make_fake_nova_security_group and remove all uses of -# meta.obj_to_dict here. Also, we have hardcoded id names - +# meta.obj_to_munch here. Also, we have hardcoded id names - # move those to using a getUniqueString() value. neutron_grp_obj = fakes.FakeSecgroup( @@ -47,8 +47,8 @@ nova_grp_obj = fakes.FakeSecgroup( # Neutron returns dicts instead of objects, so the dict versions should # be used as expected return values from neutron API methods. -neutron_grp_dict = meta.obj_to_dict(neutron_grp_obj) -nova_grp_dict = meta.obj_to_dict(nova_grp_obj) +neutron_grp_dict = meta.obj_to_munch(neutron_grp_obj) +nova_grp_dict = meta.obj_to_munch(nova_grp_obj) class TestSecurityGroups(base.RequestsMockTestCase): @@ -163,7 +163,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): self.cloud.secgroup_source = 'neutron' group_name = self.getUniqueString() group_desc = 'security group from test_create_security_group_neutron' - new_group = meta.obj_to_dict( + new_group = meta.obj_to_munch( fakes.FakeSecgroup( id='2', name=group_name, @@ -194,7 +194,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): group_name = self.getUniqueString() group_desc = 'security group from' \ ' test_create_security_group_neutron_specific_tenant' - new_group = meta.obj_to_dict( + new_group = meta.obj_to_munch( fakes.FakeSecgroup( id='2', name=group_name, @@ -230,7 +230,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): group_name = self.getUniqueString() self.has_neutron = False group_desc = 'security group from test_create_security_group_neutron' - new_group = meta.obj_to_dict( + new_group = meta.obj_to_munch( fakes.FakeSecgroup( id='2', name=group_name, @@ -266,7 +266,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): self.cloud.secgroup_source = 'neutron' new_name = self.getUniqueString() sg_id = neutron_grp_obj.id - update_return = meta.obj_to_dict(neutron_grp_obj) + update_return = meta.obj_to_munch(neutron_grp_obj) update_return['name'] = new_name self.register_uris([ dict(method='GET', @@ -291,7 +291,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): new_name = self.getUniqueString() self.cloud.secgroup_source = 'nova' nova_return = [nova_grp_dict] - update_return = meta.obj_to_dict(nova_grp_obj) + update_return = meta.obj_to_munch(nova_grp_obj) update_return['name'] = new_name self.register_uris([ @@ -408,7 +408,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): nova_return = [nova_grp_dict] - new_rule = meta.obj_to_dict(fakes.FakeNovaSecgroupRule( + new_rule = meta.obj_to_munch(fakes.FakeNovaSecgroupRule( id='xyz', from_port=1, to_port=2000, ip_protocol='tcp', cidr='1.2.3.4/32')) @@ -448,7 +448,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): nova_return = [nova_grp_dict] - new_rule = meta.obj_to_dict(fakes.FakeNovaSecgroupRule( + new_rule = meta.obj_to_munch(fakes.FakeNovaSecgroupRule( id='xyz', from_port=1, to_port=65535, ip_protocol='tcp', cidr='1.2.3.4/32')) @@ -627,7 +627,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): uri=self.get_mock_url( 'compute', 'public', append=['servers', 'detail']), - json={'servers': [meta.obj_to_dict(fake_server)]}), + json={'servers': [meta.obj_to_munch(fake_server)]}), dict(method='GET', uri=self.get_mock_url( 'network', 'public', @@ -680,7 +680,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): uri=self.get_mock_url( 'compute', 'public', append=['servers', 'detail']), - json={'servers': [meta.obj_to_dict(fake_server)]}), + json={'servers': [meta.obj_to_munch(fake_server)]}), dict(method='GET', uri=self.get_mock_url( 'network', 'public', @@ -697,7 +697,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): def test_add_bad_security_group_to_server_nova(self): # fake to get server by name, server-name must match - fake_server = meta.obj_to_dict( + fake_server = meta.obj_to_munch( fakes.FakeServer('1234', 'server-name', 'ACTIVE')) # use nova for secgroup list and return an existing fake @@ -734,7 +734,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): uri=self.get_mock_url( 'compute', 'public', append=['servers', 'detail']), - json={'servers': [meta.obj_to_dict(fake_server)]}), + json={'servers': [meta.obj_to_munch(fake_server)]}), dict(method='GET', uri=self.get_mock_url( 'network', 'public', @@ -747,7 +747,7 @@ class TestSecurityGroups(base.RequestsMockTestCase): def test_add_security_group_to_bad_server(self): # fake to get server by name, server-name must match - fake_server = meta.obj_to_dict( + fake_server = meta.obj_to_munch( fakes.FakeServer('1234', 'server-name', 'ACTIVE')) self.register_uris([ diff --git a/shade/tests/unit/test_shade_operator.py b/shade/tests/unit/test_shade_operator.py index dd4b539a0..fd3575e27 100644 --- a/shade/tests/unit/test_shade_operator.py +++ b/shade/tests/unit/test_shade_operator.py @@ -87,7 +87,7 @@ class TestShadeOperator(base.RequestsMockTestCase): mock_client.node.list.return_value = [m1] machines = self.op_cloud.list_machines() self.assertTrue(mock_client.node.list.called) - self.assertEqual(meta.obj_to_dict(m1), machines[0]) + self.assertEqual(meta.obj_to_munch(m1), machines[0]) @mock.patch.object(shade.OperatorCloud, 'ironic_client') def test_validate_node(self, mock_client): @@ -102,7 +102,7 @@ class TestShadeOperator(base.RequestsMockTestCase): port1 = fakes.FakeMachinePort(1, "aa:bb:cc:dd", "node1") port2 = fakes.FakeMachinePort(2, "dd:cc:bb:aa", "node2") port_list = [port1, port2] - port_dict_list = meta.obj_list_to_dict(port_list) + port_dict_list = meta.obj_list_to_munch(port_list) mock_client.port.list.return_value = port_list nics = self.op_cloud.list_nics() diff --git a/shade/tests/unit/test_stack.py b/shade/tests/unit/test_stack.py index 52cbde33d..cc83eb2ec 100644 --- a/shade/tests/unit/test_stack.py +++ b/shade/tests/unit/test_stack.py @@ -74,7 +74,7 @@ class TestStack(base.RequestsMockTestCase): ]) stacks = self.cloud.search_stacks() self.assertEqual( - self.cloud._normalize_stacks(meta.obj_list_to_dict(fake_stacks)), + self.cloud._normalize_stacks(meta.obj_list_to_munch(fake_stacks)), stacks) self.assert_calls() @@ -96,7 +96,7 @@ class TestStack(base.RequestsMockTestCase): stacks = self.cloud.search_stacks(filters=filters) self.assertEqual( self.cloud._normalize_stacks( - meta.obj_list_to_dict(fake_stacks[1:])), + meta.obj_list_to_munch(fake_stacks[1:])), stacks) self.assert_calls() diff --git a/shade/tests/unit/test_volume.py b/shade/tests/unit/test_volume.py index 8659bb3f6..a0f9475a4 100644 --- a/shade/tests/unit/test_volume.py +++ b/shade/tests/unit/test_volume.py @@ -25,7 +25,7 @@ class TestVolume(base.RequestsMockTestCase): server = dict(id='server001') vol = {'id': 'volume001', 'status': 'available', 'name': '', 'attachments': []} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) rattach = {'server_id': server['id'], 'device': 'device001', 'volumeId': volume['id'], 'id': 'attachmentId'} self.register_uris([ @@ -47,7 +47,7 @@ class TestVolume(base.RequestsMockTestCase): server = dict(id='server001') vol = {'id': 'volume001', 'status': 'available', 'name': '', 'attachments': []} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) self.register_uris([ dict(method='POST', uri=self.get_mock_url( @@ -71,11 +71,11 @@ class TestVolume(base.RequestsMockTestCase): server = dict(id='server001') vol = {'id': 'volume001', 'status': 'available', 'name': '', 'attachments': []} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) vol['attachments'] = [{'server_id': server['id'], 'device': 'device001'}] vol['status'] = 'attached' - attached_volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + attached_volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) rattach = {'server_id': server['id'], 'device': 'device001', 'volumeId': volume['id'], 'id': 'attachmentId'} self.register_uris([ @@ -105,9 +105,9 @@ class TestVolume(base.RequestsMockTestCase): server = dict(id='server001') vol = {'id': 'volume001', 'status': 'available', 'name': '', 'attachments': []} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) vol['status'] = 'error' - errored_volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + errored_volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) rattach = {'server_id': server['id'], 'device': 'device001', 'volumeId': volume['id'], 'id': 'attachmentId'} self.register_uris([ @@ -201,10 +201,10 @@ class TestVolume(base.RequestsMockTestCase): attachments = [{'server_id': 'server001', 'device': 'device001'}] vol = {'id': 'volume001', 'status': 'attached', 'name': '', 'attachments': attachments} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) vol['status'] = 'available' vol['attachments'] = [] - avail_volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + avail_volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) self.register_uris([ dict(method='DELETE', uri=self.get_mock_url( @@ -223,10 +223,10 @@ class TestVolume(base.RequestsMockTestCase): attachments = [{'server_id': 'server001', 'device': 'device001'}] vol = {'id': 'volume001', 'status': 'attached', 'name': '', 'attachments': attachments} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) vol['status'] = 'error' vol['attachments'] = [] - errored_volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + errored_volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) self.register_uris([ dict(method='DELETE', uri=self.get_mock_url( @@ -247,7 +247,7 @@ class TestVolume(base.RequestsMockTestCase): def test_delete_volume_deletes(self): vol = {'id': 'volume001', 'status': 'attached', 'name': '', 'attachments': []} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) self.register_uris([ dict(method='GET', uri=self.get_mock_url( @@ -266,7 +266,7 @@ class TestVolume(base.RequestsMockTestCase): def test_delete_volume_gone_away(self): vol = {'id': 'volume001', 'status': 'attached', 'name': '', 'attachments': []} - volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) + volume = meta.obj_to_munch(fakes.FakeVolume(**vol)) self.register_uris([ dict(method='GET', uri=self.get_mock_url( @@ -280,8 +280,8 @@ class TestVolume(base.RequestsMockTestCase): self.assert_calls() def test_list_volumes_with_pagination(self): - vol1 = meta.obj_to_dict(fakes.FakeVolume('01', 'available', 'vol1')) - vol2 = meta.obj_to_dict(fakes.FakeVolume('02', 'available', 'vol2')) + vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1')) + vol2 = meta.obj_to_munch(fakes.FakeVolume('02', 'available', 'vol2')) self.register_uris([ dict(method='GET', uri=self.get_mock_url( diff --git a/shade/tests/unit/test_volume_backups.py b/shade/tests/unit/test_volume_backups.py index 17298937a..ca04c1d8c 100644 --- a/shade/tests/unit/test_volume_backups.py +++ b/shade/tests/unit/test_volume_backups.py @@ -28,7 +28,7 @@ class TestVolumeBackups(base.RequestsMockTestCase): name, {'availability_zone': 'az1'}) self.assertEqual(len(result), 2) self.assertEqual( - meta.obj_list_to_dict([vol1, vol2]), + meta.obj_list_to_munch([vol1, vol2]), result) self.assert_calls() @@ -44,9 +44,9 @@ class TestVolumeBackups(base.RequestsMockTestCase): json={"backups": [vol1, vol2, vol3]})]) result = self.cloud.get_volume_backup( name, {'availability_zone': 'az1'}) - result = meta.obj_to_dict(result) + result = meta.obj_to_munch(result) self.assertEqual( - meta.obj_to_dict(vol1), + meta.obj_to_munch(vol1), result) self.assert_calls() @@ -63,7 +63,7 @@ class TestVolumeBackups(base.RequestsMockTestCase): result = self.cloud.list_volume_backups(True, search_opts) self.assertEqual(len(result), 1) self.assertEqual( - meta.obj_list_to_dict([backup]), + meta.obj_list_to_munch([backup]), result) self.assert_calls()