osi-dump 0.1.3.3.2.5__tar.gz → 0.1.3.3.2.6__tar.gz

{osi_dump-0.1.3.3.2.5 → osi_dump-0.1.3.3.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1.3.3.2.5
+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.5 → osi_dump-0.1.3.3.2.6}/pyproject.toml

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

{osi_dump-0.1.3.3.2.5 → osi_dump-0.1.3.3.2.6}/src/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
 
@@ -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,20 +80,28 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         user_name = None
         role_name = None
 
-        try:    
-            role_name = self.connection.identity.get_role(
-                role_assignment.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.identity.get_user(
-                role_assignment.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.5 → osi_dump-0.1.3.3.2.6}/src/osi_dump.egg-info/PKG-INFO

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