Merge "network: Replace new use of keystoneclient"

Author: Zuul

openstackclient/network/v2/dynamic_routing/bgp_dragent.py

@@ -9,7 +9,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
 
 import argparse
 from collections.abc import Iterable, Sequence

openstackclient/network/v2/dynamic_routing/bgp_peer.py

@@ -9,7 +9,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
 
 import argparse
 from collections.abc import Iterable, Sequence
@@ -29,9 +28,7 @@
 MAX_AS_NUM = 4294967295
 
 
-def _get_attrs(
-    client_manager: Any, parsed_args: argparse.Namespace
-) -> dict[str, Any]:
+def _get_attrs(parsed_args: argparse.Namespace) -> dict[str, Any]:
     attrs = {}
 
     # Validate password
@@ -58,15 +55,6 @@ def _get_attrs(
         attrs['peer_ip'] = parsed_args.peer_ip
     if 'password' in parsed_args:
         attrs['password'] = parsed_args.password
-
-    if 'project' in parsed_args and parsed_args.project is not None:
-        identity_client = client_manager.identity
-        project_id = identity_common.find_project(
-            identity_client,
-            parsed_args.project,
-            parsed_args.project_domain,
-        ).id
-        attrs['tenant_id'] = project_id
     return attrs
 
 
@@ -120,7 +108,17 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
-        attrs = _get_attrs(self.app.client_manager, parsed_args)
+
+        attrs = _get_attrs(parsed_args)
+        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,
+            )
+            attrs['project_id'] = project_id
+
         obj = client.create_bgp_peer(**attrs)
         display_columns, columns = utils.get_osc_show_columns_for_sdk_resource(
             obj, {}, ['location', 'tenant_id']
@@ -193,7 +191,7 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
         id = client.find_bgp_peer(
             parsed_args.bgp_peer, ignore_missing=False
         ).id
-        attrs = _get_attrs(self.app.client_manager, parsed_args)
+        attrs = _get_attrs(parsed_args)
         client.update_bgp_peer(id, **attrs)
 
 

openstackclient/network/v2/dynamic_routing/bgp_speaker.py

@@ -9,8 +9,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-#
-
 
 import argparse
 from collections.abc import Iterable, Sequence
@@ -25,9 +23,7 @@
 from openstackclient.network.v2.dynamic_routing import bgp_peer
 
 
-def _get_attrs(
-    client_manager: Any, parsed_args: argparse.Namespace
-) -> dict[str, Any]:
+def _get_attrs(parsed_args: argparse.Namespace) -> dict[str, Any]:
     attrs: dict[str, Any] = {}
     if parsed_args.name is not None:
         attrs['name'] = str(parsed_args.name)
@@ -43,15 +39,6 @@ def _get_attrs(
         attrs['advertise_floating_ip_host_routes'] = True
     if parsed_args.no_advertise_floating_ip_host_routes:
         attrs['advertise_floating_ip_host_routes'] = False
-
-    if 'project' in parsed_args and parsed_args.project is not None:
-        identity_client = client_manager.identity
-        project_id = identity_common.find_project(
-            identity_client,
-            parsed_args.project,
-            parsed_args.project_domain,
-        ).id
-        attrs['tenant_id'] = project_id
     return attrs
 
 
@@ -184,7 +171,17 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         client = self.app.client_manager.network
-        attrs = _get_attrs(self.app.client_manager, parsed_args)
+
+        attrs = _get_attrs(parsed_args)
+        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,
+            )
+            attrs['project_id'] = project_id
+
         obj = client.create_bgp_speaker(**attrs)
         display_columns, columns = utils.get_osc_show_columns_for_sdk_resource(
             obj, {}, ['location', 'tenant_id']
@@ -346,7 +343,7 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
         id = client.find_bgp_speaker(
             parsed_args.bgp_speaker, ignore_missing=False
         ).id
-        attrs = _get_attrs(self.app.client_manager, parsed_args)
+        attrs = _get_attrs(parsed_args)
         client.update_bgp_speaker(id, **attrs)