osi-dump 0.1.3.2.9__tar.gz → 0.1.3.3.1__tar.gz

{osi_dump-0.1.3.2.9 → osi_dump-0.1.3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1.3.2.9
+Version: 0.1.3.3.1
 Summary: OpenStack information dump tool
 Author: TVKain
 License: Apache-2.0

{osi_dump-0.1.3.2.9 → osi_dump-0.1.3.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "osi-dump"
-version = "0.1.3.2.9"
+version = "0.1.3.3.1"
 description = "OpenStack information dump tool"
 readme = "README.md"
 authors = [{ name = "TVKain" }]

osi_dump-0.1.3.3.1/src/osi_dump/api/keystone.py

@@ -0,0 +1,27 @@
+import logging
+
+from openstack.connection import Connection
+from openstack.identity.v3.service import Service
+from openstack.load_balancer.v2.load_balancer import LoadBalancer
+
+import osi_dump.util.openstack_util as os_util
+
+logger = logging.getLogger(__name__)
+
+
+def get_role_assignments(connection: Connection): 
+    keystone_endpoints = os_util.get_endpoints(
+        connection=connection, service_type="identity", interface="public"
+    )
+    
+    for endpoint in keystone_endpoints: 
+        try: 
+            url = f"{endpoint}/role_assignments?include_names"
+            response = connection.session.get(url)
+            if response.status_code == 200: 
+                break
+        except Exception as e: 
+            logger.info(e) 
+            
+    return response.json()['role_assignments']
+    

{osi_dump-0.1.3.2.9 → osi_dump-0.1.3.3.1}/src/osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -10,6 +10,8 @@ from osi_dump.importer.role_assignment.role_assignment_importer import (
 )
 from osi_dump.model.role_assignment import RoleAssignment
 
+from osi_dump.api.keystone import get_role_assignments
+
 logger = logging.getLogger(__name__)
 
 
@@ -32,16 +34,16 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         )
 
         try:
-            osrole_assignments: list[OSRoleAssignment] = list(
-                self.connection.identity.role_assignments()
-            )
+            osrole_assignments = get_role_assignments(self.connection)
+
+           
         except Exception as e:
             raise Exception(
                 f"Can not fetch role_assignments for {self.connection.auth['auth_url']}"
             ) from e
 
         role_assignments: list[RoleAssignment] = []
-
+        
         with concurrent.futures.ThreadPoolExecutor() as executor:
             futures = [
                 executor.submit(self._get_role_assignment_info, role_assignment)
@@ -62,30 +64,26 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         role_id = None
 
         try:
-            user_id = role_assignment.user["id"]
+            user_id = role_assignment["user"]["id"]
         except Exception as e:
             logger.warning(f"Can not get user id: {e}")
 
         try:
-            role_id = role_assignment.role["id"]
+            role_id = role_assignment["role"]["id"]
         except Exception as e:
             logger.warning(f"Can not get role id: {e}")
 
         user_name = None
         role_name = None
 
-        try:
-            role_name = self.connection.identity.get_role(
-                role_assignment.role["id"]
-            ).name
+        try:    
+            role_name = role_assignment['role']['name']
 
         except Exception as e:
             logger.warning(f"Can not get role name: {e}")
 
         try:
-            user_name = self.connection.identity.get_user(
-                role_assignment.user["id"]
-            ).name
+            user_name = role_assignment['user']['name']
         except Exception as e:
             logger.warning(f"Can not get user name: {e}")
 
@@ -94,7 +92,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
             user_name=user_name,
             role_id=role_id,
             role_name=role_name,
-            scope=role_assignment.scope,
+            scope=role_assignment['scope'],
         )
 
         return role_assignment_ret

{osi_dump-0.1.3.2.9 → osi_dump-0.1.3.3.1}/src/osi_dump/model/external_port.py

@@ -27,4 +27,4 @@ class ExternalPort(BaseModel):
 
     status: Optional[str]
     
-    vlan_id: Optional[str]
+    vlan_id: Optional[int]

{osi_dump-0.1.3.2.9 → osi_dump-0.1.3.3.1}/src/osi_dump.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1.3.2.9
+Version: 0.1.3.3.1
 Summary: OpenStack information dump tool
 Author: TVKain
 License: Apache-2.0

{osi_dump-0.1.3.2.9 → osi_dump-0.1.3.3.1}/src/osi_dump.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/osi_dump.egg-info/entry_points.txt
 src/osi_dump.egg-info/requires.txt
 src/osi_dump.egg-info/top_level.txt
 src/osi_dump/api/__init__.py
+src/osi_dump/api/keystone.py
 src/osi_dump/api/neutron.py
 src/osi_dump/api/octavia.py
 src/osi_dump/api/placement.py