Merge "Doc: Update and add IP address"

4 files changed, 84 insertions, 23 deletions

diff --git a/doc/source/command-objects/ip-fixed.rst b/doc/source/command-objects/ip-fixed.rst
new file mode 100644
index 00000000..3a55b995
--- /dev/null
+++ b/doc/source/command-objects/ip-fixed.rst
@@ -0,0 +1,45 @@
+========
+ip fixed
+========
+
+Compute v2
+
+ip fixed add
+------------
+
+Add fixed IP address to server
+
+.. program:: ip fixed add
+.. code:: bash
+
+    os ip fixed add
+        <network>
+        <server>
+
+.. describe:: <network>
+
+    Network to fetch an IP address from (name or ID)
+
+.. describe:: <server>
+
+    Server to receive the IP address (name or ID)
+
+ip fixed remove
+---------------
+
+Remove fixed IP address from server
+
+.. program:: ip fixed remove
+.. code:: bash
+
+    os ip fixed remove
+        <ip-address>
+        <server>
+
+.. describe:: <ip-address>
+
+    IP address to remove from server (name only)
+
+.. describe:: <server>
+
+    Server to remove the IP address from (name or ID)
diff --git a/doc/source/command-objects/ip-floating-pool.rst b/doc/source/command-objects/ip-floating-pool.rst
new file mode 100644
index 00000000..63a450eb
--- /dev/null
+++ b/doc/source/command-objects/ip-floating-pool.rst
@@ -0,0 +1,15 @@
+================
+ip floating pool
+================
+
+Compute v2
+
+ip floating pool list
+---------------------
+
+List pools of floating IP addresses
+
+.. program:: ip floating pool list
+.. code:: bash
+
+    os ip floating pool list
diff --git a/doc/source/command-objects/floatingip.rst b/doc/source/command-objects/ip-floating.rst
index 1ae3041e..6bfd7f44 100644
--- a/doc/source/command-objects/floatingip.rst
+++ b/doc/source/command-objects/ip-floating.rst
@@ -1,24 +1,24 @@
-==========
-floatingip
-==========
+===========
+ip floating
+===========
 
 Compute v2
 
 ip floating add
 ---------------
 
-Add floating-ip to server
+Add floating IP address to server
 
 .. program:: ip floating add
 .. code:: bash
 
     os ip floating add
-        <ip_address>
+        <ip-address>
         <server>
 
-.. describe:: <ip_address>
+.. describe:: <ip-address>
 
-    IP address to add to server
+    IP address to add to server (name only)
 
 .. describe:: <server>
 
@@ -27,7 +27,7 @@ Add floating-ip to server
 ip floating create
 ------------------
 
-Create new floating-ip
+Create new floating IP address
 
 .. program:: ip floating create
 .. code:: bash
@@ -37,27 +37,27 @@ Create new floating-ip
 
 .. describe:: <pool>
 
-    Pool to fetch floating IP from
+    Pool to fetch IP address from (name or ID)
 
 ip floating delete
 ------------------
 
-Delete a floating-ip
+Delete a floating IP address
 
 .. program:: ip floating delete
 .. code:: bash
 
     os ip floating delete
-        <ip_address>
+        <ip-address>
 
-.. describe:: <ip_address>
+.. describe:: <ip-address>
 
-    IP address to delete
+    IP address to delete (ID only)
 
 ip floating list
 ----------------
 
-List floating-ips
+List floating IP addresses
 
 .. program:: ip floating list
 .. code:: bash
@@ -67,18 +67,18 @@ List floating-ips
 ip floating remove
 ------------------
 
-Remove floating-ip from server
+Remove floating IP address from server
 
 .. program:: ip floating remove
 .. code:: bash
 
     os ip floating remove
-        <ip_address>
+        <ip-address>
         <server>
 
-.. describe:: <ip_address>
+.. describe:: <ip-address>
 
-    IP address to remove from server
+    IP address to remove from server (name only)
 
 .. describe:: <server>
 
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index abeda098..44be8bc7 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -91,13 +91,14 @@ referring to both Compute and Volume quotas.
 * ``hypervisor stats``: (**Compute**) hypervisor statistics over all compute nodes
 * ``identity provider``: (**Identity**) a source of users and authentication
 * ``image``: (**Image**) a disk image
-* ``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 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
 * ``module``: internal - installed Python modules in the OSC process
-* ``network``: Network - a virtual network for connecting servers and other resources
+* ``network``: (**Network**) - a virtual network for connecting servers and other resources
 * ``object``: (**Object Store**) a single file in the Object Store
 * ``policy``: (**Identity**) determines authorization
 * ``project``: (**Identity**) owns a group of resources
@@ -106,8 +107,8 @@ referring to both Compute and Volume quotas.
 * ``request token``: (**Identity**) temporary OAuth-based token
 * ``role``: (**Identity**) a policy object used to determine authorization
 * ``role assignment``: (**Identity**) a relationship between roles, users or groups, and domains or projects
-* ``security group``: Compute, Network - groups of network access rules
-* ``security group rule``: Compute, Network - the individual rules that define protocol/IP/port access
+* ``security group``: (**Compute**, **Network**) - groups of network access rules
+* ``security group rule``: (**Compute**, **Network**) - the individual rules that define protocol/IP/port access
 * ``server``: (**Compute**) virtual machine instance
 * ``server image``: (**Compute**) saved server disk image
 * ``service``: (**Identity**) a cloud service