openstack/python-openstackclient
Code Issues Proposed changes

Transfer "ip fixed add/remove" to "server add/remove fixed ip"

Browse Source 
This patch does the following things to transfer
"ip fixed add/remove" to "server add/remove fixed ip":
* Add new command "server add/remove fixed ip", and unit
  tests and doc.
* Deprecate "ip fixed add/remove" command.

compute/v2/fixedip.py is not removed because the arguments'
positions are different between the new and old commands.
* ip fixed add <network> <server>
  server add fixed ip <server> <network>
* ip fixed remove <ip-address> <server>
  server remove fixed ip <server> <ip-address>

Change-Id: Ica07ccf92a76c21fd5608ecaff86ff7c4d96f5a0
Implements: blueprint rework-ip-commands
Partial-bug: 1555990
Co-Authored-By: Dean Troyer <dtroyer@gmail.com>
This commit is contained in:
Tang Chen
2016-04-07 14:30:06 +08:00
parent d1f9ea3f75
commit 179ebe6d64
8 changed files with 208 additions and 4 deletions
doc/source
command-objects
ip-fixed.rstserver.rst
commands.rst
openstackclient
compute
v2
fixedip.pyserver.py
tests
compute
v2
test_server.py
releasenotes/notes
ip-command-rework-8d3fe0858f51e6b8.yaml
setup.cfg

34
openstackclient/compute/v2/fixedip.py

@ -15,28 +15,43 @@
"""Fixed IP action implementations"""
import logging
from osc_lib.command import command
from osc_lib import utils
from openstackclient.i18n import _
class AddFixedIP(command.Command):
"""Add fixed IP address to server"""
# TODO(tangchen): Remove this class and ``ip fixed add`` command
# two cycles after Mitaka.
# This notifies cliff to not display the help for this command
deprecated = True
log = logging.getLogger('deprecated')
def get_parser(self, prog_name):
parser = super(AddFixedIP, self).get_parser(prog_name)
parser.add_argument(
"network",
metavar="<network>",
help="Network to fetch an IP address from (name or ID)",
help=_("Network to fetch an IP address from (name or ID)"),
)
parser.add_argument(
"server",
metavar="<server>",
help="Server to receive the IP address (name or ID)",
help=_("Server to receive the IP address (name or ID)"),
)
return parser
def take_action(self, parsed_args):
self.log.warning(_('This command has been deprecated. '
'Please use "server add fixed ip" instead.'))
compute_client = self.app.client_manager.compute
network = utils.find_resource(
@ -51,21 +66,32 @@ class AddFixedIP(command.Command):
class RemoveFixedIP(command.Command):
"""Remove fixed IP address from server"""
# TODO(tangchen): Remove this class and ``ip fixed remove`` command
# two cycles after Mitaka.
# This notifies cliff to not display the help for this command
deprecated = True
log = logging.getLogger('deprecated')
def get_parser(self, prog_name):
parser = super(RemoveFixedIP, self).get_parser(prog_name)
parser.add_argument(
"ip_address",
metavar="<ip-address>",
help="IP address to remove from server (name only)",
help=_("IP address to remove from server (name only)"),
)
parser.add_argument(
"server",
metavar="<server>",
help="Server to remove the IP address from (name or ID)",
help=_("Server to remove the IP address from (name or ID)"),
)
return parser
def take_action(self, parsed_args):
self.log.warning(_('This command has been deprecated. '
'Please use "server remove fixed ip" instead.'))
compute_client = self.app.client_manager.compute
server = utils.find_resource(