Merge "Enable to create legacy router"

Author: Jenkins

doc/source/command-objects/router.rst

@@ -64,7 +64,7 @@ Create new router
         [--project <project> [--project-domain <project-domain>]]
         [--enable | --disable]
         [--distributed]
-        [--ha]
+        [--ha | --no-ha]
         [--description <description>]
         [--availability-zone-hint <availability-zone>]
         <name>
@@ -94,6 +94,10 @@ Create new router
 
     Create a highly available router
 
+.. option:: --no-ha
+
+    Create a legacy router
+
 .. option:: --description <description>
 
     Set router description

openstackclient/network/v2/router.py

@@ -183,11 +183,17 @@ def get_parser(self, prog_name):
             default=False,
             help=_("Create a distributed router")
         )
-        parser.add_argument(
+        ha_group = parser.add_mutually_exclusive_group()
+        ha_group.add_argument(
             '--ha',
             action='store_true',
             help=_("Create a highly available router")
         )
+        ha_group.add_argument(
+            '--no-ha',
+            action='store_true',
+            help=_("Create a legacy router")
+        )
         parser.add_argument(
             '--description',
             metavar='<description>',
@@ -216,7 +222,9 @@ def take_action(self, parsed_args):
 
         attrs = _get_attrs(self.app.client_manager, parsed_args)
         if parsed_args.ha:
-            attrs['ha'] = parsed_args.ha
+            attrs['ha'] = True
+        if parsed_args.no_ha:
+            attrs['ha'] = False
         obj = client.create_router(**attrs)
 
         display_columns, columns = _get_columns(obj)

openstackclient/tests/unit/network/v2/test_router.py

@@ -181,16 +181,17 @@ def test_create_default_options(self):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
-    def test_create_with_ha_option(self):
+    def _test_create_with_ha_options(self, option, ha):
         arglist = [
-            '--ha',
+            option,
             self.new_router.name,
         ]
         verifylist = [
             ('name', self.new_router.name),
             ('enable', True),
             ('distributed', False),
-            ('ha', True),
+            ('ha', ha),
+            ('no_ha', not ha),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -199,11 +200,17 @@ def test_create_with_ha_option(self):
         self.network.create_router.assert_called_once_with(**{
             'admin_state_up': True,
             'name': self.new_router.name,
-            'ha': True,
+            'ha': ha,
         })
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)
 
+    def test_create_with_ha_option(self):
+        self._test_create_with_ha_options('--ha', True)
+
+    def test_create_with_no_ha_option(self):
+        self._test_create_with_ha_options('--no-ha', False)
+
     def test_create_with_AZ_hints(self):
         arglist = [
             self.new_router.name,

releasenotes/notes/allow-to-create-legacy-router-cb4dcb44dde74684.yaml

@@ -0,0 +1,5 @@
+---
+features:
+    - |
+      Add ``--no-ha`` option to the ``router create`` command
+      [Bug `1675514 <https://bugs.launchpad.net/python-openstackclient/+bug/1675514>`_]