Merge "Add --ha-chassis-priority to "network agent add router""

Author: Zuul

openstackclient/network/v2/network_agent.py

@@ -118,6 +118,15 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         parser.add_argument(
             '--l3', action='store_true', help=_('Add router to an L3 agent')
         )
+        parser.add_argument(
+            '--ha-chassis-priority',
+            metavar='<ha-chassis-priority>',
+            type=int,
+            help=_(
+                "HA Chassis priority, ranging from [0, 32767]. "
+                "Only used with --l3 and for ML2/OVN L3 agents"
+            ),
+        )
         parser.add_argument(
             'agent_id',
             metavar='<agent-id>',
@@ -136,7 +145,11 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
         agent = client.get_agent(parsed_args.agent_id)
         router = client.find_router(parsed_args.router, ignore_missing=False)
         if parsed_args.l3:
-            client.add_router_to_agent(agent, router)
+            client.add_router_to_agent(
+                agent,
+                router,
+                ha_chassis_priority=parsed_args.ha_chassis_priority,
+            )
 
 
 class DeleteNetworkAgent(command.Command):

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

@@ -109,7 +109,32 @@ def test_add_router_required_options(self):
         result = self.cmd.take_action(parsed_args)
 
         self.network_client.add_router_to_agent.assert_called_with(
-            self._agent, self._router
+            self._agent, self._router, ha_chassis_priority=None
+        )
+        self.assertIsNone(result)
+
+    def test_add_router_with_ha_chassis_priority(self):
+        arglist = [
+            self._agent.id,
+            self._router.id,
+            '--l3',
+            '--ha-chassis-priority',
+            '100',
+        ]
+        verifylist = [
+            ('l3', True),
+            ('agent_id', self._agent.id),
+            ('router', self._router.id),
+            ('ha_chassis_priority', 100),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = self.cmd.take_action(parsed_args)
+
+        self.network_client.add_router_to_agent.assert_called_with(
+            self._agent,
+            self._router,
+            ha_chassis_priority=100,
         )
         self.assertIsNone(result)
 

releasenotes/notes/add-ha-chassis-priority-to-add-router-to-agent-27c0a79d899a425c.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Add a new option ``--ha-chassis-priority`` to the
+    ``network agent add router`` command. This allows setting
+    the HA Chassis priority when adding a router to an L3 agent.