openstack
/
horizon
Code Issues Proposed changes

Merge "api.neutron: Explicit member of FloatingIpTarget class"

This commit is contained in:
Jenkins 2017-06-14 12:10:03 +00:00 committed by Gerrit Code Review
parent 359467b401 cabdbcccb3
commit 829a961d73
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
openstack_dashboard/api/neutron.py
View File

@ -426,7 +426,23 @@ class FloatingIpPool(base.APIDictWrapper):
class FloatingIpTarget(base.APIDictWrapper):
pass
"""Representation of floating IP association target.
The following parameter needs to be passed when instantiating the class:
:param port: ``Port`` object which represents a neutron port.
:param ip_address: IP address of the ``port``. It must be one of
IP address of a given port.
:param label: String displayed in the floating IP association form.
IP address will be appended to a specified label.
"""
def __init__(self, port, ip_address, label):
target = {'name': '%s: %s' % (label, ip_address),
'id': '%s_%s' % (port.id, ip_address),
'port_id': port.id,
'instance_id': port.device_id}
super(FloatingIpTarget, self).__init__(target)
class FloatingIpManager(object):
@ -611,17 +627,13 @@ class FloatingIpManager(object):
# Remove network ports from Floating IP targets
if p.device_owner.startswith('network:'):
continue
port_id = p.id
server_name = server_dict.get(p.device_id)
for ip in p.fixed_ips:
if ip['subnet_id'] not in reachable_subnets:
continue
target = {'name': '%s: %s' % (server_name, ip['ip_address']),
'id': '%s_%s' % (port_id, ip['ip_address']),
'port_id': port_id,
'instance_id': p.device_id}
targets.append(FloatingIpTarget(target))
targets.append(FloatingIpTarget(p, ip['ip_address'],
server_name))
return targets
def _target_ports_by_instance(self, instance_id):

8
openstack_dashboard/dashboards/project/floating_ips/tests.py
View File

@ -88,12 +88,8 @@ class FloatingIpViewTests(test.TestCase):
targets = []
for p in self._get_compute_ports():
for ip in p.fixed_ips:
p_data = {'name': '%s: %s' % (server_dict[p.device_id],
ip['ip_address']),
'id': '%s_%s' % (p.id, ip['ip_address']),
'port_id': p.id,
'instance_id': p.device_id}
targets.append(api.neutron.FloatingIpTarget(p_data))
targets.append(api.neutron.FloatingIpTarget(
p, ip['ip_address'], server_dict[p.device_id]))
return targets
@staticmethod