osi-dump 0.1.3.3.3.4__tar.gz → 0.1.3.3.3.6__tar.gz

{osi_dump-0.1.3.3.3.4 → osi_dump-0.1.3.3.3.6}/PKG-INFO

@@ -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 → osi_dump-0.1.3.3.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "osi-dump"
-version = "0.1.3.3.3.4"
+version = "0.1.3.3.3.6"
 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",
+    "openstacksdk==3.3.0",
     "pydantic",
     "pandas",
     "openpyxl",

{osi_dump-0.1.3.3.3.4 → osi_dump-0.1.3.3.3.6}/src/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-0.1.3.3.3.4 → osi_dump-0.1.3.3.3.6}/src/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-0.1.3.3.3.4 → osi_dump-0.1.3.3.3.6}/src/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-0.1.3.3.3.4 → osi_dump-0.1.3.3.3.6}/src/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 → osi_dump-0.1.3.3.3.6}/src/osi_dump.egg-info/PKG-INFO

@@ -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 → osi_dump-0.1.3.3.3.6}/src/osi_dump.egg-info/requires.txt

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