openstack/shade
Code Issues Proposed changes

Merge "Make available_floating_ips use normalized keys"

Browse Source
This commit is contained in:
Jenkins
2016-12-13 23:54:04 +00:00
committed by Gerrit Code Review
parent fd929a5d89 ec2d0c20d1
commit cbe92ffe79
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
shade/openstackcloud.py
View File

@@ -4048,9 +4048,9 @@ class OpenStackCloud(_normalize.Normalizer):
floating_network_id = self._get_floating_network_id()
filters = {
'port_id': None,
'floating_network_id': floating_network_id,
'tenant_id': project_id
'port': None,
'network': floating_network_id,
'location': {'project': {'id': project_id}},
}
floating_ips = self._list_floating_ips()

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

@@ -328,9 +328,9 @@ class TestFloatingIP(base.TestCase):
mock__neutron_list_fips.assert_called_once_with(None)
mock__filter_list.assert_called_once_with(
[], name_or_id=None,
filters={'port_id': None,
'floating_network_id': self.mock_get_network_rep['id'],
'tenant_id': 'proj-id'}
filters={'port': None,
'network': self.mock_get_network_rep['id'],
'location': {'project': {'id': 'proj-id'}}}
)
mock__neutron_create_fip.assert_called_once_with(
network_id=self.mock_get_network_rep['id'],
@@ -366,9 +366,9 @@ class TestFloatingIP(base.TestCase):
mock__neutron_list_fips.assert_called_once_with(None)
mock__filter_list.assert_called_once_with(
[], name_or_id=None,
filters={'port_id': None,
'floating_network_id': self.mock_get_network_rep['id'],
'tenant_id': 'proj-id'}
filters={'port': None,
'network': self.mock_get_network_rep['id'],
'location': {'project': {'id': 'proj-id'}}}
)
mock__neutron_create_fip.assert_called_once_with(
network_id=self.mock_get_network_rep['id'],