Merge "Add 'description' option to os subnet (pool) create/set cmd"

2 files changed, 19 insertions, 0 deletions

diff --git a/doc/source/command-objects/subnet-pool.rst b/doc/source/command-objects/subnet-pool.rst
index 3330d62d..28a735d6 100644
--- a/doc/source/command-objects/subnet-pool.rst
+++ b/doc/source/command-objects/subnet-pool.rst
@@ -19,6 +19,7 @@ Create subnet pool
         [--default-prefix-length <default-prefix-length>]
         [--min-prefix-length <min-prefix-length>]
         [--max-prefix-length <max-prefix-length>]
+        [--description <description>]
         [--project <project> [--project-domain <project-domain>]]
         [--address-scope <address-scope>]
         [--default | --no-default]
@@ -38,6 +39,10 @@ Create subnet pool
 
     Set subnet pool maximum prefix length
 
+.. option:: --description <description>
+
+    Set subnet pool description
+
 .. option:: --project <project>
 
     Owner's project (name or ID)
@@ -163,6 +168,7 @@ Set subnet pool properties
         [--max-prefix-length <max-prefix-length>]
         [--address-scope <address-scope> | --no-address-scope]
         [--default | --no-default]
+        [--description <description>]
         <subnet-pool>
 
 .. option:: --name <name>
@@ -203,6 +209,10 @@ Set subnet pool properties
 
     Set this as a non-default subnet pool
 
+.. option:: --description <description>
+
+    Set subnet pool description
+
 .. _subnet_pool_set-subnet-pool:
 .. describe:: <subnet-pool>
 
diff --git a/doc/source/command-objects/subnet.rst b/doc/source/command-objects/subnet.rst
index d2ea6132..64130ee1 100644
--- a/doc/source/command-objects/subnet.rst
+++ b/doc/source/command-objects/subnet.rst
@@ -26,6 +26,7 @@ Create new subnet
         [--gateway <gateway>]
         [--host-route destination=<subnet>,gateway=<ip-address>]
         [--ip-version {4,6}]
+        [--description <description>]
         [--ipv6-ra-mode {dhcpv6-stateful,dhcpv6-stateless,slaac}]
         [--ipv6-address-mode {dhcpv6-stateful,dhcpv6-stateless,slaac}]
         [--network-segment <network-segment>]
@@ -100,6 +101,10 @@ Create new subnet
      IP version is determined from the subnet pool and this option
      is ignored.
 
+.. option:: --description <description>
+
+     Set subnet description
+
 .. option:: --ipv6-ra-mode {dhcpv6-stateful,dhcpv6-stateless,slaac}
 
      IPv6 RA (Router Advertisement) mode,
@@ -233,6 +238,7 @@ Set subnet properties
         [--host-route destination=<subnet>,gateway=<ip-address>]
         [--service-type <service-type>]
         [--name <new-name>]
+        [--description <description>]
         <subnet>
 
 .. option:: --allocation-pool start=<ip-address>,end=<ip-address>
@@ -274,6 +280,9 @@ Set subnet properties
      ``network:floatingip_agent_gateway``.
      Must be a valid device owner value for a network port
      (repeat option to set multiple service types)
+.. option:: --description <description>
+
+     Set subnet description
 
 .. option:: --name