Merge "Remove deprecated ip floating commands"

2 files changed, 0 insertions, 123 deletions

diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
index f51baed5..9019e01d 100644
--- a/openstackclient/network/v2/floating_ip.py
+++ b/openstackclient/network/v2/floating_ip.py
@@ -13,8 +13,6 @@
 
 """IP Floating action implementations"""
 
-import logging
-
 from osc_lib.command import command
 from osc_lib import utils
 
@@ -159,30 +157,6 @@ class CreateFloatingIP(common.NetworkAndComputeShowOne):
         return (columns, data)
 
 
-class CreateIPFloating(CreateFloatingIP):
-    _description = _("Create floating IP")
-
-    # TODO(tangchen): Remove this class and ``ip floating create`` command
-    #                 two cycles after Mitaka.
-
-    # This notifies cliff to not display the help for this command
-    deprecated = True
-
-    log = logging.getLogger('deprecated')
-
-    def take_action_network(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip create" instead.'))
-        return super(CreateIPFloating, self).take_action_network(
-            client, parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip create" instead.'))
-        return super(CreateIPFloating, self).take_action_compute(
-            client, parsed_args)
-
-
 class DeleteFloatingIP(common.NetworkAndComputeDelete):
     _description = _("Delete floating IP(s)")
 
@@ -210,30 +184,6 @@ class DeleteFloatingIP(common.NetworkAndComputeDelete):
         client.api.floating_ip_delete(self.r)
 
 
-class DeleteIPFloating(DeleteFloatingIP):
-    _description = _("Delete floating IP(s)")
-
-    # TODO(tangchen): Remove this class and ``ip floating delete`` command
-    #                 two cycles after Mitaka.
-
-    # This notifies cliff to not display the help for this command
-    deprecated = True
-
-    log = logging.getLogger('deprecated')
-
-    def take_action_network(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip delete" instead.'))
-        return super(DeleteIPFloating, self).take_action_network(
-            client, parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip delete" instead.'))
-        return super(DeleteIPFloating, self).take_action_compute(
-            client, parsed_args)
-
-
 class ListFloatingIP(common.NetworkAndComputeLister):
     # TODO(songminglong): Use SDK resource mapped attribute names once
     # the OSC minimum requirements include SDK 1.0
@@ -384,30 +334,6 @@ class ListFloatingIP(common.NetworkAndComputeLister):
                 ) for s in data))
 
 
-class ListIPFloating(ListFloatingIP):
-    _description = _("List floating IP(s)")
-
-    # TODO(tangchen): Remove this class and ``ip floating list`` command
-    #                 two cycles after Mitaka.
-
-    # This notifies cliff to not display the help for this command
-    deprecated = True
-
-    log = logging.getLogger('deprecated')
-
-    def take_action_network(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip list" instead.'))
-        return super(ListIPFloating, self).take_action_network(
-            client, parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip list" instead.'))
-        return super(ListIPFloating, self).take_action_compute(
-            client, parsed_args)
-
-
 class SetFloatingIP(command.Command):
     _description = _("Set floating IP Properties")
 
@@ -499,30 +425,6 @@ class ShowFloatingIP(common.NetworkAndComputeShowOne):
         return (columns, data)
 
 
-class ShowIPFloating(ShowFloatingIP):
-    _description = _("Display floating IP details")
-
-    # TODO(tangchen): Remove this class and ``ip floating show`` command
-    #                 two cycles after Mitaka.
-
-    # This notifies cliff to not display the help for this command
-    deprecated = True
-
-    log = logging.getLogger('deprecated')
-
-    def take_action_network(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip show" instead.'))
-        return super(ShowIPFloating, self).take_action_network(
-            client, parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip show" instead.'))
-        return super(ShowIPFloating, self).take_action_compute(
-            client, parsed_args)
-
-
 class UnsetFloatingIP(command.Command):
     _description = _("Unset floating IP Properties")
 
diff --git a/openstackclient/network/v2/floating_ip_pool.py b/openstackclient/network/v2/floating_ip_pool.py
index ebb15da8..32852004 100644
--- a/openstackclient/network/v2/floating_ip_pool.py
+++ b/openstackclient/network/v2/floating_ip_pool.py
@@ -13,7 +13,6 @@
 
 """Floating IP Pool action implementations"""
 
-import logging
 
 from osc_lib import exceptions
 from osc_lib import utils
@@ -40,27 +39,3 @@ class ListFloatingIPPool(common.NetworkAndComputeLister):
                 (utils.get_dict_properties(
                     s, columns,
                 ) for s in data))
-
-
-class ListIPFloatingPool(ListFloatingIPPool):
-    _description = _("List pools of floating IP addresses")
-
-    # TODO(tangchen): Remove this class and ``ip floating pool list`` command
-    #                 two cycles after Mitaka.
-
-    # This notifies cliff to not display the help for this command
-    deprecated = True
-
-    log = logging.getLogger('deprecated')
-
-    def take_action_network(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip pool list" instead.'))
-        return super(ListIPFloatingPool, self).take_action_network(
-            client, parsed_args)
-
-    def take_action_compute(self, client, parsed_args):
-        self.log.warning(_('This command has been deprecated. '
-                           'Please use "floating ip pool list" instead.'))
-        return super(ListIPFloatingPool, self).take_action_compute(
-            client, parsed_args)