From d1f9ea3f750bb4c1f440ebfa93d06a40673ec0aa Mon Sep 17 00:00:00 2001
From: Tang Chen <chen.tang@easystack.cn>
Date: Thu, 7 Apr 2016 14:10:37 +0800
Subject: Transfer "ip floating add/remove" to "server add/remove  floating ip"

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

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

Change-Id: Ic0dd22ca6fb7b7bc3e820fd5a14d7c551e7ab963
Implements: blueprint rework-ip-commands
Partial-bug: 1555990
Co-Authored-By: Dean Troyer <dtroyer@gmail.com>
---
 doc/source/command-objects/ip-floating.rst |  2 ++
 doc/source/command-objects/server.rst      | 40 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

(limited to 'doc/source/command-objects')

diff --git a/doc/source/command-objects/ip-floating.rst b/doc/source/command-objects/ip-floating.rst
index 8dd94782..378812d1 100644
--- a/doc/source/command-objects/ip-floating.rst
+++ b/doc/source/command-objects/ip-floating.rst
@@ -8,6 +8,7 @@ ip floating add
 ---------------
 
 Add floating IP address to server
+(Deprecated, please use ``server add floating ip`` instead)
 
 .. program:: ip floating add
 .. code:: bash
@@ -92,6 +93,7 @@ ip floating remove
 ------------------
 
 Remove floating IP address from server
+(Deprecated, please use ``server remove floating ip`` instead)
 
 .. program:: ip floating remove
 .. code:: bash
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index f11355b6..3393e7fb 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -4,6 +4,26 @@ server
 
 Compute v2
 
+server add floating ip
+----------------------
+
+Add floating IP address to server
+
+.. program:: server add floating ip
+.. code:: bash
+
+    os server add floating ip
+        <server>
+        <ip-address>
+
+.. describe:: <server>
+
+    Server (name or ID) to receive the floating IP address
+
+.. describe:: <ip-address>
+
+    Floating IP address (IP address only) to assign to server
+
 server add security group
 -------------------------
 
@@ -418,6 +438,26 @@ Rebuild server
 
     Server (name or ID)
 
+server remove floating ip
+-------------------------
+
+Remove floating IP address from server
+
+.. program:: server remove floating ip
+.. code:: bash
+
+    os server remove floating ip
+        <server>
+        <ip-address>
+
+.. describe:: <server>
+
+    Server (name or ID) to remove the floating IP address from
+
+.. describe:: <ip-address>
+
+    Floating IP address (IP address only) to remove from server
+
 server remove security group
 ----------------------------
 
-- 
cgit v1.2.1