Skip to content

Commit a7973d9

Browse files
Zuulopenstack-gerrit
Zuul
authored and
openstack-gerrit
committed
Merge "Remove deprecated ip floating commands"
2 parents e80f951 + ea89065 commit a7973d9

6 files changed

Lines changed: 4 additions & 275 deletions

File tree

‎doc/source/cli/command-objects/ip-floating-pool.rst‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎doc/source/cli/command-objects/ip-floating.rst‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎openstackclient/network/v2/floating_ip.py‎

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
"""IP Floating action implementations"""
1515

16-
import logging
17-
1816
from osc_lib.command import command
1917
from osc_lib import utils
2018

@@ -159,30 +157,6 @@ def take_action_compute(self, client, parsed_args):
159157
return (columns, data)
160158

161159

162-
class CreateIPFloating(CreateFloatingIP):
163-
_description = _("Create floating IP")
164-
165-
# TODO(tangchen): Remove this class and ``ip floating create`` command
166-
# two cycles after Mitaka.
167-
168-
# This notifies cliff to not display the help for this command
169-
deprecated = True
170-
171-
log = logging.getLogger('deprecated')
172-
173-
def take_action_network(self, client, parsed_args):
174-
self.log.warning(_('This command has been deprecated. '
175-
'Please use "floating ip create" instead.'))
176-
return super(CreateIPFloating, self).take_action_network(
177-
client, parsed_args)
178-
179-
def take_action_compute(self, client, parsed_args):
180-
self.log.warning(_('This command has been deprecated. '
181-
'Please use "floating ip create" instead.'))
182-
return super(CreateIPFloating, self).take_action_compute(
183-
client, parsed_args)
184-
185-
186160
class DeleteFloatingIP(common.NetworkAndComputeDelete):
187161
_description = _("Delete floating IP(s)")
188162

@@ -210,30 +184,6 @@ def take_action_compute(self, client, parsed_args):
210184
client.api.floating_ip_delete(self.r)
211185

212186

213-
class DeleteIPFloating(DeleteFloatingIP):
214-
_description = _("Delete floating IP(s)")
215-
216-
# TODO(tangchen): Remove this class and ``ip floating delete`` command
217-
# two cycles after Mitaka.
218-
219-
# This notifies cliff to not display the help for this command
220-
deprecated = True
221-
222-
log = logging.getLogger('deprecated')
223-
224-
def take_action_network(self, client, parsed_args):
225-
self.log.warning(_('This command has been deprecated. '
226-
'Please use "floating ip delete" instead.'))
227-
return super(DeleteIPFloating, self).take_action_network(
228-
client, parsed_args)
229-
230-
def take_action_compute(self, client, parsed_args):
231-
self.log.warning(_('This command has been deprecated. '
232-
'Please use "floating ip delete" instead.'))
233-
return super(DeleteIPFloating, self).take_action_compute(
234-
client, parsed_args)
235-
236-
237187
class ListFloatingIP(common.NetworkAndComputeLister):
238188
# TODO(songminglong): Use SDK resource mapped attribute names once
239189
# the OSC minimum requirements include SDK 1.0
@@ -384,30 +334,6 @@ def take_action_compute(self, client, parsed_args):
384334
) for s in data))
385335

386336

387-
class ListIPFloating(ListFloatingIP):
388-
_description = _("List floating IP(s)")
389-
390-
# TODO(tangchen): Remove this class and ``ip floating list`` command
391-
# two cycles after Mitaka.
392-
393-
# This notifies cliff to not display the help for this command
394-
deprecated = True
395-
396-
log = logging.getLogger('deprecated')
397-
398-
def take_action_network(self, client, parsed_args):
399-
self.log.warning(_('This command has been deprecated. '
400-
'Please use "floating ip list" instead.'))
401-
return super(ListIPFloating, self).take_action_network(
402-
client, parsed_args)
403-
404-
def take_action_compute(self, client, parsed_args):
405-
self.log.warning(_('This command has been deprecated. '
406-
'Please use "floating ip list" instead.'))
407-
return super(ListIPFloating, self).take_action_compute(
408-
client, parsed_args)
409-
410-
411337
class SetFloatingIP(command.Command):
412338
_description = _("Set floating IP Properties")
413339

@@ -499,30 +425,6 @@ def take_action_compute(self, client, parsed_args):
499425
return (columns, data)
500426

501427

502-
class ShowIPFloating(ShowFloatingIP):
503-
_description = _("Display floating IP details")
504-
505-
# TODO(tangchen): Remove this class and ``ip floating show`` command
506-
# two cycles after Mitaka.
507-
508-
# This notifies cliff to not display the help for this command
509-
deprecated = True
510-
511-
log = logging.getLogger('deprecated')
512-
513-
def take_action_network(self, client, parsed_args):
514-
self.log.warning(_('This command has been deprecated. '
515-
'Please use "floating ip show" instead.'))
516-
return super(ShowIPFloating, self).take_action_network(
517-
client, parsed_args)
518-
519-
def take_action_compute(self, client, parsed_args):
520-
self.log.warning(_('This command has been deprecated. '
521-
'Please use "floating ip show" instead.'))
522-
return super(ShowIPFloating, self).take_action_compute(
523-
client, parsed_args)
524-
525-
526428
class UnsetFloatingIP(command.Command):
527429
_description = _("Unset floating IP Properties")
528430

‎openstackclient/network/v2/floating_ip_pool.py‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
"""Floating IP Pool action implementations"""
1515

16-
import logging
1716

1817
from osc_lib import exceptions
1918
from osc_lib import utils
@@ -40,27 +39,3 @@ def take_action_compute(self, client, parsed_args):
4039
(utils.get_dict_properties(
4140
s, columns,
4241
) for s in data))
43-
44-
45-
class ListIPFloatingPool(ListFloatingIPPool):
46-
_description = _("List pools of floating IP addresses")
47-
48-
# TODO(tangchen): Remove this class and ``ip floating pool list`` command
49-
# two cycles after Mitaka.
50-
51-
# This notifies cliff to not display the help for this command
52-
deprecated = True
53-
54-
log = logging.getLogger('deprecated')
55-
56-
def take_action_network(self, client, parsed_args):
57-
self.log.warning(_('This command has been deprecated. '
58-
'Please use "floating ip pool list" instead.'))
59-
return super(ListIPFloatingPool, self).take_action_network(
60-
client, parsed_args)
61-
62-
def take_action_compute(self, client, parsed_args):
63-
self.log.warning(_('This command has been deprecated. '
64-
'Please use "floating ip pool list" instead.'))
65-
return super(ListIPFloatingPool, self).take_action_compute(
66-
client, parsed_args)

‎releasenotes/notes/remove-ip-floating-commands-d5363f313e09249a.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
other:
3+
- |
4+
Remove deprecated ``ip floating`` and ``ip floating pool`` commands.

‎setup.cfg‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -379,13 +379,6 @@ openstack.network.v2 =
379379
ip_availability_list = openstackclient.network.v2.ip_availability:ListIPAvailability
380380
ip_availability_show = openstackclient.network.v2.ip_availability:ShowIPAvailability
381381

382-
ip_floating_create = openstackclient.network.v2.floating_ip:CreateIPFloating
383-
ip_floating_delete = openstackclient.network.v2.floating_ip:DeleteIPFloating
384-
ip_floating_list = openstackclient.network.v2.floating_ip:ListIPFloating
385-
ip_floating_show = openstackclient.network.v2.floating_ip:ShowIPFloating
386-
387-
ip_floating_pool_list = openstackclient.network.v2.floating_ip_pool:ListIPFloatingPool
388-
389382
network_agent_add_network = openstackclient.network.v2.network_agent:AddNetworkToAgent
390383
network_agent_add_router = openstackclient.network.v2.network_agent:AddRouterToAgent
391384
network_agent_delete = openstackclient.network.v2.network_agent:DeleteNetworkAgent

0 commit comments

Comments
 (0)