Merge "Remove deprecated compute commands"

Author: Zuul

doc/source/cli/backwards-incompatible.rst

@@ -16,9 +16,20 @@ from this backwards incompatible change handling.
 Backwards Incompatible Changes
 ==============================
 
-.. Carry this section as comments until 4.0 release
-.. Release 4.0
-.. -----------
+Release 4.0
+-----------
+
+1. Remove ``ip fixed add|remove`` commands.
+   Use ``server add|remove fixed ip`` commands instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612781
+
+2. Remove ``ip floating add|remove`` commands.
+   Use ``server add|remove floating ip`` commands instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612781
 
 .. 1. Change ``volume transfer request accept`` to use new option ``--auth-key``
 ..    rather than a second positional argument.

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

@@ -2,7 +2,7 @@
 floating ip pool
 ================
 
-Compute v2, Network v2
+Network v2
 
 floating ip pool list
 ---------------------

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

@@ -2,7 +2,7 @@
 floating ip
 ===========
 
-Compute v2, Network v2
+Network v2
 
 floating ip create
 ------------------

doc/source/cli/command-objects/ip-fixed.rst

@@ -95,9 +95,9 @@ referring to both Compute and Volume quotas.
 * ``extension``: (**Compute**, **Identity**, **Network**, **Volume**) OpenStack server API extensions
 * ``federation protocol``: (**Identity**) the underlying protocol used while federating identities
 * ``flavor``: (**Compute**) predefined server configurations: ram, root disk and so on
-* ``fixed ip``: (**Compute**, **Network**) - an internal IP address assigned to a server
-* ``floating ip``: (**Compute**, **Network**) - a public IP address that can be mapped to a server
-* ``floating ip pool``: (**Compute**, **Network**) - a pool of public IP addresses
+* ``fixed ip``: (**Compute**) - an internal IP address assigned to a server
+* ``floating ip``: (**Network**) - a public IP address that can be mapped to a server
+* ``floating ip pool``: (**Network**) - a pool of public IP addresses
 * ``group``: (**Identity**) a grouping of users
 * ``host``: (**Compute**) - the physical computer running compute services
 * ``hypervisor``: (**Compute**) the virtual machine manager
@@ -106,9 +106,6 @@ referring to both Compute and Volume quotas.
 * ``image``: (**Image**) a disk image
 * ``image member``: (**Image**) a project that is a member of an Image
 * ``ip availability``: (**Network**) - details of IP usage of a network
-* ``ip fixed``: (**Compute**, **Network**) - an internal IP address assigned to a server
-* ``ip floating``: (**Compute**, **Network**) - a public IP address that can be mapped to a server
-* ``ip floating pool``: (**Compute**, **Network**) - a pool of public IP addresses
 * ``keypair``: (**Compute**) an SSH public key
 * ``limits``: (**Compute**, **Volume**) resource usage limits
 * ``mapping``: (**Identity**) a definition to translate identity provider attributes to Identity concepts

doc/source/cli/commands.rst

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    Remove deprecated ``ip fixed add|remove`` commands.
+    Use ``server add|remove fixed ip`` commands instead.
+  - |
+    Remove deprecated ``ip floating add|remove`` commands.
+    Use ``server add|remove floating ip`` commands instead.

openstackclient/compute/v2/fixedip.py

@@ -91,12 +91,6 @@ openstack.compute.v2 =
 
     hypervisor_stats_show = openstackclient.compute.v2.hypervisor_stats:ShowHypervisorStats
 
-    ip_fixed_add = openstackclient.compute.v2.fixedip:AddFixedIP
-    ip_fixed_remove = openstackclient.compute.v2.fixedip:RemoveFixedIP
-
-    ip_floating_add = openstackclient.compute.v2.floatingip:AddFloatingIP
-    ip_floating_remove = openstackclient.compute.v2.floatingip:RemoveFloatingIP
-
     keypair_create = openstackclient.compute.v2.keypair:CreateKeypair
     keypair_delete = openstackclient.compute.v2.keypair:DeleteKeypair
     keypair_list = openstackclient.compute.v2.keypair:ListKeypair