openstack/horizon
Code Issues Proposed changes

Merge "Small cleanup of FIP code in api/neutron.py"

Browse Source
This commit is contained in:
Zuul 2022-07-06 19:09:21 +00:00 committed by Gerrit Code Review
commit 5de967fe2a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/api/neutron.py
View File

@ -532,10 +532,10 @@ class FloatingIpTarget(base.APIDictWrapper):
:param ip_address: IP address of the ``port``. It must be one of :param ip_address: IP address of the ``port``. It must be one of
IP address of a given port. IP address of a given port.
:param label: String displayed in the floating IP association form. :param label: String displayed in the floating IP association form.
IP address will be appended to a specified label. IP address will be appended to a specified label. (Optional)
""" """
def __init__(self, port, ip_address, label): def __init__(self, port, ip_address, label=None):
name = '%s: %s' % (label, ip_address) if label else ip_address name = '%s: %s' % (label, ip_address) if label else ip_address
target = {'name': name, target = {'name': name,
'id': '%s_%s' % (port.id, ip_address), 'id': '%s_%s' % (port.id, ip_address),
@ -670,8 +670,7 @@ class FloatingIpManager(object):
``port_id`` represents a VNIC of an instance. ``port_id`` represents a VNIC of an instance.
``port_id`` argument is different from a normal neutron port ID. ``port_id`` argument is different from a normal neutron port ID.
A value passed as ``port_id`` must be one of target_id returned by A value passed as ``port_id`` must be one of target_id returned by
``list_targets``, ``get_target_by_instance`` or ``list_targets`` or ``list_targets_by_instance`` method.
``list_targets_by_instance`` method.
""" """
# NOTE: In Neutron Horizon floating IP support, port_id is # NOTE: In Neutron Horizon floating IP support, port_id is
# "<port_id>_<ip_address>" format to identify multiple ports. # "<port_id>_<ip_address>" format to identify multiple ports.