osi-dump 0.1.3.2.5__py3-none-any.whl → 0.1.3.2.7__py3-none-any.whl

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

@@ -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.dist-info → osi_dump-0.1.3.2.7.dist-info}/RECORD

@@ -71,12 +71,12 @@ osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIB
 osi_dump/importer/instance/openstack_instance_importer.py,sha256=bvDZdwkxBZl40shIHAQ0QOkRcZEkWaeksROF7DZ5syA,4085
 osi_dump/importer/load_balancer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/load_balancer/load_balancer_importer.py,sha256=fzInBlkscqlbhCATeQYXvufc-WHq2pbofTJJifN0zaY,218
-osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=eF6VqDDAjTzKsvSrbnEzSNhLRZV6nQL4M5XhbshCVTQ,2700
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=8Wa-obk9WygQ-4G5aNqa6yhIPyjTxc__vDq9Ix5TC8E,3156
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=fWGwjgK7Gfau4oxFjw2PSH_lx_ecxi7xgJ81qbGBJKE,3435
+osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=bff9rutp2835KA0ibVsvtCZStNgtiTkc7IKUsCmaXRo,3003
 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
@@ -94,7 +94,7 @@ osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
 osi_dump/model/instance.py,sha256=ixJUGMsNAsWIRSXXHZ2fHA9Wr1wPYZONyEhS75wfQp8,577
 osi_dump/model/load_balancer.py,sha256=x8mTvdXa5FmuJLwx4qu2DJqPQISoO-0A3a76Ki_jy34,413
 osi_dump/model/project.py,sha256=_mMaKKM9RQYiorh6zWMrC_WJ3x9RxhZxn4lLa_B3niY,710
-osi_dump/model/role_assignment.py,sha256=kc5eUx4NBYaD0wnYk2FcaFAbfkoe22durmOmwLi2WA8,348
+osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
 osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
 osi_dump/model/volume.py,sha256=C1WdZ_GwlL-iaBqrFpgPMfIQZj3ST2KQHzwXceYxRZg,423
 osi_dump/os_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -105,11 +105,11 @@ osi_dump/util/excel_autosize_column.py,sha256=zzQ6uXkQhHAqVn9fUAgNjoCH_HiNEC9Dcj
 osi_dump/util/excel_sort_sheet.py,sha256=o4jXtP1ZFYtAGzkAP5S8Tym4h-SEoFBAI3j24y-24UM,1047
 osi_dump/util/export_data_excel.py,sha256=VYSxDBZ7dgSbTj3n_8RRPqe183tILNh6wJW-UnFvJUU,882
 osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo_AR0,111
-osi_dump/util/openstack_util.py,sha256=PmoGlXNJqCQAbZBBHj-BM5JdY5g9FHERXtOn4Lv0p3k,1299
+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.2.5.dist-info/METADATA,sha256=MuxbNizSk_BpLT4KhiGqkpnWj2_WohHwo9UbQJnhj6I,685
-osi_dump-0.1.3.2.5.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-osi_dump-0.1.3.2.5.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.2.5.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.2.5.dist-info/RECORD,,
+osi_dump-0.1.3.2.7.dist-info/METADATA,sha256=TVyMk3sPeKlYzvwLQWH6GMx15QnJNGf3vWEcCl1JAAQ,677
+osi_dump-0.1.3.2.7.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+osi_dump-0.1.3.2.7.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.2.7.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.2.7.dist-info/RECORD,,

{osi_dump-0.1.3.2.5.dist-info → osi_dump-0.1.3.2.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any