osi-dump 0.1.3.1__py3-none-any.whl → 0.1.3.1.2__py3-none-any.whl

osi_dump/api/octavia.py

@@ -26,7 +26,7 @@ def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
         connection=connection, service_type="load-balancer", interface="public"
     )
 
-    url = f"{octavia_endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id"
+    url = f"{octavia_endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id&fields=compute_flavor"
 
     response = connection.session.get(url)
 

osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -4,6 +4,7 @@ import concurrent
 
 from openstack.connection import Connection
 from openstack.compute.v2.hypervisor import Hypervisor as OSHypervisor
+from openstack.compute.v2.aggregate import Aggregate as OSAggregate
 
 from openstack.placement.v1._proxy import Proxy as PlacementProxy
 from openstack.placement.v1.resource_provider_inventory import ResourceProviderInventory
@@ -29,6 +30,7 @@ class OpenStackHypervisorImporter(HypervisorImporter):
         Returns:
             list[Hypervisor]: _description_
         """
+        aggregates = list(self.connection.list_aggregates())
 
         try:
             oshypervisors: list[OSHypervisor] = list(
@@ -44,7 +46,7 @@ class OpenStackHypervisorImporter(HypervisorImporter):
 
         with concurrent.futures.ThreadPoolExecutor() as executor:
             futures = [
-                executor.submit(self._get_hypervisor_info, hypervisor)
+                executor.submit(self._get_hypervisor_info, hypervisor, aggregates)
                 for hypervisor in oshypervisors
             ]
             for future in concurrent.futures.as_completed(futures):
@@ -54,7 +56,19 @@ class OpenStackHypervisorImporter(HypervisorImporter):
 
         return hypervisors
 
-    def _get_hypervisor_info(self, hypervisor: OSHypervisor) -> Hypervisor:
+    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
 
         placement_proxy: PlacementProxy = self.connection.placement
 
@@ -83,6 +97,18 @@ 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,
         )
 
         return ret_hypervisor
+
+    def _get_aggregate(self, hypervisor: OSHypervisor) -> OSAggregate:
+        aggregates = list(self.connection.list_aggregates())
+
+        for aggregate in aggregates:
+            if hypervisor.name in aggregate.hosts:
+                return aggregate
+
+        return None

osi_dump/importer/instance/openstack_instance_importer.py

@@ -123,6 +123,7 @@ class OpenStackInstanceImporter(InstanceImporter):
             vcpus=server.flavor["vcpus"],
             created_at=server.created_at,
             updated_at=server.updated_at,
+            user_id=server.user_id,
             vgpus=vgpus,
             vgpu_type=vgpu_type,
         )

osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -61,6 +61,11 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
             connection=self.connection, load_balancer_id=load_balancer["id"]
         )
 
+        for amphorae in amphoraes:
+            flavor = self.connection.get_flavor_by_id(amphorae["compute_flavor"])
+            amphorae["ram"] = flavor.ram
+            amphorae["vcpus"] = flavor.vcpus
+
         load_balancer_ret = LoadBalancer(
             id=load_balancer["id"],
             load_balancer_name=load_balancer["name"],

osi_dump/importer/volume/openstack_volume_importer.py

@@ -67,6 +67,7 @@ class OpenStackVolumeImporter(VolumeImporter):
 
         ret_volume = Volume(
             volume_id=volume.id,
+            volume_name=volume.name,
             project_id=volume.project_id,
             status=volume.status,
             attachments=[att["server_id"] for att in volume.attachments],

osi_dump/model/flavor.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel, ConfigDict, ValidationError
+from pydantic import BaseModel, ConfigDict
 
 
 class Flavor(BaseModel):

osi_dump/model/hypervisor.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from pydantic import BaseModel, ConfigDict, ValidationError
 
 
@@ -17,4 +18,8 @@ class Hypervisor(BaseModel):
     local_disk_usage: int
     local_disk_size: int
 
+    availability_zone: Optional[str]
+    aggregate_name: Optional[str]
+    aggregate_id: Optional[str]
+
     vm_count: int

osi_dump/model/instance.py

@@ -19,5 +19,8 @@ class Instance(BaseModel):
     vgpus: Optional[int]
     vgpu_type: Optional[str]
     hypervisor: Optional[str]
+
+    user_id: Optional[str]
+
     created_at: str
     updated_at: str

osi_dump/model/router.py

@@ -6,6 +6,8 @@ from pydantic import BaseModel, ConfigDict, ValidationError
 class Router(BaseModel):
     model_config = ConfigDict(strict=True)
 
+    project_id: Optional[str]
+
     router_id: str
 
     name: Optional[str]
@@ -16,7 +18,6 @@ class Router(BaseModel):
     admin_state: Optional[bool]
 
     status: str
-    project_id: Optional[str]
 
     created_at: Optional[str]
     updated_at: Optional[str]

osi_dump/model/volume.py

@@ -10,6 +10,8 @@ class Volume(BaseModel):
 
     project_id: Optional[str]
 
+    volume_name: Optional[str]
+
     attachments: Optional[list[str]]
 
     status: str

osi_dump/util/openstack_util.py

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

{osi_dump-0.1.3.1.dist-info → osi_dump-0.1.3.1.2.dist-info}/METADATA

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

{osi_dump-0.1.3.1.dist-info → osi_dump-0.1.3.1.2.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=sOFoH89knyuI_gkIxvHfjuZ9mCFzc4zBw8GHN_kb794,1039
+osi_dump/api/octavia.py,sha256=-8EK16bA93yqvo4YPdP5gh1DjL-pn6CtbO9aBmVPhlc,1061
 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
@@ -62,16 +62,16 @@ 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=82lSo5cMdvMQ9snU_eIVNOsHp5cT5v8Sf9xSEGZfBzg,2870
+osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=SZr1m2P--FYPmTBQ9dXzLgxTfJgpmURWevV9aokjGyI,3785
 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
 osi_dump/importer/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIBPBwwANpEaWCgRsgImc,196
-osi_dump/importer/instance/openstack_instance_importer.py,sha256=o5ld1weNM8X4ibZMQYhfhckTkea5TqVEsG4Zs0q2T90,4049
+osi_dump/importer/instance/openstack_instance_importer.py,sha256=bvDZdwkxBZl40shIHAQ0QOkRcZEkWaeksROF7DZ5syA,4085
 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=sX5ZMHT-QPIuAD4YBwitxj8l5fMvbOsA-BOQxLL84lU,2392
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=9yj60y4MEIHV10e9tStR2B7S0LAOR-jzd4BSshLbG-8,2596
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/project/openstack_project_importer.py,sha256=K8Si2uaC88L2CxXi68A4ML9mlWKwnZp1ABDiufFUZ8g,2988
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
@@ -82,21 +82,21 @@ osi_dump/importer/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 osi_dump/importer/router/openstack_router_importer.py,sha256=T_Wr45nJrCcp2OOdRawmdQkNBDzczA-3DPx9dlewd4g,2781
 osi_dump/importer/router/router_importer.py,sha256=L2i0Fnh3iZEsP_PFtx1j0yWTpkmgHsc6Pobii8lDRCo,186
 osi_dump/importer/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/volume/openstack_volume_importer.py,sha256=Tte9fX91oxEoRcUZPJd7g6oH6izcWy8WwFCapg_ZY1M,2454
+osi_dump/importer/volume/openstack_volume_importer.py,sha256=XmTa0FP8VUmnOofVEkaHQEAQUNfa7ODO4kV9SfKPui4,2491
 osi_dump/importer/volume/volume_importer.py,sha256=tmDTE9L9vtl75GR79blSxa_MVsRU6LDCbR0yJk0xKwo,186
 osi_dump/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/model/authentication_info.py,sha256=02kXxtILfjh8t45_-bPM8rtyRk2cQcJK6l2d1bPih7k,257
 osi_dump/model/external_port.py,sha256=4FlyG8ZmQO7nNdavmRBhK8ZMsNogmhMqEBa03okvqXM,477
-osi_dump/model/flavor.py,sha256=-G8FaH_qiVrgtRxAWhdpC1c9FRdXLRroG-WJ03-DRZ4,318
+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=pToa-rg7LldKd-h3aNZDJQPy5dhYDIXehq-tr8_xv1I,336
+osi_dump/model/hypervisor.py,sha256=NNvOl-msUhPSEJ3kpV4h7XNsdBybaHOqvJEMy17FNWg,468
 osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
-osi_dump/model/instance.py,sha256=z38nK0s5bmZXRMItJVsnZ1rQX6NO6skXR49ZojgSb2Q,548
+osi_dump/model/instance.py,sha256=ixJUGMsNAsWIRSXXHZ2fHA9Wr1wPYZONyEhS75wfQp8,577
 osi_dump/model/load_balancer.py,sha256=T5RU6gm36ePYCh3KQ_OYO44FHMfxTcSNaiuKP5E_9CY,352
 osi_dump/model/project.py,sha256=3fNsDcWxuRVBS96W98C_Fia82qt14InjUM7n7rBCX6E,679
 osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
-osi_dump/model/router.py,sha256=bT533cP50XrzPzwbkXwjdnmm5j5nM8jVEIqmfJ2T8G8,416
-osi_dump/model/volume.py,sha256=CPlZ2NUKLZ2QI-WYNcxFrpd2kYEHPITpCztdGRGBHgM,391
+osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
+osi_dump/model/volume.py,sha256=C1WdZ_GwlL-iaBqrFpgPMfIQZj3ST2KQHzwXceYxRZg,423
 osi_dump/os_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/os_connection/get_connections.py,sha256=1zeir4cEtzJOUOn53zUmlD9lWMvYXhuRr0IhI5U1DAw,1753
 osi_dump/util/__init__.py,sha256=obJLcem8iWbVC3NIk4GHBMwwAsW-FcrwRdfzphuDjpY,330
@@ -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=QduDfMiBh-ZdHmFkSK9XI0kZWVL-8rR1D6iAvI7CO0I,544
+osi_dump/util/openstack_util.py,sha256=mPWLoVdSg4mukqtX87fN0Q9aDcRicJIqIsIOIIu1PnY,591
 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.dist-info/METADATA,sha256=ZUpqpd-1QxXiRB6EtBSWPt-rik8t1U6Ti_O8kobHjCM,675
-osi_dump-0.1.3.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-osi_dump-0.1.3.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.1.dist-info/RECORD,,
+osi_dump-0.1.3.1.2.dist-info/METADATA,sha256=pLbq5ExaJuIo9Y0dQm6MKjvedPTSFz43N5bOoKrIZD0,677
+osi_dump-0.1.3.1.2.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+osi_dump-0.1.3.1.2.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.1.2.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.1.2.dist-info/RECORD,,

{osi_dump-0.1.3.1.dist-info → osi_dump-0.1.3.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any