network: Replace new use of keystoneclient

A follow-up to Id9014aef47af42ac813cacaaccc61346a0282897 but for VPNaaS.

While here, we significantly streamline the tests and remove a lot of
redundant variables and "helper" methods which only served to make the
code much harder to read.

Change-Id: Ib82fb12691757bd50e9ba6247d64c2b1dd2c158f
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/network/v2/vpnaas/endpoint_group.py

@@ -85,13 +85,15 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
-        attrs = {}
+        attrs: dict[str, Any] = {}
         if parsed_args.project is not None:
-            attrs['project_id'] = identity_common.find_project(
-                self.app.client_manager.identity,
+            identity_client = self.app.client_manager.sdk_connection.identity
+            project_id = identity_common.find_project_id_sdk(
+                identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
+            attrs['project_id'] = project_id
         if parsed_args.description:
             attrs['description'] = parsed_args.description
 

openstackclient/network/v2/vpnaas/ikepolicy.py

@@ -207,12 +207,14 @@ def take_action(
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         attrs = _get_common_attrs(parsed_args)
-        if 'project' in parsed_args and parsed_args.project is not None:
-            attrs['project_id'] = identity_common.find_project(
-                self.app.client_manager.identity,
+        if parsed_args.project is not None:
+            identity_client = self.app.client_manager.sdk_connection.identity
+            project_id = identity_common.find_project_id_sdk(
+                identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
+            attrs['project_id'] = project_id
         if parsed_args.name:
             attrs['name'] = str(parsed_args.name)
         obj = client.create_vpn_ike_policy(**attrs)

openstackclient/network/v2/vpnaas/ipsec_site_connection.py

@@ -246,12 +246,14 @@ def take_action(
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         attrs = _get_common_attrs(client, parsed_args)
-        if 'project' in parsed_args and parsed_args.project is not None:
-            attrs['project_id'] = identity_common.find_project(
-                self.app.client_manager.identity,
+        if parsed_args.project is not None:
+            identity_client = self.app.client_manager.sdk_connection.identity
+            project_id = identity_common.find_project_id_sdk(
+                identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
+            attrs['project_id'] = project_id
         if parsed_args.vpnservice:
             _vpnservice_id = client.find_vpn_service(
                 parsed_args.vpnservice, ignore_missing=False

openstackclient/network/v2/vpnaas/ipsecpolicy.py

@@ -200,12 +200,14 @@ def take_action(
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         attrs = _get_common_attrs(parsed_args)
-        if 'project' in parsed_args and parsed_args.project is not None:
-            attrs['project_id'] = identity_common.find_project(
-                self.app.client_manager.identity,
+        if parsed_args.project is not None:
+            identity_client = self.app.client_manager.sdk_connection.identity
+            project_id = identity_common.find_project_id_sdk(
+                identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
+            attrs['project_id'] = project_id
         if parsed_args.name:
             attrs['name'] = str(parsed_args.name)
         obj = client.create_vpn_ipsec_policy(**attrs)

openstackclient/network/v2/vpnaas/vpnservice.py

@@ -131,12 +131,14 @@ def take_action(
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
         attrs = _get_common_attrs(client, parsed_args)
-        if 'project' in parsed_args and parsed_args.project is not None:
-            attrs['project_id'] = identity_common.find_project(
-                self.app.client_manager.identity,
+        if parsed_args.project is not None:
+            identity_client = self.app.client_manager.sdk_connection.identity
+            project_id = identity_common.find_project_id_sdk(
+                identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
+            attrs['project_id'] = project_id
         if parsed_args.name:
             attrs['name'] = str(parsed_args.name)
         if parsed_args.router: