osi-dump 0.1.3.1.4__py3-none-any.whl → 0.1.3.1.5__py3-none-any.whl

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/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/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,24 +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 = []
 
-        aggregate_hypervisors: list[OSAggregate] = []
+        aggregates: OSAggregate = list(self.connection.list_aggregates())
 
         for aggregate in aggregates:
             if hypervisor.name in aggregate.hosts:
-                aggregate_hypervisors.append(aggregate)
-
-        for aggregate_hypervisor in aggregate_hypervisors:
-            if aggregate_hypervisor.availability_zone != None:
-                return aggregate_hypervisor
-
-        return aggregate_hypervisors[0]
+                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/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/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.4.dist-info → osi_dump-0.1.3.1.5.dist-info}/METADATA

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

{osi_dump-0.1.3.1.4.dist-info → osi_dump-0.1.3.1.5.dist-info}/RECORD

@@ -3,7 +3,7 @@ osi_dump/__main__.py,sha256=fCVTLFipB-P0872_4j7iOJNNosOMBj3YdHr8TH_fhRY,71
 osi_dump/cli.py,sha256=vLijmcrWieCVK4cSLN2sK9ltWlercw9Zg6yBEvZtPkg,6379
 osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/api/neutron.py,sha256=xRhNkEBDzOoUQHSWmkoI_Tdbcs8kvdS0UpPNkzxQv3g,1170
-osi_dump/api/octavia.py,sha256=-8EK16bA93yqvo4YPdP5gh1DjL-pn6CtbO9aBmVPhlc,1061
+osi_dump/api/octavia.py,sha256=F03c9WaQpKbWOjCvFndZYStClfbhaGyYnIxtgqs1bQ0,1137
 osi_dump/api/placement.py,sha256=UvIGwAvowmCLobVARut8WnLVV-IdCDniyW9y16l2B_I,523
 osi_dump/batch_handler/__init__.py,sha256=wsiE42GCjbKgXBzpiahWEDF_-IXCKzr6PyrLn0oEKSc,288
 osi_dump/batch_handler/external_port_batch_handler.py,sha256=iGm0htGbLkpTX5RFPcrvXrVVn0eeTpavN3u4s58Z_pE,1783
@@ -28,7 +28,7 @@ osi_dump/exporter/floating_ip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 osi_dump/exporter/floating_ip/excel_floating_ip_exporter.py,sha256=Bn1yZTvZ8dP3EhVHW-Pr4O9TC2Cz2RbJaz_vRE66xTQ,975
 osi_dump/exporter/floating_ip/floating_ip_exporter.py,sha256=5qh4xS6m1Gfu2N3WcfkEu6U38qtc6oLWAsnNhSwXTCo,169
 osi_dump/exporter/hypervisor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/exporter/hypervisor/excel_hypervisor_exporter.py,sha256=VhZoVjqCky5Sxvx0R9kxj-7O4tLTaPZKVqxyvqe1YLY,964
+osi_dump/exporter/hypervisor/excel_hypervisor_exporter.py,sha256=N81LQR2G4m-w4U6MNNE7zuR-jMxSB1VA7OOuVceJQMA,1020
 osi_dump/exporter/hypervisor/hypervisor_exporter.py,sha256=HS3U-M-iv-ixNLfkGoaGdjdgHXXTBAjgtWQ_OhVY2xQ,167
 osi_dump/exporter/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/image/excel_image_exporter.py,sha256=S_9UScZKI4N8xe8oXjNfnV2Eh7_llg7tOPR7H0hGVnA,853
@@ -62,7 +62,7 @@ osi_dump/importer/floating_ip/floating_ip_importer.py,sha256=2_lCZYF-r2dgdL4Yzws
 osi_dump/importer/floating_ip/openstack_floating_ip_importer.py,sha256=xuALHyiyb4LdRgFN0hZvOx0pImKpGsLUtPWW_1q52gc,2286
 osi_dump/importer/hypervisor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/hypervisor/hypervisor_importer.py,sha256=JuoJBltqFYhH-Ql9TLUPHX2YurS0JFV7Augrc6bDJ5Q,206
-osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=_v9WPEDVxJ6t0OKCCYpz06p5bDR4YB2ySLmijFe7Bg0,4050
+osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=Y2odXpQLjtvdfj9zMbQ-Yi-hqsqBg5sZ8SWjE3O7mdg,3826
 osi_dump/importer/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/image/image_importer.py,sha256=6zwAMnS58S2HGwARwebqf4VE9IBQBv5Ot6nmcn9H4fY,181
 osi_dump/importer/image/openstack_image_importer.py,sha256=ffc13qnIGu07OXnIPaKiVxGdufep82RfQoKqLb1bwHc,2455
@@ -89,7 +89,7 @@ osi_dump/model/authentication_info.py,sha256=02kXxtILfjh8t45_-bPM8rtyRk2cQcJK6l2
 osi_dump/model/external_port.py,sha256=4FlyG8ZmQO7nNdavmRBhK8ZMsNogmhMqEBa03okvqXM,477
 osi_dump/model/flavor.py,sha256=bV1DAL0fMN-bZ0Is7Cd-LLuEdL1ihVPeGcLvbhOcB-I,301
 osi_dump/model/floating_ip.py,sha256=CRJufC5ZaxxcbGvdot7Af-sO8uyKbyQK9zHljfBnyFA,427
-osi_dump/model/hypervisor.py,sha256=asqY5EcjcFRgggUdiPMiEbffT7q7z8_5BwuZk7GBha0,468
+osi_dump/model/hypervisor.py,sha256=QfoXpvR2GqGZrEP63wYFyC2251dxOEM0fo-tJR1pPPA,418
 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=T5RU6gm36ePYCh3KQ_OYO44FHMfxTcSNaiuKP5E_9CY,352
@@ -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=mPWLoVdSg4mukqtX87fN0Q9aDcRicJIqIsIOIIu1PnY,591
+osi_dump/util/openstack_util.py,sha256=vIu3964dEQdwqAcJWzIpQSXlw0eIIZb7wHF_ttHVxt8,590
 osi_dump/util/panda_excel.py,sha256=GHHLguKLMm1sq4FHTPHABTjx7IqpOcGF_3OJT-cJORE,1011
 osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
-osi_dump-0.1.3.1.4.dist-info/METADATA,sha256=oYkhxCIozqxh_-XHsg9ZxL5fZEGaYKw2aeYz-XkKpt4,677
-osi_dump-0.1.3.1.4.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-osi_dump-0.1.3.1.4.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.1.4.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.1.4.dist-info/RECORD,,
+osi_dump-0.1.3.1.5.dist-info/METADATA,sha256=BFKCPciNBOJXee6MzbUz5o2EuknPleTHneRyT2wvnp8,677
+osi_dump-0.1.3.1.5.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+osi_dump-0.1.3.1.5.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.1.5.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.1.5.dist-info/RECORD,,