osi-dump 0.1.3.1__tar.gz → 0.1.3.1.2__tar.gz

{osi_dump-0.1.3.1 → osi_dump-0.1.3.1.2}/PKG-INFO

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

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

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

@@ -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