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

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

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

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/pyproject.toml

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

osi_dump-0.1.3.1/src/osi_dump/api/neutron.py

@@ -0,0 +1,44 @@
+import logging
+
+from openstack.connection import Connection
+from openstack.identity.v3.service import Service
+from openstack.load_balancer.v2.load_balancer import LoadBalancer
+
+import osi_dump.util.openstack_util as os_util
+
+logger = logging.getLogger(__name__)
+
+
+def get_floating_ip_project(connection: Connection, floating_ip_id: str):
+    neutron_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="network", interface="public"
+    )
+
+    try:
+        url = f"{neutron_endpoint}/v2.0/floatingips/{floating_ip_id}?fields=project_id"
+        response = connection.session.get(url)
+
+    except Exception as e:
+        print(e)
+
+    data = response.json()
+
+    return data["floatingip"]["project_id"]
+
+
+def get_router_project(connection: Connection, router_id: str):
+    neutron_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="network", interface="internal"
+    )
+
+    try:
+        url = f"{neutron_endpoint}/v2.0/routers/{router_id}?fields=project_id"
+
+        response = connection.session.get(url)
+
+    except Exception as e:
+        print(e)
+
+    data = response.json()
+
+    return data["router"]["project_id"]

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/api/octavia.py

@@ -3,9 +3,12 @@ from openstack.identity.v3.service import Service
 from openstack.load_balancer.v2.load_balancer import LoadBalancer
 
 
+import osi_dump.util.openstack_util as os_util
+
+
 def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
-    octavia_endpoint = connection.endpoint_for(
-        service_type="load-balancer", interface="public"
+    octavia_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="load-balancer", interface="public"
     )
 
     url = f"{octavia_endpoint}/v2.0/lbaas/loadbalancers"
@@ -19,8 +22,8 @@ def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
 
 def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
 
-    octavia_endpoint = connection.endpoint_for(
-        service_type="load-balancer", interface="public"
+    octavia_endpoint = os_util.get_endpoint(
+        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"

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/api/placement.py

@@ -1,11 +1,13 @@
 from openstack.connection import Connection
 from openstack.identity.v3.service import Service
 
+import osi_dump.util.openstack_util as os_util
+
 
 def get_usage(connection: Connection, resource_provider_id: str):
 
-    placement_endpoint = connection.endpoint_for(
-        service_type="placement", interface="public"
+    placement_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="placement", interface="public"
     )
 
     url = f"{placement_endpoint}/resource_providers/{resource_provider_id}/usages"

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/importer/external_port/openstack_external_port_importer.py

@@ -15,6 +15,8 @@ from openstack.network.v2.router import Router as OSRouter
 from osi_dump.importer.external_port.external_port_importer import ExternalPortImporter
 from osi_dump.model.external_port import ExternalPort
 
+import osi_dump.api.neutron as osi_neutron
+
 logger = logging.getLogger(__name__)
 
 
@@ -146,11 +148,15 @@ class OpenStackExternalPortImporter(ExternalPortImporter):
         return ""
 
     def _map_project_id_router(self, device_id: str) -> str:
-        router: OSRouter = self.connection.get_router(name_or_id=device_id)
+        project_id = osi_neutron.get_router_project(
+            self.connection, router_id=device_id
+        )
 
-        return router.project_id
+        return project_id
 
     def _map_project_id_floating(self, device_id: str) -> str:
-        floating_ip: OSFloatingIP = self.connection.get_floating_ip(id=device_id)
+        project_id = osi_neutron.get_floating_ip_project(
+            self.connection, floating_ip_id=device_id
+        )
 
-        return floating_ip.project_id
+        return project_id

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/importer/instance/openstack_instance_importer.py

@@ -5,6 +5,8 @@ import concurrent
 from openstack.connection import Connection
 from openstack.compute.v2.server import Server
 
+from openstack.compute.v2.flavor import Flavor as OSFlavor
+
 from osi_dump.importer.instance.instance_importer import InstanceImporter
 from osi_dump.model.instance import Instance
 
@@ -87,6 +89,26 @@ class OpenStackInstanceImporter(InstanceImporter):
                 f"Unable to obtain IP address information for instance {server.name}: {e}"
             )
 
+        vgpus = None
+        vgpu_type = None
+
+        vgpu_metadata_property = "pci_passthrough:alias"
+
+        try:
+            flavor: OSFlavor = self.connection.get_flavor(
+                name_or_id=server.flavor["id"]
+            )
+
+            vgpu_prop: str = flavor.extra_specs[vgpu_metadata_property]
+
+            vgpu_props = vgpu_prop.split(":")
+
+            vgpu_type = vgpu_props[0]
+            vgpus = int(vgpu_props[1])
+
+        except Exception as e:
+            pass
+
         instance = Instance(
             instance_id=server.id,
             instance_name=server.name,
@@ -101,6 +123,8 @@ class OpenStackInstanceImporter(InstanceImporter):
             vcpus=server.flavor["vcpus"],
             created_at=server.created_at,
             updated_at=server.updated_at,
+            vgpus=vgpus,
+            vgpu_type=vgpu_type,
         )
 
         return instance

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/importer/router/openstack_router_importer.py

@@ -78,6 +78,7 @@ class OpenStackRouterImporter(RouterImporter):
             external_net_id=external_net_id,
             external_net_ip=external_net_ip,
             status=router.status,
+            admin_state=router.is_admin_state_up,
             project_id=router.project_id,
             created_at=router.created_at,
             updated_at=router.updated_at,

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/model/image.py

@@ -23,5 +23,5 @@ class Image(BaseModel):
     virtual_size: Optional[int]
     visibility: str
 
-    created_at: str
-    updated_at: str
+    created_at: Optional[str]
+    updated_at: Optional[str]

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/model/instance.py

@@ -16,6 +16,8 @@ class Instance(BaseModel):
     status: str
     ram: int
     vcpus: int
+    vgpus: Optional[int]
+    vgpu_type: Optional[str]
     hypervisor: Optional[str]
     created_at: str
     updated_at: str

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/model/router.py

@@ -13,8 +13,10 @@ class Router(BaseModel):
     external_net_id: Optional[str]
     external_net_ip: Optional[str]
 
+    admin_state: Optional[bool]
+
     status: str
     project_id: Optional[str]
 
-    created_at: str
-    updated_at: str
+    created_at: Optional[str]
+    updated_at: Optional[str]

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump/model/volume.py

@@ -19,5 +19,5 @@ class Volume(BaseModel):
 
     snapshots: Optional[list[str]]
 
-    updated_at: str
-    created_at: str
+    updated_at: Optional[str]
+    created_at: Optional[str]

osi_dump-0.1.3.1/src/osi_dump/util/openstack_util.py

@@ -0,0 +1,20 @@
+import urllib
+import urllib.parse
+
+from openstack.connection import Connection
+
+
+def get_endpoint(connection: Connection, service_type: str, interface: str) -> str:
+    endpoint = connection.endpoint_for(service_type=service_type, interface=interface)
+
+    parsed_endpoint = urllib.parse.urlparse(endpoint)
+
+    new_hostname = urllib.parse.urlparse(connection.auth["auth_url"]).hostname
+
+    port = parsed_endpoint.port
+
+    ret = urllib.parse.urlunparse(
+        parsed_endpoint._replace(netloc=f"{new_hostname}:{port}")
+    )
+
+    return ret

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump.egg-info/PKG-INFO

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

{osi_dump-0.1.2.9 → osi_dump-0.1.3.1}/src/osi_dump.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/osi_dump.egg-info/entry_points.txt
 src/osi_dump.egg-info/requires.txt
 src/osi_dump.egg-info/top_level.txt
 src/osi_dump/api/__init__.py
+src/osi_dump/api/neutron.py
 src/osi_dump/api/octavia.py
 src/osi_dump/api/placement.py
 src/osi_dump/batch_handler/__init__.py
@@ -112,5 +113,6 @@ src/osi_dump/util/excel_autosize_column.py
 src/osi_dump/util/excel_sort_sheet.py
 src/osi_dump/util/export_data_excel.py
 src/osi_dump/util/extract_hostname.py
+src/osi_dump/util/openstack_util.py
 src/osi_dump/util/panda_excel.py
 src/osi_dump/util/validate_dir_path.py