summaryrefslogtreecommitdiff
path: root/doc/source/command-objects
diff options
context:
space:
mode:
authorTang Chen <chen.tang@easystack.cn>2016-04-07 14:30:06 +0800
committerTang Chen <chen.tang@easystack.cn>2016-07-04 10:41:30 +0800
commit179ebe6d648fc5cff514306076f1b0fa54e64b40 (patch)
tree8fe00c6304cb9c493360a62c3838bc31e0b12e35 /doc/source/command-objects
parentd1f9ea3f750bb4c1f440ebfa93d06a40673ec0aa (diff)
downloadpython-openstackclient-179ebe6d648fc5cff514306076f1b0fa54e64b40.tar.gz
Transfer "ip fixed add/remove" to "server add/remove fixed ip"
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>
Diffstat (limited to 'doc/source/command-objects')
-rw-r--r--doc/source/command-objects/ip-fixed.rst2
-rw-r--r--doc/source/command-objects/server.rst40
2 files changed, 42 insertions, 0 deletions
diff --git a/doc/source/command-objects/ip-fixed.rst b/doc/source/command-objects/ip-fixed.rst
index 3a55b995..c2447b28 100644
--- a/doc/source/command-objects/ip-fixed.rst
+++ b/doc/source/command-objects/ip-fixed.rst
@@ -8,6 +8,7 @@ ip fixed add
------------
Add fixed IP address to server
+(Deprecated, please use ``server add fixed ip`` instead)
.. program:: ip fixed add
.. code:: bash
@@ -28,6 +29,7 @@ ip fixed remove
---------------
Remove fixed IP address from server
+(Deprecated, please use ``server remove fixed ip`` instead)
.. program:: ip fixed remove
.. code:: bash
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 3393e7fb..49a54153 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -4,6 +4,26 @@ server
Compute v2
+server add fixed ip
+-------------------
+
+Add fixed IP address to server
+
+.. program:: server add fixed ip
+.. code:: bash
+
+ os server add fixed ip
+ <server>
+ <network>
+
+.. describe:: <server>
+
+ Server (name or ID) to receive the fixed IP address
+
+.. describe:: <network>
+
+ Network (name or ID) to allocate the fixed IP address from
+
server add floating ip
----------------------
@@ -438,6 +458,26 @@ Rebuild server
Server (name or ID)
+server remove fixed ip
+----------------------
+
+Remove fixed IP address from server
+
+.. program:: server remove fixed ip
+.. code:: bash
+
+ os server remove fixed ip
+ <server>
+ <ip-address>
+
+.. describe:: <server>
+
+ Server (name or ID) to remove the fixed IP address from
+
+.. describe:: <ip-address>
+
+ Fixed IP address (IP address only) to remove from the server
+
server remove floating ip
-------------------------