osi-dump 0.1.3.3.2.4__py3-none-any.whl → 0.1.3.3.2.6__py3-none-any.whl

osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -16,6 +16,10 @@ logger = logging.getLogger(__name__)
 
 
 class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
+    user_names = {}
+    role_names = {}
+    
+    
     def __init__(self, connection: Connection):
         self.connection = connection
 
@@ -34,9 +38,9 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         )
 
         try:
-            osrole_assignments = self.connection.list_role_assignments()
-
-            logger.info(osrole_assignments)
+            osrole_assignments: list[OSRoleAssignment] = list(
+                self.connection.identity.role_assignments()
+            )
         except Exception as e:
             raise Exception(
                 f"Can not fetch role_assignments for {self.connection.auth['auth_url']} {e}"
@@ -53,7 +57,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
                 role_assignments.append(future.result())
 
         logger.info(f"Imported role_assignments for {self.connection.auth['auth_url']}")
-
+        
         return role_assignments
 
     def _get_role_assignment_info(
@@ -76,16 +80,28 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         user_name = None
         role_name = None
 
-        try:    
-            role_name = self.connection.get_role(name_or_id=role_id).name
-
+        try:
+            if user_id in OpenStackRoleAssignmentImporter.user_names:
+                user_name = OpenStackRoleAssignmentImporter.user_names[user_id]
+            else: 
+                user_name = self.connection.identity.get_user(
+                    role_assignment.user["id"]
+                ).name
+                OpenStackRoleAssignmentImporter.user_names[user_id] = user_name
         except Exception as e:
-            logger.warning(f"Can not get role name: {e}")
+            logger.warning(f"Can not get user name: {e}")
 
         try:
-            user_name = self.connection.get_user(name_or_id=user_id).name
+            if role_id in OpenStackRoleAssignmentImporter.role_names: 
+                role_name = OpenStackRoleAssignmentImporter.role_names[role_id]
+            else: 
+                role_name = self.connection.identity.get_role(
+                    role_assignment.role["id"]
+                ).name
+                OpenStackRoleAssignmentImporter.role_names[role_id] = role_name 
+                
         except Exception as e:
-            logger.warning(f"Can not get user name: {e}")
+            logger.warning(f"Can not get role name: {e}")
 
         role_assignment_ret = RoleAssignment(
             user_id=user_id,

{osi_dump-0.1.3.3.2.4.dist-info → osi_dump-0.1.3.3.2.6.dist-info}/METADATA

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

{osi_dump-0.1.3.3.2.4.dist-info → osi_dump-0.1.3.3.2.6.dist-info}/RECORD

@@ -77,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=6B95rzQ22I2ASiRVOqOMpEiYiV2YIpz_pTVuTDOCKBM,2971
+osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=i_3fx86y_UotOkQ9I9oLiXQ3UlXtokYxW4XreodAIW0,3678
 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
@@ -109,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.2.4.dist-info/METADATA,sha256=P7p-QohrpbstMXcteceAMUIJ3XaH9CmbdG9m8ljGumc,679
-osi_dump-0.1.3.3.2.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-osi_dump-0.1.3.3.2.4.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.3.2.4.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.3.2.4.dist-info/RECORD,,
+osi_dump-0.1.3.3.2.6.dist-info/METADATA,sha256=YP_-NefdJ8q6kpPwWq5d752llU6lf5SMQ9PERl2Pzus,679
+osi_dump-0.1.3.3.2.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+osi_dump-0.1.3.3.2.6.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.3.2.6.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.3.2.6.dist-info/RECORD,,