osi-dump 0.1.3.3__py3-none-any.whl → 0.1.3.3.1__py3-none-any.whl

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/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.3.dist-info → osi_dump-0.1.3.3.1.dist-info}/METADATA

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

{osi_dump-0.1.3.3.dist-info → osi_dump-0.1.3.3.1.dist-info}/RECORD

@@ -2,6 +2,7 @@ osi_dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/__main__.py,sha256=fCVTLFipB-P0872_4j7iOJNNosOMBj3YdHr8TH_fhRY,71
 osi_dump/cli.py,sha256=vLijmcrWieCVK4cSLN2sK9ltWlercw9Zg6yBEvZtPkg,6379
 osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osi_dump/api/keystone.py,sha256=F0OtOnqYORCNWep1k2Yq4OG1ySxknyTFbqEPzgLE5hk,809
 osi_dump/api/neutron.py,sha256=pag_d6MsxA1gOUit4bvVUaTiTrPqLJjwz9KU_QSpxwM,1788
 osi_dump/api/octavia.py,sha256=Cgzz9Pf26YFETqbXSXYSHUA_PWDy_3V4zPm0RZ8QKBo,1905
 osi_dump/api/placement.py,sha256=yoWzg39b8nK2E1nrxDhLxLsa7FcBTw57gfy8b5F5ijc,1096
@@ -76,7 +77,7 @@ osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 osi_dump/importer/project/openstack_project_importer.py,sha256=ylcm3jEFqh4gW8vhzhIaBq5v4A-PV3BaaogC8uHlSkg,3295
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
 osi_dump/importer/role_assignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=bff9rutp2835KA0ibVsvtCZStNgtiTkc7IKUsCmaXRo,3003
+osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=1NdIuVSiaLX9kEiQOLYKdavN_qVt7ZxUk-EIVT1lNFI,2897
 osi_dump/importer/role_assignment/role_assignment_importer.py,sha256=Faorx0qsgdXjv5y2t-7obpV3wFfbmByx_-8b9yBr7L8,228
 osi_dump/importer/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/router/openstack_router_importer.py,sha256=T_Wr45nJrCcp2OOdRawmdQkNBDzczA-3DPx9dlewd4g,2781
@@ -108,8 +109,8 @@ osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo
 osi_dump/util/openstack_util.py,sha256=_o8LiRmQKtxQ8hU3rbrMNwIAxt0-aWD2rjq-NvVdK9E,1299
 osi_dump/util/panda_excel.py,sha256=owr8AffIxqN3yY8kIv55Ox4j2dRz7kXZvSZFZeft8dw,734
 osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
-osi_dump-0.1.3.3.dist-info/METADATA,sha256=-JdLtnaYUbbmQCGKa9il2yGbBZJ1OLYHrjOICKwCSh4,675
-osi_dump-0.1.3.3.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-osi_dump-0.1.3.3.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.3.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.3.dist-info/RECORD,,
+osi_dump-0.1.3.3.1.dist-info/METADATA,sha256=PRciFKydCpXwmXtQJCyQWpQCSy25AOiUR_PRqY4SZoc,677
+osi_dump-0.1.3.3.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+osi_dump-0.1.3.3.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.3.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.3.1.dist-info/RECORD,,