Merge "Add --description to Neutron commands"

2 files changed, 20 insertions, 1 deletions

diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
index 454335f1..bb75540c 100644
--- a/openstackclient/network/v2/floating_ip.py
+++ b/openstackclient/network/v2/floating_ip.py
@@ -55,6 +55,9 @@ def _get_attrs(client_manager, parsed_args):
     if parsed_args.fixed_ip_address:
         attrs['fixed_ip_address'] = parsed_args.fixed_ip_address
 
+    if parsed_args.description is not None:
+        attrs['description'] = parsed_args.description
+
     return attrs
 
 
@@ -97,6 +100,11 @@ class CreateFloatingIP(common.NetworkAndComputeShowOne):
             dest='fixed_ip_address',
             help=_("Fixed IP address mapped to the floating IP")
         )
+        parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_('Set floating IP description')
+        )
         return parser
 
     def take_action_network(self, client, parsed_args):
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index 03134b8c..cb40d774 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -82,7 +82,8 @@ def _get_attrs(client_manager, parsed_args):
     if ('availability_zone_hints' in parsed_args
             and parsed_args.availability_zone_hints is not None):
         attrs['availability_zone_hints'] = parsed_args.availability_zone_hints
-
+    if parsed_args.description is not None:
+        attrs['description'] = parsed_args.description
     # "router set" command doesn't support setting project.
     if 'project' in parsed_args and parsed_args.project is not None:
         identity_client = client_manager.identity
@@ -180,6 +181,11 @@ class CreateRouter(command.ShowOne):
             help=_("Create a distributed router")
         )
         parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_('Set router description')
+        )
+        parser.add_argument(
             '--project',
             metavar='<project>',
             help=_("Owner's project (name or ID)")
@@ -370,6 +376,11 @@ class SetRouter(command.Command):
             metavar='<name>',
             help=_("Set router name")
         )
+        parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_('Set router description')
+        )
         admin_group = parser.add_mutually_exclusive_group()
         admin_group.add_argument(
             '--enable',