osi-dump 0.1.3.1.6__py3-none-any.whl → 0.1.3.1.8__py3-none-any.whl

osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -59,7 +59,7 @@ class OpenStackHypervisorImporter(HypervisorImporter):
     def _get_hypervisor_info(
         self, hypervisor: OSHypervisor, aggregates: list[OSAggregate]
     ) -> Hypervisor:
-        aggregate_list = self._get_aggregates(hypervisor=hypervisor)
+        aggregate_list, az = self._get_aggregates(hypervisor=hypervisor)
 
         placement_proxy: PlacementProxy = self.connection.placement
 
@@ -89,6 +89,7 @@ class OpenStackHypervisorImporter(HypervisorImporter):
             local_disk_usage=usage_data["DISK_GB"],
             vm_count=len(hypervisor.servers),
             aggregates=aggregate_list,
+            availability_zone=az,
         )
 
         return ret_hypervisor
@@ -98,18 +99,21 @@ class OpenStackHypervisorImporter(HypervisorImporter):
 
         aggregates: OSAggregate = list(self.connection.list_aggregates())
 
+        az = None
+
         for aggregate in aggregates:
             if hypervisor.name in aggregate.hosts:
                 aggregates_ret.append(
                     {
                         "id": aggregate.id,
                         "name": aggregate.name,
-                        "availability_zone": aggregate.availability_zone,
                     }
                 )
 
+                az = aggregate.availability_zone
+
         aggregates_ret = [
             dict(sorted(aggregate.items())) for aggregate in aggregates_ret
         ]
 
-        return aggregates_ret
+        return aggregates_ret, az

osi_dump/model/hypervisor.py

@@ -19,5 +19,6 @@ class Hypervisor(BaseModel):
     local_disk_size: int
 
     aggregates: Optional[list[dict]]  # id, name, az
+    availability_zone: Optional[str]
 
     vm_count: int

osi_dump/util/panda_excel.py

@@ -18,14 +18,7 @@ def expand_list_column(df, column):
     # Flatten the nested dictionaries into separate columns
     expanded_df = pd.json_normalize(expanded_df.to_dict(orient="records"))
 
-    new_columns = []
-    for i in range(max_len):
-        for key in expanded_df.columns[i::max_len]:
-            new_key = key.split(".")[-1]  # Get the actual key name
-            new_columns.append(f"{column}_{i+1}.{new_key}")
-
-    # Rename the columns to reflect the nested structure
-    expanded_df.columns = new_columns
+    expanded_df = expanded_df.add_prefix(column)
 
     # Drop the original column and join the expanded columns
     df = df.drop(column, axis=1).join(expanded_df)

{osi_dump-0.1.3.1.6.dist-info → osi_dump-0.1.3.1.8.dist-info}/METADATA

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

{osi_dump-0.1.3.1.6.dist-info → osi_dump-0.1.3.1.8.dist-info}/RECORD

@@ -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=Y2odXpQLjtvdfj9zMbQ-Yi-hqsqBg5sZ8SWjE3O7mdg,3826
+osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=2ZogcGmxRY8mhlrBn2YTIbP-Uw8pNWMC1ggzCMYBqxs,3863
 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=QfoXpvR2GqGZrEP63wYFyC2251dxOEM0fo-tJR1pPPA,418
+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=ixJUGMsNAsWIRSXXHZ2fHA9Wr1wPYZONyEhS75wfQp8,577
 osi_dump/model/load_balancer.py,sha256=T5RU6gm36ePYCh3KQ_OYO44FHMfxTcSNaiuKP5E_9CY,352
@@ -106,10 +106,10 @@ osi_dump/util/excel_sort_sheet.py,sha256=o4jXtP1ZFYtAGzkAP5S8Tym4h-SEoFBAI3j24y-
 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/panda_excel.py,sha256=GHHLguKLMm1sq4FHTPHABTjx7IqpOcGF_3OJT-cJORE,1011
+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.1.6.dist-info/METADATA,sha256=uxdStaObiBhZVLiVJMkC03t8LF-0E182pMpwSY9_Oxc,677
-osi_dump-0.1.3.1.6.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-osi_dump-0.1.3.1.6.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.1.6.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.1.6.dist-info/RECORD,,
+osi_dump-0.1.3.1.8.dist-info/METADATA,sha256=LWlloVXpcgTsnLoCiMlfAM3tO3HptXDvNkwYHeuZ87Q,677
+osi_dump-0.1.3.1.8.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+osi_dump-0.1.3.1.8.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.1.8.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.1.8.dist-info/RECORD,,