Merge "Add leak-routes related options for subnets"

Author: Zuul

openstackclient/network/common.py

@@ -33,6 +33,7 @@
     'dns_domain': 'dns-integration',
     'dns_name': 'dns-integration',
     'extra_dhcp_opts': 'extra_dhcp_opt',
+    'leak_routes': 'ovn-bgp',
     'qos_policy_id': 'qos',
     'security_groups': 'security-groups',
 }

openstackclient/network/v2/subnet.py

@@ -730,6 +730,26 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             metavar='<description>',
             help=_("Set subnet description"),
         )
+        leak_routes_grp = parser.add_mutually_exclusive_group()
+        leak_routes_grp.add_argument(
+            '--leak-routes',
+            action='store_true',
+            dest='leak_routes',
+            default=None,
+            help=_(
+                "Leak subnet routes to the underlay BGP fabric "
+                "(ovn-bgp extension required)"
+            ),
+        )
+        leak_routes_grp.add_argument(
+            '--no-leak-routes',
+            action='store_false',
+            dest='leak_routes',
+            help=_(
+                "Do not leak subnet routes to the underlay "
+                "BGP fabric (ovn-bgp extension required)"
+            ),
+        )
         _tag.add_tag_option_to_parser_for_set(parser, _('subnet'))
         _get_common_parse_arguments(parser, is_create=False)
         return parser
@@ -757,11 +777,14 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
             attrs['allocation_pools'] = []
         if 'service_types' in attrs:
             attrs['service_types'] += obj.service_types
+        if parsed_args.leak_routes is not None:
+            attrs['leak_routes'] = parsed_args.leak_routes
         attrs.update(
             self._parse_extra_properties(parsed_args.extra_properties)
         )
         if attrs:
-            client.update_subnet(obj, **attrs)
+            with common.check_missing_extension_if_error(client, attrs):
+                client.update_subnet(obj, **attrs)
         # tags is a subresource and it needs to be updated separately.
         _tag.update_tags_for_set(client, obj, parsed_args)
         return

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

@@ -1472,6 +1472,48 @@ def test_set_segment(self):
         self.network_client.update_subnet.assert_called_with(_subnet, **attrs)
         self.assertIsNone(result)
 
+    def test_set_leak_routes(self):
+        arglist = [
+            self._subnet.name,
+            '--leak-routes',
+        ]
+        verifylist = [
+            ('subnet', self._subnet.name),
+            ('leak_routes', True),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = self.cmd.take_action(parsed_args)
+
+        attrs = {
+            'leak_routes': True,
+        }
+        self.network_client.update_subnet.assert_called_once_with(
+            self._subnet, **attrs
+        )
+        self.assertIsNone(result)
+
+    def test_set_no_leak_routes(self):
+        arglist = [
+            self._subnet.name,
+            '--no-leak-routes',
+        ]
+        verifylist = [
+            ('subnet', self._subnet.name),
+            ('leak_routes', False),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        result = self.cmd.take_action(parsed_args)
+
+        attrs = {
+            'leak_routes': False,
+        }
+        self.network_client.update_subnet.assert_called_once_with(
+            self._subnet, **attrs
+        )
+        self.assertIsNone(result)
+
 
 class TestShowSubnet(TestSubnet):
     # The subnets to be shown