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

2 files changed, 25 insertions, 0 deletions

diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 8a3f229a..76453487 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -196,6 +196,8 @@ def _get_attrs(client_manager, parsed_args, is_create=True):
     if ('service_types' in parsed_args and
        parsed_args.service_types is not None):
         attrs['service_types'] = parsed_args.service_types
+    if parsed_args.description is not None:
+        attrs['description'] = parsed_args.description
     return attrs
 
 
@@ -294,6 +296,11 @@ class CreateSubnet(command.ShowOne):
             metavar='<network>',
             help=_("Network this subnet belongs to (name or ID)")
         )
+        parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_("Set subnet description")
+        )
         _get_common_parse_arguments(parser)
         return parser
 
@@ -496,6 +503,11 @@ class SetSubnet(command.Command):
                    "'none': This subnet will not use a gateway, "
                    "e.g.: --gateway 192.168.9.1, --gateway none.")
         )
+        parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_("Set subnet description")
+        )
         _get_common_parse_arguments(parser)
         return parser
 
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index 6852ca27..a01d2f7b 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -81,6 +81,9 @@ def _get_attrs(client_manager, parsed_args):
         ).id
         attrs['tenant_id'] = project_id
 
+    if parsed_args.description is not None:
+        attrs['description'] = parsed_args.description
+
     return attrs
 
 
@@ -167,6 +170,11 @@ class CreateSubnetPool(command.ShowOne):
             action='store_true',
             help=_("Set this subnet pool as not shared"),
         )
+        parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_("Set subnet pool description")
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -340,6 +348,11 @@ class SetSubnetPool(command.Command):
             help=_("Remove address scope associated with the subnet pool")
         )
         _add_default_options(parser)
+        parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_("Set subnet pool description")
+        )
 
         return parser