osi-dump 0.1.3.1.3__tar.gz → 0.1.3.1.5__tar.gz

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/PKG-INFO

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

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/pyproject.toml

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

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/src/osi_dump/api/octavia.py

@@ -34,4 +34,6 @@ def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
 
     amphoraes = data["amphorae"]
 
+    amphoraes = [dict(sorted(amphorae.items())) for amphorae in amphoraes]
+
     return amphoraes

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/src/osi_dump/exporter/hypervisor/excel_hypervisor_exporter.py

@@ -21,6 +21,8 @@ class ExcelHypervisorExporter(HypervisorExporter):
     def export_hypervisors(self, hypervisors: list[Hypervisor]):
         df = pd.DataFrame([hypervisor.model_dump() for hypervisor in hypervisors])
 
+        df = util.expand_list_column(df, "aggregates")
+
         logger.info(f"Exporting hypervisors for {self.sheet_name}")
         try:
             util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/src/osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -59,16 +59,7 @@ class OpenStackHypervisorImporter(HypervisorImporter):
     def _get_hypervisor_info(
         self, hypervisor: OSHypervisor, aggregates: list[OSAggregate]
     ) -> Hypervisor:
-        aggregate = self._get_aggregate(hypervisor=hypervisor)
-
-        aggregate_id = None
-        aggregate_name = None
-        availability_zone = None
-
-        if aggregate:
-            aggregate_id = aggregate.id
-            aggregate_name = aggregate.name
-            availability_zone = aggregate.availability_zone
+        aggregate_list = self._get_aggregates(hypervisor=hypervisor)
 
         placement_proxy: PlacementProxy = self.connection.placement
 
@@ -97,18 +88,28 @@ class OpenStackHypervisorImporter(HypervisorImporter):
             memory_usage=usage_data["MEMORY_MB"],
             local_disk_usage=usage_data["DISK_GB"],
             vm_count=len(hypervisor.servers),
-            aggregate_id=aggregate_id,
-            aggregate_name=aggregate_name,
-            availability_zone=availability_zone,
+            aggregates=aggregate_list,
         )
 
         return ret_hypervisor
 
-    def _get_aggregate(self, hypervisor: OSHypervisor) -> OSAggregate:
-        aggregates = list(self.connection.list_aggregates())
+    def _get_aggregates(self, hypervisor: OSHypervisor):
+        aggregates_ret = []
+
+        aggregates: OSAggregate = list(self.connection.list_aggregates())
 
         for aggregate in aggregates:
             if hypervisor.name in aggregate.hosts:
-                return aggregate
-
-        return None
+                aggregates_ret.append(
+                    {
+                        "id": aggregate.id,
+                        "name": aggregate.name,
+                        "availability_zone": aggregate.availability_zone,
+                    }
+                )
+
+        aggregates_ret = [
+            dict(sorted(aggregate.items())) for aggregate in aggregates_ret
+        ]
+
+        return aggregates_ret

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/src/osi_dump/model/hypervisor.py

@@ -18,8 +18,6 @@ class Hypervisor(BaseModel):
     local_disk_usage: int
     local_disk_size: int
 
-    availability_zone: Optional[str]
-    aggregate_name: Optional[str]
-    aggregate_id: Optional[int]
+    aggregates: Optional[list[dict]]  # id, name, az
 
     vm_count: int

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/src/osi_dump/util/openstack_util.py

@@ -15,7 +15,7 @@ def get_endpoint(connection: Connection, service_type: str, interface: str) -> s
 
     ret = urllib.parse.urlunparse(
         parsed_endpoint._replace(netloc=f"{new_hostname}:{port}")._replace(
-            scheme="https"
+            scheme="http"
         )
     )
 

{osi_dump-0.1.3.1.3 → osi_dump-0.1.3.1.5}/src/osi_dump.egg-info/PKG-INFO

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