openstack/shade
Code Issues Proposed changes

Merge "Strip out novaclient extra attributes"

Browse Source
This commit is contained in:
Jenkins 2017-03-25 17:13:50 +00:00 committed by Gerrit Code Review
commit 9053a2e5d1
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shade/openstackcloud.py
View File

@ -1960,7 +1960,9 @@ class OpenStackCloud(_normalize.Normalizer):
'Floating IP pools extension is not available on target cloud')
with _utils.shade_exceptions("Error fetching floating IP pool list"):
return self.manager.submit_task(_tasks.FloatingIPPoolList())
return [
{'name': p['name']} for p in self.manager.submit_task(
_tasks.FloatingIPPoolList())]
def _list_floating_ips(self, filters=None):
if self._use_neutron_floating():

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

@ -25,13 +25,7 @@ from shade.tests import fakes
class TestFloatingIPPool(base.RequestsMockTestCase):
mock_pools = [{
'NAME_ATTR': 'name',
'name': u'public',
'x_openstack_request_ids': [],
'request_ids': [],
'HUMAN_ID': False,
'human_id': None}]
pools = [{'name': u'public'}]
def test_list_floating_ip_pools(self):
@ -55,7 +49,7 @@ class TestFloatingIPPool(base.RequestsMockTestCase):
floating_ip_pools = self.cloud.list_floating_ip_pools()
self.assertItemsEqual(floating_ip_pools, self.mock_pools)
self.assertItemsEqual(floating_ip_pools, self.pools)
self.assert_calls()