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

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

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

{osi_dump-0.1.3.3.2.6 → osi_dump-0.1.3.3.2.8}/pyproject.toml

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

{osi_dump-0.1.3.3.2.6 → osi_dump-0.1.3.3.2.8}/src/osi_dump/importer/image/openstack_image_importer.py

@@ -50,12 +50,15 @@ class OpenStackImageImporter(ImageImporter):
 
     def _get_image_info(self, os_image: OSImage) -> Image:
 
-        properties: dict = os_image.properties
-
-        properties.pop("owner_specified.openstack.md5", None)
-        properties.pop("owner_specified.openstack.sha256", None)
-        properties.pop("owner_specified.openstack.object", None)
-        properties.pop("stores", None)
+        try:
+            properties: dict = os_image.properties
+
+            properties.pop("owner_specified.openstack.md5", None)
+            properties.pop("owner_specified.openstack.sha256", None)
+            properties.pop("owner_specified.openstack.object", None)
+            properties.pop("stores", None)
+        except Exception as e: 
+            logger.warn(f"properties for {os_image.id} is None")
 
         image = Image(
             image_id=os_image.id,

{osi_dump-0.1.3.3.2.6 → osi_dump-0.1.3.3.2.8}/src/osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -15,13 +15,28 @@ from osi_dump.api.keystone import get_role_assignments
 logger = logging.getLogger(__name__)
 
 
-class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
-    user_names = {}
-    role_names = {}
-    
-    
+class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):    
     def __init__(self, connection: Connection):
         self.connection = connection
+        
+        self.users = {}
+        self.roles = {}
+        
+    def _get_users(self): 
+        os_users = self.connection.identity.users()
+        
+        for os_user in os_users: 
+            print(os_user)
+            self.users[os_user.id] = os_user.name 
+    
+    def _get_roles(self): 
+        os_roles = self.connection.identity.roles()
+        
+        for os_role in os_roles: 
+            
+            print(os_role)
+            self.roles[os_role.id] = os_role.name 
+        
 
     def import_role_assignments(self) -> list[RoleAssignment]:
         """Import role_assignments information from Openstack
@@ -36,11 +51,22 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         logger.info(
             f"Importing role_assignments for {self.connection.auth['auth_url']}"
         )
+        
+        try: 
+            self._get_users()
+        except Exception as e: 
+            logger.info(f"Getting user list failed {e}")
+            
+        try: 
+            self._get_roles() 
+        except Exception as e: 
+            logger.info(f"Getting role list failed {e}")
 
         try:
             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}"
@@ -81,25 +107,12 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         role_name = None
 
         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
+            user_name = self.users[user_id]
         except Exception as e:
             logger.warning(f"Can not get user name: {e}")
 
         try:
-            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 
-                
+            role_name = self.roles[role_id]
         except Exception as e:
             logger.warning(f"Can not get role name: {e}")
 

{osi_dump-0.1.3.3.2.6 → osi_dump-0.1.3.3.2.8}/src/osi_dump.egg-info/PKG-INFO

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