osi-dump 0.1.3.3.3.4__py3-none-any.whl → 0.1.3.3.3.6__py3-none-any.whl

osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -71,6 +71,8 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
                 flavor = self.connection.get_flavor_by_id(amphorae["compute_flavor"])
                 amphorae["ram"] = flavor.ram
                 amphorae["vcpus"] = flavor.vcpus
+                amphorae["flavor_name"] = flavor.name 
+                amphorae["flavor_description"] = flavor.description
 
             load_balancer_ret = LoadBalancer(
                 id=load_balancer["id"],

osi_dump/importer/project/openstack_project_importer.py

@@ -4,10 +4,11 @@ import concurrent
 
 from openstack.connection import Connection
 from openstack.identity.v3.project import Project as OSProject
+from openstack.load_balancer.v2.load_balancer import LoadBalancer as OSLoadBalancer
 
 from osi_dump.importer.project.project_importer import ProjectImporter
 from osi_dump.model.project import Project
-
+import osi_dump.api.octavia as octavia_api
 logger = logging.getLogger(__name__)
 
 
@@ -26,6 +27,22 @@ class OpenStackProjectImporter(ProjectImporter):
         """
 
         logger.info(f"Importing projects for {self.connection.auth['auth_url']}")
+        try:
+            osload_balancers: list[OSLoadBalancer] = octavia_api.get_load_balancers(
+                connection=self.connection
+            )
+        except Exception as e:
+            raise Exception(
+                f"Can not fetch load_balancers for {self.connection.auth['auth_url']} {e}"
+            ) from e
+
+        project_lb_dict = {}
+
+        for osload_balancer in osload_balancers: 
+            if project_lb_dict.get(osload_balancer["project_id"]):
+                project_lb_dict[osload_balancer["project_id"]] += 1 
+            else: 
+                project_lb_dict[osload_balancer["project_id"]] = 1
 
         try:
             osprojects: list[OSProject] = list(self.connection.identity.projects())
@@ -38,7 +55,7 @@ class OpenStackProjectImporter(ProjectImporter):
 
         with concurrent.futures.ThreadPoolExecutor() as executor:
             futures = [
-                executor.submit(self._get_project_info, project)
+                executor.submit(self._get_project_info, project, project_lb_dict)
                 for project in osprojects
             ]
             for future in concurrent.futures.as_completed(futures):
@@ -48,7 +65,7 @@ class OpenStackProjectImporter(ProjectImporter):
 
         return projects
 
-    def _get_project_info(self, project: OSProject) -> Project:
+    def _get_project_info(self, project: OSProject, project_lb_dict: dict) -> Project:
         
         usage_instance=None
         quota_instance=None
@@ -81,12 +98,12 @@ class OpenStackProjectImporter(ProjectImporter):
             storage_quotas = self.connection.block_storage.get_quota_set(
                 project.id, usage=True
             )
-            usage_volume=storage_quotas.usage["volumes"],
-            quota_volume=storage_quotas.volumes,
-            usage_snapshot=storage_quotas.usage["snapshots"],
-            quota_snapshot=storage_quotas.snapshots,
-            usage_storage=storage_quotas.usage["gigabytes"],
-            quota_storage=storage_quotas.gigabytes,
+            usage_volume=storage_quotas.usage["volumes"]
+            quota_volume=storage_quotas.volumes
+            usage_snapshot=storage_quotas.usage["snapshots"]
+            quota_snapshot=storage_quotas.snapshots
+            usage_storage=storage_quotas.usage["gigabytes"]
+            quota_storage=storage_quotas.gigabytes
         except Exception as e:
             logger.warning(f"Get storage quotas failed for {project.id} error: {e}")
 
@@ -97,6 +114,8 @@ class OpenStackProjectImporter(ProjectImporter):
         except Exception as e:
             logger.warning(f"Get domain failed for {project.domain_id} error: {e}")
 
+        lb_count = project_lb_dict.get(project.id)
+
         project_ret = Project(
             project_id=project.id,
             project_name=project.name,
@@ -115,7 +134,8 @@ class OpenStackProjectImporter(ProjectImporter):
             usage_snapshot=usage_snapshot,
             quota_snapshot=quota_snapshot,
             usage_storage=usage_storage,
-            quota_storage=quota_storage
+            quota_storage=quota_storage,
+            load_balancer_count=lb_count
         )
 
         return project_ret

osi_dump/model/load_balancer.py

@@ -14,7 +14,7 @@ class LoadBalancer(BaseModel):
 
     operating_status: Optional[str]
 
-    amphoraes: list[dict]
+    amphoraes: list[dict] # compute_id, compute_flavor_id, flavor_name, flavor_description
     vip: Optional[str]
 
     project_id: Optional[str]

osi_dump/model/project.py

@@ -30,3 +30,5 @@ class Project(BaseModel):
 
     usage_storage: Optional[int]
     quota_storage: Optional[int]
+
+    load_balancer_count: Optional[int]

{osi_dump-0.1.3.3.3.4.dist-info → osi_dump-0.1.3.3.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1.3.3.3.4
+Version: 0.1.3.3.3.6
 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
+Requires-Dist: openstacksdk==3.3.0
 Requires-Dist: pydantic
 Requires-Dist: pandas
 Requires-Dist: openpyxl

{osi_dump-0.1.3.3.3.4.dist-info → osi_dump-0.1.3.3.3.6.dist-info}/RECORD

@@ -72,9 +72,9 @@ osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIB
 osi_dump/importer/instance/openstack_instance_importer.py,sha256=HvA1hYLAneY0KtDTk7nz6TWXNGO5s6EOp7Hrm7-FxHI,4249
 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=tTcZAWEMstRvDAWrmFlRYI1mIc27egaEAeNLsh-htRM,3205
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=1BUIoE5K3KHKaoGDa5Spnx8K2exxV_0grYzZ9esk41w,3328
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/project/openstack_project_importer.py,sha256=0Idzf-bgQEdgSlM85iNwSRZdknibeWXScRJKBdoIuqg,4080
+osi_dump/importer/project/openstack_project_importer.py,sha256=nQRInUb0vtm57dQNLxSoUFnGrNbAytK2Zl0FaUMPqBc,4964
 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=p7Ocn27Esh-QipqNyQCviO6xt4TTWuIbqiNQ8oAPVpY,3557
@@ -93,8 +93,8 @@ osi_dump/model/floating_ip.py,sha256=CRJufC5ZaxxcbGvdot7Af-sO8uyKbyQK9zHljfBnyFA
 osi_dump/model/hypervisor.py,sha256=6dWEMVrrjOQolX936FqY994S7RAXpMPATpsLPVNeCyk,455
 osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
 osi_dump/model/instance.py,sha256=8puhIKWWfoAaTURXb7XUpjG0lQ4nb0UwrsrTQdDaFbs,639
-osi_dump/model/load_balancer.py,sha256=cInZ_JH8kzZpnJsxejI-nze4nACtK3Yk20pfyl28lLo,436
-osi_dump/model/project.py,sha256=_mMaKKM9RQYiorh6zWMrC_WJ3x9RxhZxn4lLa_B3niY,710
+osi_dump/model/load_balancer.py,sha256=3FT8FCPW3gHWbupfqAzHE0lN7Wp3YCvTAmgmRoVWIKc,501
+osi_dump/model/project.py,sha256=S5BtjeMoxZfiJ7z7G_5jYfp5mMTzlPi7DWT5fuBGCTw,749
 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
@@ -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.3.4.dist-info/METADATA,sha256=aDqD7WalTunfBVE43PF9AUMtJg2Qxhhgp_snbor7VQs,678
-osi_dump-0.1.3.3.3.4.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-osi_dump-0.1.3.3.3.4.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.3.3.4.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.3.3.4.dist-info/RECORD,,
+osi_dump-0.1.3.3.3.6.dist-info/METADATA,sha256=DtKEqD2WRDbHuLQPjkuQA92GVwafa7zWaWuBz3Ea-uQ,685
+osi_dump-0.1.3.3.3.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+osi_dump-0.1.3.3.3.6.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.3.3.6.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.3.3.6.dist-info/RECORD,,