diff options
| author | Zuul <zuul@review.openstack.org> | 2018-09-17 10:57:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-09-17 10:57:54 +0000 |
| commit | 8bd810d8f80c5cf76917b0549244ad15f5866144 (patch) | |
| tree | 6c3fa19141be40fde4a2e39a599ee2e2fcfe3f69 /openstackclient/network | |
| parent | 39d41f356c7d1c27fcac16c92a68af5b178b71b1 (diff) | |
| parent | 3012ab4bb8db0a6ea7a0cace6f1d2e2e3685b903 (diff) | |
| download | python-openstackclient-8bd810d8f80c5cf76917b0549244ad15f5866144.tar.gz | |
Merge "Do not require port argument when updating floating IP" into stable/queens
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/v2/floating_ip.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py index 181f88c0..b2b86192 100644 --- a/openstackclient/network/v2/floating_ip.py +++ b/openstackclient/network/v2/floating_ip.py @@ -458,12 +458,11 @@ class SetFloatingIP(command.Command): parser.add_argument( 'floating_ip', metavar='<floating-ip>', - help=_("Floating IP to associate (IP address or ID)")) + help=_("Floating IP to modify (IP address or ID)")) parser.add_argument( '--port', metavar='<port>', - required=True, - help=_("Assocaite the floating IP with port (name or ID)")), + help=_("Associate the floating IP with port (name or ID)")), parser.add_argument( '--fixed-ip-address', metavar='<ip-address>', @@ -493,9 +492,11 @@ class SetFloatingIP(command.Command): parsed_args.floating_ip, ignore_missing=False, ) - port = client.find_port(parsed_args.port, - ignore_missing=False) - attrs['port_id'] = port.id + if parsed_args.port: + port = client.find_port(parsed_args.port, + ignore_missing=False) + attrs['port_id'] = port.id + if parsed_args.fixed_ip_address: attrs['fixed_ip_address'] = parsed_args.fixed_ip_address |