osi-dump 0.1.3.2.5__tar.gz → 0.1.3.2.7__tar.gz

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1.3.2.5
+Version: 0.1.3.2.7
 Summary: OpenStack information dump tool
 Author: TVKain
 License: Apache-2.0
@@ -8,7 +8,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: typer
-Requires-Dist: openstacksdk==3.3.0
+Requires-Dist: openstacksdk
 Requires-Dist: pydantic
 Requires-Dist: pandas
 Requires-Dist: openpyxl

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "osi-dump"
-version = "0.1.3.2.5"
+version = "0.1.3.2.7"
 description = "OpenStack information dump tool"
 readme = "README.md"
 authors = [{ name = "TVKain" }]
@@ -9,7 +9,7 @@ requires-python = ">=3.10"
 classifiers = ["License :: OSI Approved :: Apache Software License"]
 dependencies = [
     "typer",
-    "openstacksdk==3.3.0",
+    "openstacksdk",
     "pydantic",
     "pandas",
     "openpyxl",

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/src/osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -44,37 +44,47 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
         load_balancers: list[LoadBalancer] = []
 
         with concurrent.futures.ThreadPoolExecutor() as executor:
-            futures = [
-                executor.submit(self._get_load_balancer_info, load_balancer)
-                for load_balancer in osload_balancers
-            ]
+            futures = [] 
+            
+            for load_balancer in osload_balancers:
+                logger.info("Importing load_balancer: %s", load_balancer["id"])
+                if load_balancer["id"] != None:
+                    futures.append(executor.submit(self._get_load_balancer_info, load_balancer))
+            
             for future in concurrent.futures.as_completed(futures):
-                load_balancers.append(future.result())
+                result = future.result() 
+                
+                if result != None: 
+                    load_balancers.append(result)
 
         logger.info(f"Imported load_balancers for {self.connection.auth['auth_url']}")
 
         return load_balancers
 
     def _get_load_balancer_info(self, load_balancer: OSLoadBalancer) -> LoadBalancer:
+        try: 
+            amphoraes = octavia_api.get_amphoraes(
+                connection=self.connection, load_balancer_id=load_balancer["id"]
+            )
+
+            for amphorae in amphoraes:
+                flavor = self.connection.get_flavor_by_id(amphorae["compute_flavor"])
+                amphorae["ram"] = flavor.ram
+                amphorae["vcpus"] = flavor.vcpus
+
+            load_balancer_ret = LoadBalancer(
+                id=load_balancer["id"],
+                load_balancer_name=load_balancer["name"],
+                operating_status=load_balancer["operating_status"],
+                project_id=load_balancer["project_id"],
+                provisioning_status=load_balancer["provisioning_status"],
+                created_at=load_balancer["created_at"],
+                updated_at=load_balancer["updated_at"],
+                amphoraes=amphoraes,
+            )
 
-        amphoraes = octavia_api.get_amphoraes(
-            connection=self.connection, load_balancer_id=load_balancer["id"]
-        )
-
-        for amphorae in amphoraes:
-            flavor = self.connection.get_flavor_by_id(amphorae["compute_flavor"])
-            amphorae["ram"] = flavor.ram
-            amphorae["vcpus"] = flavor.vcpus
-
-        load_balancer_ret = LoadBalancer(
-            id=load_balancer["id"],
-            load_balancer_name=load_balancer["name"],
-            operating_status=load_balancer["operating_status"],
-            project_id=load_balancer["project_id"],
-            provisioning_status=load_balancer["provisioning_status"],
-            created_at=load_balancer["created_at"],
-            updated_at=load_balancer["updated_at"],
-            amphoraes=amphoraes,
-        )
-
-        return load_balancer_ret
+            return load_balancer_ret
+        except Exception as e: 
+            logger.warning(f"Getting lb failed {e}")
+            
+            return None

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/src/osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -71,17 +71,6 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         except Exception as e:
             logger.warning(f"Can not get role id: {e}")
 
-        """
-        - Added enabled field to Role Assignment sheet 
-        - Should be removed in the future when User Sheet is added 
-        """
-        user_enabled = None
-        try:
-            user = self.connection.identity.get_user(user=user_id)
-            user_enabled = user.is_enabled
-        except Exception as e: 
-            logger.warning(f"Can not get user_enabled: {e}")
-
         user_name = None
         role_name = None
 
@@ -104,7 +93,6 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
             user_id=user_id,
             user_name=user_name,
             role_id=role_id,
-            user_enabled=user_enabled,
             role_name=role_name,
             scope=role_assignment.scope,
         )

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/src/osi_dump/model/role_assignment.py

@@ -9,8 +9,6 @@ class RoleAssignment(BaseModel):
     user_id: Optional[str]
 
     user_name: Optional[str]
-    
-    user_enabled: Optional[bool]
 
     role_id: Optional[str]
 

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/src/osi_dump/util/openstack_util.py

@@ -45,4 +45,4 @@ def get_endpoints(
         )
     )
 
-    return [http_ret, https_ret]
+    return [https_ret, http_ret]

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/src/osi_dump.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1.3.2.5
+Version: 0.1.3.2.7
 Summary: OpenStack information dump tool
 Author: TVKain
 License: Apache-2.0
@@ -8,7 +8,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: typer
-Requires-Dist: openstacksdk==3.3.0
+Requires-Dist: openstacksdk
 Requires-Dist: pydantic
 Requires-Dist: pandas
 Requires-Dist: openpyxl

{osi_dump-0.1.3.2.5 → osi_dump-0.1.3.2.7}/src/osi_dump.egg-info/requires.txt

@@ -1,5 +1,5 @@
 typer
-openstacksdk==3.3.0
+openstacksdk
 pydantic
 pandas
 openpyxl