openstack
/
shade
Code Issues Proposed changes

Rename obj_to_dict and obj_list_to_dict 

Since we are actually to munch objects and not dict,
let's rename them to obj_to_munch and obj_list_to_munch.

Change-Id: Id4d77520237503bbfede89638675402d143fffcd
Signed-off-by: Rosario Di Somma <rosario.disomma@dreamhost.com>
This commit is contained in:
Rosario Di Somma 2017-06-10 16:07:38 +00:00
parent 75ce9ad924
commit 4fce8d91f4
23 changed files with 143 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shade/_adapter.py
View File

@ -138,7 +138,7 @@ class ShadeAdapter(adapter.Adapter):
if isinstance(result_json, list): if isinstance(result_json, list):
self._log_request_id(response) self._log_request_id(response)
return meta.obj_list_to_dict(result_json) return meta.obj_list_to_munch(result_json)
result = None result = None
if isinstance(result_json, dict): if isinstance(result_json, dict):
@ -158,9 +158,9 @@ class ShadeAdapter(adapter.Adapter):
self._log_request_id(response, result) self._log_request_id(response, result)
if isinstance(result, list): if isinstance(result, list):
return meta.obj_list_to_dict(result) return meta.obj_list_to_munch(result)
elif isinstance(result, dict): elif isinstance(result, dict):
return meta.obj_to_dict(result) return meta.obj_to_munch(result)
return result return result
def request( def request(

10
shade/_utils.py
View File

@ -249,7 +249,7 @@ def normalize_keystone_services(services):
'enabled': service['enabled'] 'enabled': service['enabled']
} }
ret.append(new_service) ret.append(new_service)
return meta.obj_list_to_dict(ret) return meta.obj_list_to_munch(ret)
def localhost_supports_ipv6(): def localhost_supports_ipv6():
@ -277,7 +277,7 @@ def normalize_users(users):
description=user.get('description') description=user.get('description')
) for user in users ) for user in users
] ]
return meta.obj_list_to_dict(ret) return meta.obj_list_to_munch(ret)
def normalize_domains(domains): def normalize_domains(domains):
@ -289,7 +289,7 @@ def normalize_domains(domains):
enabled=domain.get('enabled'), enabled=domain.get('enabled'),
) for domain in domains ) for domain in domains
] ]
return meta.obj_list_to_dict(ret) return meta.obj_list_to_munch(ret)
def normalize_groups(domains): def normalize_groups(domains):
@ -302,7 +302,7 @@ def normalize_groups(domains):
domain_id=domain.get('domain_id'), domain_id=domain.get('domain_id'),
) for domain in domains ) for domain in domains
] ]
return meta.obj_list_to_dict(ret) return meta.obj_list_to_munch(ret)
def normalize_role_assignments(assignments): def normalize_role_assignments(assignments):
@ -363,7 +363,7 @@ def normalize_roles(roles):
name=role.get('name'), name=role.get('name'),
) for role in roles ) for role in roles
] ]
return meta.obj_list_to_dict(ret) return meta.obj_list_to_munch(ret)
def normalize_flavor_accesses(flavor_accesses): def normalize_flavor_accesses(flavor_accesses):

20
shade/meta.py
View File

@ -505,7 +505,7 @@ def _log_request_id(obj, request_id):
return obj return obj
def obj_to_dict(obj): def obj_to_munch(obj):
""" Turn an object with attributes into a dict suitable for serializing. """ Turn an object with attributes into a dict suitable for serializing.
Some of the things that are returned in OpenStack are objects with 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: if obj is None:
return None return None
elif isinstance(obj, munch.Munch) or hasattr(obj, 'mock_add_spec'): 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 # Also, don't try to modify Mock objects - that way lies madness
return obj return obj
elif isinstance(obj, dict): elif isinstance(obj, dict):
@ -545,14 +545,20 @@ def obj_to_dict(obj):
return instance 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. """Enumerate through lists of objects and return lists of dictonaries.
Some of the objects returned in OpenStack are actually lists of objects, 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 and in order to expose the data structures as JSON, we need to facilitate
the conversion to lists of dictonaries. 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): def warlock_to_dict(obj):
@ -562,7 +568,7 @@ def warlock_to_dict(obj):
# #
# glanceclient v2 uses warlock to construct its objects. Warlock does # glanceclient v2 uses warlock to construct its objects. Warlock does
# deep black magic to attribute look up to support validation things that # 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() obj_dict = munch.Munch()
for (key, value) in obj.items(): for (key, value) in obj.items():
if isinstance(value, NON_CALLABLES) and not key.startswith('_'): if isinstance(value, NON_CALLABLES) and not key.startswith('_'):
@ -578,7 +584,7 @@ def get_and_munchify(key, data):
""" """
result = data.get(key, []) result = data.get(key, [])
if isinstance(result, list): if isinstance(result, list):
return obj_list_to_dict(result) return obj_list_to_munch(result)
elif isinstance(result, dict): elif isinstance(result, dict):
return obj_to_dict(result) return obj_to_munch(result)
return result return result

4
shade/openstackcloud.py
View File

@ -2013,13 +2013,13 @@ class OpenStackCloud(
# If this doesn't work - we just let the exception propagate # If this doesn't work - we just let the exception propagate
response = self._compute_client.get('/images/detail') response = self._compute_client.get('/images/detail')
while 'next' in response: 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'] endpoint = response['next']
# Use the raw endpoint from the catalog not the one from # Use the raw endpoint from the catalog not the one from
# version discovery so that the next links will work right # version discovery so that the next links will work right
response = self._raw_image_client.get(endpoint) response = self._raw_image_client.get(endpoint)
if 'images' in response: 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: else:
image_list.extend(response) image_list.extend(response)

8
shade/task_manager.py
View File

@ -143,9 +143,9 @@ class Task(BaseTask):
return self._result return self._result
if _is_listlike(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): elif _is_objlike(self._result):
return meta.obj_to_dict(self._result) return meta.obj_to_munch(self._result)
else: else:
return self._result return self._result
@ -184,10 +184,10 @@ class RequestTask(BaseTask):
return self._result return self._result
if _is_listlike(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) self._result, request_id=self._request_id)
elif _is_objlike(self._result): 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 return self._result

2
shade/tests/fakes.py
View File

@ -214,7 +214,7 @@ def make_fake_image(
def make_fake_machine(machine_name, machine_id=None): def make_fake_machine(machine_name, machine_id=None):
if not machine_id: if not machine_id:
machine_id = uuid.uuid4().hex machine_id = uuid.uuid4().hex
return meta.obj_to_dict(FakeMachine( return meta.obj_to_munch(FakeMachine(
id=machine_id, id=machine_id,
name=machine_name)) name=machine_name))

28
shade/tests/unit/test_caching.py
View File

@ -98,7 +98,7 @@ class TestMemoryCache(base.RequestsMockTestCase):
cloud_config_fixture='clouds_cache.yaml') cloud_config_fixture='clouds_cache.yaml')
def _image_dict(self, fake_image): 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): def _munch_images(self, fake_image):
return self.cloud._normalize_images([fake_image]) return self.cloud._normalize_images([fake_image])
@ -127,18 +127,18 @@ class TestMemoryCache(base.RequestsMockTestCase):
self.assertEqual( self.assertEqual(
self.cloud._normalize_projects( 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.cloud.list_projects())
self.assertEqual( self.assertEqual(
self.cloud._normalize_projects( 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.cloud.list_projects())
# invalidate the list_projects cache # invalidate the list_projects cache
self.cloud.list_projects.invalidate(self.cloud) self.cloud.list_projects.invalidate(self.cloud)
# ensure the new values are now retrieved # ensure the new values are now retrieved
self.assertEqual( self.assertEqual(
self.cloud._normalize_projects( 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.cloud.list_projects())
self.assert_calls() self.assert_calls()
@ -163,18 +163,18 @@ class TestMemoryCache(base.RequestsMockTestCase):
self.assertEqual( self.assertEqual(
self.cloud._normalize_projects( 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.cloud.list_projects())
self.assertEqual( self.assertEqual(
self.cloud._normalize_projects( 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.cloud.list_projects())
# invalidate the list_projects cache # invalidate the list_projects cache
self.cloud.list_projects.invalidate(self.cloud) self.cloud.list_projects.invalidate(self.cloud)
# ensure the new values are now retrieved # ensure the new values are now retrieved
self.assertEqual( self.assertEqual(
self.cloud._normalize_projects( 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.cloud.list_projects())
self.assert_calls() self.assert_calls()
@ -194,10 +194,10 @@ class TestMemoryCache(base.RequestsMockTestCase):
def test_list_volumes(self): def test_list_volumes(self):
fake_volume = fakes.FakeVolume('volume1', 'available', fake_volume = fakes.FakeVolume('volume1', 'available',
'Volume 1 Display Name') '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', fake_volume2 = fakes.FakeVolume('volume2', 'available',
'Volume 2 Display Name') '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([ self.register_uris([
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -224,10 +224,10 @@ class TestMemoryCache(base.RequestsMockTestCase):
def test_list_volumes_creating_invalidates(self): def test_list_volumes_creating_invalidates(self):
fake_volume = fakes.FakeVolume('volume1', 'creating', fake_volume = fakes.FakeVolume('volume1', 'creating',
'Volume 1 Display Name') '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', fake_volume2 = fakes.FakeVolume('volume2', 'available',
'Volume 2 Display Name') '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([ self.register_uris([
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -247,12 +247,12 @@ class TestMemoryCache(base.RequestsMockTestCase):
self.assert_calls() self.assert_calls()
def test_create_volume_invalidates(self): def test_create_volume_invalidates(self):
fake_volb4 = meta.obj_to_dict( fake_volb4 = meta.obj_to_munch(
fakes.FakeVolume('volume1', 'available', '')) fakes.FakeVolume('volume1', 'available', ''))
_id = '12345' _id = '12345'
fake_vol_creating = meta.obj_to_dict( fake_vol_creating = meta.obj_to_munch(
fakes.FakeVolume(_id, 'creating', '')) fakes.FakeVolume(_id, 'creating', ''))
fake_vol_avail = meta.obj_to_dict( fake_vol_avail = meta.obj_to_munch(
fakes.FakeVolume(_id, 'available', '')) fakes.FakeVolume(_id, 'available', ''))
def now_deleting(request, context): def now_deleting(request, context):

8
shade/tests/unit/test_create_server.py
View File

@ -176,7 +176,7 @@ class TestCreateServer(base.RequestsMockTestCase):
]) ])
self.assertEqual( self.assertEqual(
self.cloud._normalize_server( self.cloud._normalize_server(
meta.obj_to_dict(fake_server)), meta.obj_to_munch(fake_server)),
self.cloud.create_server( self.cloud.create_server(
name='server-name', name='server-name',
image=dict(id='image=id'), image=dict(id='image=id'),
@ -215,7 +215,7 @@ class TestCreateServer(base.RequestsMockTestCase):
]) ])
self.assertEqual( self.assertEqual(
self.cloud._normalize_server( self.cloud._normalize_server(
meta.obj_to_dict(fake_create_server)), meta.obj_to_munch(fake_create_server)),
self.cloud.create_server( self.cloud.create_server(
name='server-name', image=dict(id='image=id'), name='server-name', image=dict(id='image=id'),
flavor=dict(id='flavor-id'), admin_pass='ooBootheiX0edoh')) flavor=dict(id='flavor-id'), admin_pass='ooBootheiX0edoh'))
@ -243,7 +243,7 @@ class TestCreateServer(base.RequestsMockTestCase):
mock_nova.servers.get.return_value = fake_server mock_nova.servers.get.return_value = fake_server
# The wait returns non-password server # The wait returns non-password server
mock_wait.return_value = self.cloud._normalize_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( server = self.cloud.create_server(
name='server-name', image=dict(id='image-id'), name='server-name', image=dict(id='image-id'),
@ -257,7 +257,7 @@ class TestCreateServer(base.RequestsMockTestCase):
self.assertEqual( self.assertEqual(
server, server,
self.cloud._normalize_server( self.cloud._normalize_server(
meta.obj_to_dict(fake_server_with_pass)) meta.obj_to_munch(fake_server_with_pass))
) )
self.assert_calls() self.assert_calls()

10
shade/tests/unit/test_create_volume_snapshot.py
View File

@ -34,10 +34,10 @@ class TestCreateVolumeSnapshot(base.RequestsMockTestCase):
volume_id = '1234' volume_id = '1234'
build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating', build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating',
'foo', 'derpysnapshot') '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', fake_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'available',
'foo', 'derpysnapshot') 'foo', 'derpysnapshot')
fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) fake_snapshot_dict = meta.obj_to_munch(fake_snapshot)
self.register_uris([ self.register_uris([
dict(method='POST', dict(method='POST',
@ -70,7 +70,7 @@ class TestCreateVolumeSnapshot(base.RequestsMockTestCase):
volume_id = '1234' volume_id = '1234'
build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating', build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating',
'foo', 'derpysnapshot') 'foo', 'derpysnapshot')
build_snapshot_dict = meta.obj_to_dict(build_snapshot) build_snapshot_dict = meta.obj_to_munch(build_snapshot)
self.register_uris([ self.register_uris([
dict(method='POST', dict(method='POST',
@ -99,10 +99,10 @@ class TestCreateVolumeSnapshot(base.RequestsMockTestCase):
volume_id = '1234' volume_id = '1234'
build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating', build_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'creating',
'bar', 'derpysnapshot') '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', error_snapshot = fakes.FakeVolumeSnapshot(snapshot_id, 'error',
'blah', 'derpysnapshot') 'blah', 'derpysnapshot')
error_snapshot_dict = meta.obj_to_dict(error_snapshot) error_snapshot_dict = meta.obj_to_munch(error_snapshot)
self.register_uris([ self.register_uris([
dict(method='POST', dict(method='POST',

6
shade/tests/unit/test_delete_volume_snapshot.py
View File

@ -32,7 +32,7 @@ class TestDeleteVolumeSnapshot(base.RequestsMockTestCase):
""" """
fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available', fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available',
'foo', 'derpysnapshot') 'foo', 'derpysnapshot')
fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) fake_snapshot_dict = meta.obj_to_munch(fake_snapshot)
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
@ -56,7 +56,7 @@ class TestDeleteVolumeSnapshot(base.RequestsMockTestCase):
""" """
fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available', fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available',
'foo', 'derpysnapshot') 'foo', 'derpysnapshot')
fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) fake_snapshot_dict = meta.obj_to_munch(fake_snapshot)
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -81,7 +81,7 @@ class TestDeleteVolumeSnapshot(base.RequestsMockTestCase):
""" """
fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available', fake_snapshot = fakes.FakeVolumeSnapshot('1234', 'available',
'foo', 'derpysnapshot') 'foo', 'derpysnapshot')
fake_snapshot_dict = meta.obj_to_dict(fake_snapshot) fake_snapshot_dict = meta.obj_to_munch(fake_snapshot)
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',

14
shade/tests/unit/test_floating_ip_common.py
View File

@ -38,7 +38,7 @@ class TestFloatingIP(base.TestCase):
server = FakeServer( server = FakeServer(
id='server-id', name='test-server', status="ACTIVE", addresses={} 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 = { floating_ip_dict = {
"id": "this-is-a-floating-ip-id", "id": "this-is-a-floating-ip-id",
"fixed_ip_address": None, "fixed_ip_address": None,
@ -64,7 +64,7 @@ class TestFloatingIP(base.TestCase):
server = FakeServer( server = FakeServer(
id='romeo', name='test-server', status="ACTIVE", addresses={} id='romeo', name='test-server', status="ACTIVE", addresses={}
) )
server_dict = meta.obj_to_dict(server) server_dict = meta.obj_to_munch(server)
pool = 'nova' pool = 'nova'
mock_nova_client.servers.get.return_value = server mock_nova_client.servers.get.return_value = server
@ -102,7 +102,7 @@ class TestFloatingIP(base.TestCase):
} }
) )
server_dict = meta.add_server_interfaces( 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) new_server = self.cloud.add_ips_to_server(server=server_dict)
mock_get_floating_ip.assert_not_called() mock_get_floating_ip.assert_not_called()
@ -143,7 +143,7 @@ class TestFloatingIP(base.TestCase):
} }
) )
server_dict = meta.add_server_interfaces( 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) new_server = self.cloud.add_ips_to_server(server=server_dict)
mock_get_floating_ip.assert_not_called() mock_get_floating_ip.assert_not_called()
@ -180,7 +180,7 @@ class TestFloatingIP(base.TestCase):
} }
) )
server_dict = meta.add_server_interfaces( 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) new_server = self.cloud.add_ips_to_server(server=server_dict)
mock_get_floating_ip.assert_not_called() mock_get_floating_ip.assert_not_called()
@ -194,7 +194,7 @@ class TestFloatingIP(base.TestCase):
server = FakeServer( server = FakeServer(
id='server-id', name='test-server', status="ACTIVE", addresses={} 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'] ips = ['203.0.113.29', '172.24.4.229']
mock_nova_client.servers.get.return_value = server mock_nova_client.servers.get.return_value = server
@ -211,7 +211,7 @@ class TestFloatingIP(base.TestCase):
server = FakeServer( server = FakeServer(
id='server-id', name='test-server', status="ACTIVE", addresses={} 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 mock_nova_client.servers.get.return_value = server
# TODO(mordred) REMOVE THIS MOCK WHEN THE NEXT PATCH LANDS # TODO(mordred) REMOVE THIS MOCK WHEN THE NEXT PATCH LANDS

2
shade/tests/unit/test_floating_ip_neutron.py
View File

@ -136,7 +136,7 @@ class TestFloatingIP(base.RequestsMockTestCase):
def setUp(self): def setUp(self):
super(TestFloatingIP, self).setUp() super(TestFloatingIP, self).setUp()
self.fake_server = meta.obj_to_dict( self.fake_server = meta.obj_to_munch(
fakes.FakeServer( fakes.FakeServer(
'server-id', '', 'ACTIVE', 'server-id', '', 'ACTIVE',
addresses={u'test_pnztt_net': [{ addresses={u'test_pnztt_net': [{

2
shade/tests/unit/test_floating_ip_nova.py
View File

@ -68,7 +68,7 @@ class TestFloatingIP(base.RequestsMockTestCase):
def setUp(self): def setUp(self):
super(TestFloatingIP, self).setUp() super(TestFloatingIP, self).setUp()
self.fake_server = meta.obj_to_dict( self.fake_server = meta.obj_to_munch(
fakes.FakeServer( fakes.FakeServer(
'server-id', '', 'ACTIVE', 'server-id', '', 'ACTIVE',
addresses={u'test_pnztt_net': [{ addresses={u'test_pnztt_net': [{

2
shade/tests/unit/test_image.py
View File

@ -301,7 +301,7 @@ class TestImage(BaseTestImage):
self.assert_calls() self.assert_calls()
def _image_dict(self, fake_image): 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): def _munch_images(self, fake_image):
return self.cloud._normalize_images([fake_image]) return self.cloud._normalize_images([fake_image])

2
shade/tests/unit/test_inventory.py
View File

@ -101,7 +101,7 @@ class TestInventory(base.TestCase):
inv = inventory.OpenStackInventory() inv = inventory.OpenStackInventory()
server = self.cloud._normalize_server( server = self.cloud._normalize_server(
meta.obj_to_dict(fakes.FakeServer( meta.obj_to_munch(fakes.FakeServer(
'1234', 'test', 'ACTIVE', addresses={}))) '1234', 'test', 'ACTIVE', addresses={})))
self.assertIsInstance(inv.clouds, list) self.assertIsInstance(inv.clouds, list)
self.assertEqual(1, len(inv.clouds)) self.assertEqual(1, len(inv.clouds))

2
shade/tests/unit/test_keypair.py
View File

@ -36,7 +36,7 @@ class TestKeypair(base.TestCase):
mock_nova.keypairs.create.assert_called_once_with( mock_nova.keypairs.create.assert_called_once_with(
name=keyname, public_key=pub_key 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') @patch.object(shade.OpenStackCloud, 'nova_client')
def test_create_keypair_exception(self, mock_nova): def test_create_keypair_exception(self, mock_nova):

72
shade/tests/unit/test_meta.py
View File

@ -267,7 +267,7 @@ class TestMeta(base.RequestsMockTestCase):
addrs, key_name='public', ext_tag='fixed', version=6)) addrs, key_name='public', ext_tag='fixed', version=6))
def test_get_server_ip(self): def test_get_server_ip(self):
srv = meta.obj_to_dict(standard_fake_server) srv = meta.obj_to_munch(standard_fake_server)
self.assertEqual( self.assertEqual(
PRIVATE_V4, meta.get_server_ip(srv, ext_tag='fixed')) PRIVATE_V4, meta.get_server_ip(srv, ext_tag='fixed'))
self.assertEqual( self.assertEqual(
@ -286,7 +286,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'subnets': SUBNETS_WITH_NAT}) 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'private': [{'OS-EXT-IPS:type': 'fixed', addresses={'private': [{'OS-EXT-IPS:type': 'fixed',
'addr': PRIVATE_V4, 'addr': PRIVATE_V4,
@ -315,7 +315,7 @@ class TestMeta(base.RequestsMockTestCase):
shared_mac = '11:22:33:44:55:66' shared_mac = '11:22:33:44:55:66'
distinct_mac = '66:55:44:33:22:11' 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'test-net': [{'OS-EXT-IPS:type': 'fixed', addresses={'test-net': [{'OS-EXT-IPS:type': 'fixed',
'OS-EXT-IPS-MAC:mac_addr': distinct_mac, 'OS-EXT-IPS-MAC:mac_addr': distinct_mac,
@ -383,7 +383,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'security_groups': []}) 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', id='test-id', name='test-name', status='ACTIVE',
flavor={u'id': u'1'}, flavor={u'id': u'1'},
image={ image={
@ -433,7 +433,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'security_groups': []}) 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', id='test-id', name='test-name', status='ACTIVE',
flavor={u'id': u'1'}, flavor={u'id': u'1'},
image={ image={
@ -483,7 +483,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'security_groups': []}) 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', id='test-id', name='test-name', status='ACTIVE',
flavor={u'id': u'1'}, flavor={u'id': u'1'},
image={ image={
@ -551,7 +551,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'security_groups': []}) 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', id='test-id', name='test-name', status='ACTIVE',
flavor={u'id': u'1'}, flavor={u'id': u'1'},
image={ image={
@ -588,7 +588,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'security_groups': []}) 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', id='test-id', name='test-name', status='ACTIVE',
flavor={u'id': u'1'}, flavor={u'id': u'1'},
image={ image={
@ -647,7 +647,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'security_groups': []}) 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', id='test-id', name='test-name', status='ACTIVE',
flavor={u'id': u'1'}, flavor={u'id': u'1'},
image={ image={
@ -690,7 +690,7 @@ class TestMeta(base.RequestsMockTestCase):
uri='https://network.example.com/v2.0/subnets.json', uri='https://network.example.com/v2.0/subnets.json',
json={'subnets': SUBNETS_WITH_NAT}) 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'test-net': [{ addresses={'test-net': [{
'addr': PUBLIC_V4, 'addr': PUBLIC_V4,
@ -717,7 +717,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'subnets': SUBNETS_WITH_NAT}) 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'test-net': [{ addresses={'test-net': [{
'addr': PUBLIC_V4, 'addr': PUBLIC_V4,
@ -744,7 +744,7 @@ class TestMeta(base.RequestsMockTestCase):
uri='https://network.example.com/v2.0/subnets.json', uri='https://network.example.com/v2.0/subnets.json',
json={'subnets': SUBNETS_WITH_NAT}) 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'test-net': [{ addresses={'test-net': [{
'addr': PRIVATE_V4, 'addr': PRIVATE_V4,
@ -772,7 +772,7 @@ class TestMeta(base.RequestsMockTestCase):
json={'subnets': SUBNETS_WITH_NAT}) 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'test-net': [{ addresses={'test-net': [{
'addr': PUBLIC_V4, 'addr': PUBLIC_V4,
@ -784,7 +784,7 @@ class TestMeta(base.RequestsMockTestCase):
self.assert_calls() self.assert_calls()
def test_get_server_external_ipv4_neutron_accessIPv4(self): 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', id='test-id', name='test-name', status='ACTIVE',
accessIPv4=PUBLIC_V4)) accessIPv4=PUBLIC_V4))
ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv) ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv)
@ -792,7 +792,7 @@ class TestMeta(base.RequestsMockTestCase):
self.assertEqual(PUBLIC_V4, ip) self.assertEqual(PUBLIC_V4, ip)
def test_get_server_external_ipv4_neutron_accessIPv6(self): 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', id='test-id', name='test-name', status='ACTIVE',
accessIPv6=PUBLIC_V6)) accessIPv6=PUBLIC_V6))
ip = meta.get_server_external_ipv6(server=srv) 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', uri='https://network.example.com/v2.0/networks.json',
status_code=404)]) 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'public': [{'addr': PUBLIC_V4, 'version': 4}]} 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 # Testing Clouds w/o Neutron and a network named public
self.cloud.cloud_config.config['has_network'] = False 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'public': [{'addr': PUBLIC_V4, 'version': 4}]})) addresses={'public': [{'addr': PUBLIC_V4, 'version': 4}]}))
ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv) 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 # Testing Clouds w/o Neutron or a globally routable IP
self.cloud.cloud_config.config['has_network'] = False 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', id='test-id', name='test-name', status='ACTIVE',
addresses={'test-net': [{'addr': PRIVATE_V4}]})) addresses={'test-net': [{'addr': PRIVATE_V4}]}))
ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv) ip = meta.get_server_external_ipv4(cloud=self.cloud, server=srv)
@ -838,7 +838,7 @@ class TestMeta(base.RequestsMockTestCase):
self.assertIsNone(ip) self.assertIsNone(ip)
def test_get_server_external_ipv6(self): 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', id='test-id', name='test-name', status='ACTIVE',
addresses={ addresses={
'test-net': [ 'test-net': [
@ -866,12 +866,12 @@ class TestMeta(base.RequestsMockTestCase):
'test-name_test-region_test-az'], 'test-name_test-region_test-az'],
meta.get_groups_from_server( meta.get_groups_from_server(
FakeCloud(), FakeCloud(),
meta.obj_to_dict(standard_fake_server), meta.obj_to_munch(standard_fake_server),
server_vars 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""" """Test conversion of a list of objects to a list of dictonaries"""
class obj0(object): class obj0(object):
value = 0 value = 0
@ -880,7 +880,7 @@ class TestMeta(base.RequestsMockTestCase):
value = 1 value = 1
list = [obj0, obj1] 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[0]['value'], 0)
self.assertEqual(new_list[1]['value'], 1) self.assertEqual(new_list[1]['value'], 1)
@ -894,7 +894,7 @@ class TestMeta(base.RequestsMockTestCase):
mock_list_server_security_groups.return_value = [ mock_list_server_security_groups.return_value = [
{'name': 'testgroup', 'id': '1'}] {'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) hostvars = meta.get_hostvars_from_server(FakeCloud(), server)
mock_list_server_security_groups.assert_called_once_with(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( hostvars = meta.get_hostvars_from_server(
FakeCloud(), self.cloud._normalize_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.assertNotIn('links', hostvars)
self.assertEqual(PRIVATE_V4, hostvars['private_v4']) self.assertEqual(PRIVATE_V4, hostvars['private_v4'])
self.assertEqual(PUBLIC_V4, hostvars['public_v4']) self.assertEqual(PUBLIC_V4, hostvars['public_v4'])
@ -946,7 +946,7 @@ class TestMeta(base.RequestsMockTestCase):
fake_cloud = FakeCloud() fake_cloud = FakeCloud()
fake_cloud.force_ipv4 = True fake_cloud.force_ipv4 = True
hostvars = meta.get_hostvars_from_server( 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']) self.assertEqual(PUBLIC_V4, hostvars['interface_ip'])
@mock.patch.object(shade.meta, 'get_server_external_ipv4') @mock.patch.object(shade.meta, 'get_server_external_ipv4')
@ -956,7 +956,7 @@ class TestMeta(base.RequestsMockTestCase):
cloud = FakeCloud() cloud = FakeCloud()
cloud.private = True cloud.private = True
hostvars = meta.get_hostvars_from_server( 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']) self.assertEqual(PRIVATE_V4, hostvars['interface_ip'])
@mock.patch.object(shade.meta, 'get_server_external_ipv4') @mock.patch.object(shade.meta, 'get_server_external_ipv4')
@ -966,14 +966,14 @@ class TestMeta(base.RequestsMockTestCase):
server = standard_fake_server server = standard_fake_server
server.image = 'fake-image-id' server.image = 'fake-image-id'
hostvars = meta.get_hostvars_from_server( 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']) self.assertEqual('fake-image-id', hostvars['image']['id'])
def test_az(self): def test_az(self):
server = standard_fake_server server = standard_fake_server
server.__dict__['OS-EXT-AZ:availability_zone'] = 'az1' 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']) self.assertEqual('az1', hostvars['az'])
def test_current_location(self): def test_current_location(self):
@ -1005,10 +1005,10 @@ class TestMeta(base.RequestsMockTestCase):
status='available', status='available',
name='Volume 1 Display Name', name='Volume 1 Display Name',
attachments=[{'device': '/dev/sda0'}]) 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] mock_cloud.get_volumes.return_value = [fake_volume_dict]
hostvars = meta.get_hostvars_from_server( 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('volume1', hostvars['volumes'][0]['id'])
self.assertEqual('/dev/sda0', hostvars['volumes'][0]['device']) self.assertEqual('/dev/sda0', hostvars['volumes'][0]['device'])
@ -1016,7 +1016,7 @@ class TestMeta(base.RequestsMockTestCase):
fake_cloud = FakeCloud() fake_cloud = FakeCloud()
fake_cloud.service_val = False fake_cloud.service_val = False
hostvars = meta.get_hostvars_from_server( 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']) self.assertEqual([], hostvars['volumes'])
def test_unknown_volume_exception(self): def test_unknown_volume_exception(self):
@ -1032,12 +1032,12 @@ class TestMeta(base.RequestsMockTestCase):
FakeException, FakeException,
meta.get_hostvars_from_server, meta.get_hostvars_from_server,
mock_cloud, 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 = FakeCloud()
cloud.server = standard_fake_server 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.assertEqual(FakeCloud.name, cloud_dict['name'])
self.assertNotIn('_unused', cloud_dict) self.assertNotIn('_unused', cloud_dict)
self.assertNotIn('get_flavor_name', cloud_dict) self.assertNotIn('get_flavor_name', cloud_dict)
@ -1045,11 +1045,11 @@ class TestMeta(base.RequestsMockTestCase):
self.assertTrue(hasattr(cloud_dict, 'name')) self.assertTrue(hasattr(cloud_dict, 'name'))
self.assertEqual(cloud_dict.name, 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): class FakeObjDict(dict):
additional = 1 additional = 1
obj = FakeObjDict(foo='bar') 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('additional', obj_dict)
self.assertIn('foo', obj_dict) self.assertIn('foo', obj_dict)
self.assertEqual(obj_dict['additional'], 1) self.assertEqual(obj_dict['additional'], 1)

8
shade/tests/unit/test_rebuild_server.py
View File

@ -92,7 +92,7 @@ class TestRebuildServer(base.RequestsMockTestCase):
""" """
rebuild_server = fakes.FakeServer('1234', '', 'REBUILD') rebuild_server = fakes.FakeServer('1234', '', 'REBUILD')
mock_nova.servers.rebuild.return_value = rebuild_server 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")) self.cloud.rebuild_server("a", "b"))
@mock.patch.object(OpenStackCloud, 'nova_client') @mock.patch.object(OpenStackCloud, 'nova_client')
@ -104,7 +104,7 @@ class TestRebuildServer(base.RequestsMockTestCase):
adminPass='ooBootheiX0edoh') adminPass='ooBootheiX0edoh')
mock_nova.servers.rebuild.return_value = rebuild_server mock_nova.servers.rebuild.return_value = rebuild_server
self.assertEqual( self.assertEqual(
meta.obj_to_dict(rebuild_server), meta.obj_to_munch(rebuild_server),
self.cloud.rebuild_server( self.cloud.rebuild_server(
'a', 'b', admin_pass='ooBootheiX0edoh')) 'a', 'b', admin_pass='ooBootheiX0edoh'))
@ -141,7 +141,7 @@ class TestRebuildServer(base.RequestsMockTestCase):
self.cloud.name = 'cloud-name' self.cloud.name = 'cloud-name'
self.assertEqual( self.assertEqual(
self.cloud._normalize_server( self.cloud._normalize_server(
meta.obj_to_dict(ret_active_server)), meta.obj_to_munch(ret_active_server)),
self.cloud.rebuild_server( self.cloud.rebuild_server(
"1234", "b", wait=True, admin_pass='ooBootheiX0edoh')) "1234", "b", wait=True, admin_pass='ooBootheiX0edoh'))
# TODO(slaweq): change do_count to True when all nova mocks will be # 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.cloud.name = 'cloud-name'
self.assertEqual( self.assertEqual(
self.cloud._normalize_server( self.cloud._normalize_server(
meta.obj_to_dict(active_server)), meta.obj_to_munch(active_server)),
self.cloud.rebuild_server("1234", "b", wait=True)) self.cloud.rebuild_server("1234", "b", wait=True))
# TODO(slaweq): change do_count to True when all nova mocks will be # TODO(slaweq): change do_count to True when all nova mocks will be
# replaced with request_mocks also # replaced with request_mocks also

30
shade/tests/unit/test_security_groups.py
View File

@ -20,7 +20,7 @@ from shade.tests import fakes
# TODO(mordred): Make a fakes.make_fake_nova_security_group and a # TODO(mordred): Make a fakes.make_fake_nova_security_group and a
# fakes.make_fake_nova_security_group and remove all uses of # 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. # move those to using a getUniqueString() value.
neutron_grp_obj = fakes.FakeSecgroup( 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 # Neutron returns dicts instead of objects, so the dict versions should
# be used as expected return values from neutron API methods. # be used as expected return values from neutron API methods.
neutron_grp_dict = meta.obj_to_dict(neutron_grp_obj) neutron_grp_dict = meta.obj_to_munch(neutron_grp_obj)
nova_grp_dict = meta.obj_to_dict(nova_grp_obj) nova_grp_dict = meta.obj_to_munch(nova_grp_obj)
class TestSecurityGroups(base.RequestsMockTestCase): class TestSecurityGroups(base.RequestsMockTestCase):
@ -163,7 +163,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
self.cloud.secgroup_source = 'neutron' self.cloud.secgroup_source = 'neutron'
group_name = self.getUniqueString() group_name = self.getUniqueString()
group_desc = 'security group from test_create_security_group_neutron' group_desc = 'security group from test_create_security_group_neutron'
new_group = meta.obj_to_dict( new_group = meta.obj_to_munch(
fakes.FakeSecgroup( fakes.FakeSecgroup(
id='2', id='2',
name=group_name, name=group_name,
@ -194,7 +194,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
group_name = self.getUniqueString() group_name = self.getUniqueString()
group_desc = 'security group from' \ group_desc = 'security group from' \
' test_create_security_group_neutron_specific_tenant' ' test_create_security_group_neutron_specific_tenant'
new_group = meta.obj_to_dict( new_group = meta.obj_to_munch(
fakes.FakeSecgroup( fakes.FakeSecgroup(
id='2', id='2',
name=group_name, name=group_name,
@ -230,7 +230,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
group_name = self.getUniqueString() group_name = self.getUniqueString()
self.has_neutron = False self.has_neutron = False
group_desc = 'security group from test_create_security_group_neutron' group_desc = 'security group from test_create_security_group_neutron'
new_group = meta.obj_to_dict( new_group = meta.obj_to_munch(
fakes.FakeSecgroup( fakes.FakeSecgroup(
id='2', id='2',
name=group_name, name=group_name,
@ -266,7 +266,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
self.cloud.secgroup_source = 'neutron' self.cloud.secgroup_source = 'neutron'
new_name = self.getUniqueString() new_name = self.getUniqueString()
sg_id = neutron_grp_obj.id 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 update_return['name'] = new_name
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
@ -291,7 +291,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
new_name = self.getUniqueString() new_name = self.getUniqueString()
self.cloud.secgroup_source = 'nova' self.cloud.secgroup_source = 'nova'
nova_return = [nova_grp_dict] 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 update_return['name'] = new_name
self.register_uris([ self.register_uris([
@ -408,7 +408,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
nova_return = [nova_grp_dict] 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', id='xyz', from_port=1, to_port=2000, ip_protocol='tcp',
cidr='1.2.3.4/32')) cidr='1.2.3.4/32'))
@ -448,7 +448,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
nova_return = [nova_grp_dict] 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', id='xyz', from_port=1, to_port=65535, ip_protocol='tcp',
cidr='1.2.3.4/32')) cidr='1.2.3.4/32'))
@ -627,7 +627,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
uri=self.get_mock_url( uri=self.get_mock_url(
'compute', 'public', 'compute', 'public',
append=['servers', 'detail']), append=['servers', 'detail']),
json={'servers': [meta.obj_to_dict(fake_server)]}), json={'servers': [meta.obj_to_munch(fake_server)]}),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'network', 'public', 'network', 'public',
@ -680,7 +680,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
uri=self.get_mock_url( uri=self.get_mock_url(
'compute', 'public', 'compute', 'public',
append=['servers', 'detail']), append=['servers', 'detail']),
json={'servers': [meta.obj_to_dict(fake_server)]}), json={'servers': [meta.obj_to_munch(fake_server)]}),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'network', 'public', 'network', 'public',
@ -697,7 +697,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
def test_add_bad_security_group_to_server_nova(self): def test_add_bad_security_group_to_server_nova(self):
# fake to get server by name, server-name must match # 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')) fakes.FakeServer('1234', 'server-name', 'ACTIVE'))
# use nova for secgroup list and return an existing fake # use nova for secgroup list and return an existing fake
@ -734,7 +734,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
uri=self.get_mock_url( uri=self.get_mock_url(
'compute', 'public', 'compute', 'public',
append=['servers', 'detail']), append=['servers', 'detail']),
json={'servers': [meta.obj_to_dict(fake_server)]}), json={'servers': [meta.obj_to_munch(fake_server)]}),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'network', 'public', 'network', 'public',
@ -747,7 +747,7 @@ class TestSecurityGroups(base.RequestsMockTestCase):
def test_add_security_group_to_bad_server(self): def test_add_security_group_to_bad_server(self):
# fake to get server by name, server-name must match # 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')) fakes.FakeServer('1234', 'server-name', 'ACTIVE'))
self.register_uris([ self.register_uris([

4
shade/tests/unit/test_shade_operator.py
View File

@ -87,7 +87,7 @@ class TestShadeOperator(base.RequestsMockTestCase):
mock_client.node.list.return_value = [m1] mock_client.node.list.return_value = [m1]
machines = self.op_cloud.list_machines() machines = self.op_cloud.list_machines()
self.assertTrue(mock_client.node.list.called) 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') @mock.patch.object(shade.OperatorCloud, 'ironic_client')
def test_validate_node(self, mock_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") port1 = fakes.FakeMachinePort(1, "aa:bb:cc:dd", "node1")
port2 = fakes.FakeMachinePort(2, "dd:cc:bb:aa", "node2") port2 = fakes.FakeMachinePort(2, "dd:cc:bb:aa", "node2")
port_list = [port1, port2] 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 mock_client.port.list.return_value = port_list
nics = self.op_cloud.list_nics() nics = self.op_cloud.list_nics()

4
shade/tests/unit/test_stack.py
View File

@ -74,7 +74,7 @@ class TestStack(base.RequestsMockTestCase):
]) ])
stacks = self.cloud.search_stacks() stacks = self.cloud.search_stacks()
self.assertEqual( 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) stacks)
self.assert_calls() self.assert_calls()
@ -96,7 +96,7 @@ class TestStack(base.RequestsMockTestCase):
stacks = self.cloud.search_stacks(filters=filters) stacks = self.cloud.search_stacks(filters=filters)
self.assertEqual( self.assertEqual(
self.cloud._normalize_stacks( self.cloud._normalize_stacks(
meta.obj_list_to_dict(fake_stacks[1:])), meta.obj_list_to_munch(fake_stacks[1:])),
stacks) stacks)
self.assert_calls() self.assert_calls()

28
shade/tests/unit/test_volume.py
View File

@ -25,7 +25,7 @@ class TestVolume(base.RequestsMockTestCase):
server = dict(id='server001') server = dict(id='server001')
vol = {'id': 'volume001', 'status': 'available', vol = {'id': 'volume001', 'status': 'available',
'name': '', 'attachments': []} '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', rattach = {'server_id': server['id'], 'device': 'device001',
'volumeId': volume['id'], 'id': 'attachmentId'} 'volumeId': volume['id'], 'id': 'attachmentId'}
self.register_uris([ self.register_uris([
@ -47,7 +47,7 @@ class TestVolume(base.RequestsMockTestCase):
server = dict(id='server001') server = dict(id='server001')
vol = {'id': 'volume001', 'status': 'available', vol = {'id': 'volume001', 'status': 'available',
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
dict(method='POST', dict(method='POST',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -71,11 +71,11 @@ class TestVolume(base.RequestsMockTestCase):
server = dict(id='server001') server = dict(id='server001')
vol = {'id': 'volume001', 'status': 'available', vol = {'id': 'volume001', 'status': 'available',
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
vol['attachments'] = [{'server_id': server['id'], vol['attachments'] = [{'server_id': server['id'],
'device': 'device001'}] 'device': 'device001'}]
vol['status'] = 'attached' 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', rattach = {'server_id': server['id'], 'device': 'device001',
'volumeId': volume['id'], 'id': 'attachmentId'} 'volumeId': volume['id'], 'id': 'attachmentId'}
self.register_uris([ self.register_uris([
@ -105,9 +105,9 @@ class TestVolume(base.RequestsMockTestCase):
server = dict(id='server001') server = dict(id='server001')
vol = {'id': 'volume001', 'status': 'available', vol = {'id': 'volume001', 'status': 'available',
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
vol['status'] = 'error' 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', rattach = {'server_id': server['id'], 'device': 'device001',
'volumeId': volume['id'], 'id': 'attachmentId'} 'volumeId': volume['id'], 'id': 'attachmentId'}
self.register_uris([ self.register_uris([
@ -201,10 +201,10 @@ class TestVolume(base.RequestsMockTestCase):
attachments = [{'server_id': 'server001', 'device': 'device001'}] attachments = [{'server_id': 'server001', 'device': 'device001'}]
vol = {'id': 'volume001', 'status': 'attached', 'name': '', vol = {'id': 'volume001', 'status': 'attached', 'name': '',
'attachments': attachments} 'attachments': attachments}
volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
vol['status'] = 'available' vol['status'] = 'available'
vol['attachments'] = [] vol['attachments'] = []
avail_volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) avail_volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
dict(method='DELETE', dict(method='DELETE',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -223,10 +223,10 @@ class TestVolume(base.RequestsMockTestCase):
attachments = [{'server_id': 'server001', 'device': 'device001'}] attachments = [{'server_id': 'server001', 'device': 'device001'}]
vol = {'id': 'volume001', 'status': 'attached', 'name': '', vol = {'id': 'volume001', 'status': 'attached', 'name': '',
'attachments': attachments} 'attachments': attachments}
volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
vol['status'] = 'error' vol['status'] = 'error'
vol['attachments'] = [] vol['attachments'] = []
errored_volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) errored_volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
dict(method='DELETE', dict(method='DELETE',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -247,7 +247,7 @@ class TestVolume(base.RequestsMockTestCase):
def test_delete_volume_deletes(self): def test_delete_volume_deletes(self):
vol = {'id': 'volume001', 'status': 'attached', vol = {'id': 'volume001', 'status': 'attached',
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -266,7 +266,7 @@ class TestVolume(base.RequestsMockTestCase):
def test_delete_volume_gone_away(self): def test_delete_volume_gone_away(self):
vol = {'id': 'volume001', 'status': 'attached', vol = {'id': 'volume001', 'status': 'attached',
'name': '', 'attachments': []} 'name': '', 'attachments': []}
volume = meta.obj_to_dict(fakes.FakeVolume(**vol)) volume = meta.obj_to_munch(fakes.FakeVolume(**vol))
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
@ -280,8 +280,8 @@ class TestVolume(base.RequestsMockTestCase):
self.assert_calls() self.assert_calls()
def test_list_volumes_with_pagination(self): def test_list_volumes_with_pagination(self):
vol1 = meta.obj_to_dict(fakes.FakeVolume('01', 'available', 'vol1')) vol1 = meta.obj_to_munch(fakes.FakeVolume('01', 'available', 'vol1'))
vol2 = meta.obj_to_dict(fakes.FakeVolume('02', 'available', 'vol2')) vol2 = meta.obj_to_munch(fakes.FakeVolume('02', 'available', 'vol2'))
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(

8
shade/tests/unit/test_volume_backups.py
View File

@ -28,7 +28,7 @@ class TestVolumeBackups(base.RequestsMockTestCase):
name, {'availability_zone': 'az1'}) name, {'availability_zone': 'az1'})
self.assertEqual(len(result), 2) self.assertEqual(len(result), 2)
self.assertEqual( self.assertEqual(
meta.obj_list_to_dict([vol1, vol2]), meta.obj_list_to_munch([vol1, vol2]),
result) result)
self.assert_calls() self.assert_calls()
@ -44,9 +44,9 @@ class TestVolumeBackups(base.RequestsMockTestCase):
json={"backups": [vol1, vol2, vol3]})]) json={"backups": [vol1, vol2, vol3]})])
result = self.cloud.get_volume_backup( result = self.cloud.get_volume_backup(
name, {'availability_zone': 'az1'}) name, {'availability_zone': 'az1'})
result = meta.obj_to_dict(result) result = meta.obj_to_munch(result)
self.assertEqual( self.assertEqual(
meta.obj_to_dict(vol1), meta.obj_to_munch(vol1),
result) result)
self.assert_calls() self.assert_calls()
@ -63,7 +63,7 @@ class TestVolumeBackups(base.RequestsMockTestCase):
result = self.cloud.list_volume_backups(True, search_opts) result = self.cloud.list_volume_backups(True, search_opts)
self.assertEqual(len(result), 1) self.assertEqual(len(result), 1)
self.assertEqual( self.assertEqual(
meta.obj_list_to_dict([backup]), meta.obj_list_to_munch([backup]),
result) result)
self.assert_calls() self.assert_calls()