network: Remove the workaround for SDK for advertise_host attribute

The patch removes the workaround for advertise_host attribute support.

Related-Bug: #2144617

Change-Id: I7bff6a6c5382b386f58ad163d4115b962f80e6a5
Signed-off-by: Jakub Libosvar <libosvar@redhat.com>

Author: cubeek

openstackclient/network/v2/router.py

@@ -402,20 +402,11 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
     def take_action(self, parsed_args: argparse.Namespace) -> None:
         client = self.app.client_manager.network
         subnet = client.find_subnet(parsed_args.subnet, ignore_missing=False)
-        if parsed_args.advertise_host:
-            # TODO(evpn): switch to client.add_interface_to_router() once
-            # openstacksdk supports the advertise_host parameter.
-            router = client.find_router(
-                parsed_args.router, ignore_missing=False
-            )
-            router.add_interface(
-                client, subnet_id=subnet.id, advertise_host=True
-            )
-        else:
-            client.add_interface_to_router(
-                client.find_router(parsed_args.router, ignore_missing=False),
-                subnet=subnet.id,
-            )
+        client.add_interface_to_router(
+            client.find_router(parsed_args.router, ignore_missing=False),
+            subnet=subnet.id,
+            advertise_host=parsed_args.advertise_host,
+        )
 
 
 class AddExtraRoutesToRouter(command.ShowOne):

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

@@ -108,7 +108,7 @@ def test_add_subnet_required_options(self):
 
         result = self.cmd.take_action(parsed_args)
         self.network_client.add_interface_to_router.assert_called_with(
-            self._router, subnet=self._router.subnet
+            self._router, subnet=self._router.subnet, advertise_host=False
         )
 
         self.assertIsNone(result)
@@ -127,12 +127,9 @@ def test_add_subnet_with_advertise_host(self):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
-        self._router.add_interface.assert_called_once_with(
-            self.network_client,
-            subnet_id=self._subnet.id,
-            advertise_host=True,
+        self.network_client.add_interface_to_router.assert_called_once_with(
+            self._router, subnet=self._router.subnet, advertise_host=True
         )
-        self.network_client.add_interface_to_router.assert_not_called()
 
         self.assertIsNone(result)
 
@@ -150,9 +147,8 @@ def test_add_subnet_without_advertise_host(self):
 
         result = self.cmd.take_action(parsed_args)
         self.network_client.add_interface_to_router.assert_called_once_with(
-            self._router, subnet=self._subnet.id
+            self._router, subnet=self._subnet.id, advertise_host=False
         )
-        self._router.add_interface.assert_not_called()
 
         self.assertIsNone(result)