osi-dump 0.1.2.8__py3-none-any.whl → 0.1.3__py3-none-any.whl

osi_dump/api/neutron.py

@@ -0,0 +1,42 @@
+import logging
+
+from openstack.connection import Connection
+from openstack.identity.v3.service import Service
+from openstack.load_balancer.v2.load_balancer import LoadBalancer
+
+logger = logging.getLogger(__name__)
+
+
+def get_floating_ip_project(connection: Connection, floating_ip_id: str):
+    neutron_endpoint = connection.endpoint_for(
+        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):
+    octavia_endpoint = connection.endpoint_for(
+        service_type="network", interface="internal"
+    )
+
+    try:
+        url = f"{octavia_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/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/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,28 @@ 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:
+            logger.warning(
+                f"Unable to obtain GPU information for instance {server.name}: {e}"
+            )
+
         instance = Instance(
             instance_id=server.id,
             instance_name=server.name,
@@ -101,6 +125,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/model/image.py

@@ -12,7 +12,7 @@ class Image(BaseModel):
     min_disk: int
     min_ram: int
     image_name: Optional[str]
-    owner: str
+    owner: Optional[str]
 
     os_distro: Optional[str]
     properties: Optional[dict]

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.8.dist-info → osi_dump-0.1.3.dist-info}/METADATA

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

{osi_dump-0.1.2.8.dist-info → osi_dump-0.1.3.dist-info}/RECORD

@@ -2,6 +2,7 @@ osi_dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=m3pfDbwbE4sWKMYOWPiFDK4PsCHxiJmn4QWu29vvcYw,1082
 osi_dump/api/octavia.py,sha256=_vuuZ-Pcj4oV1A3Sf_RSiuc_UxcHXKLty87HEyipPGg,950
 osi_dump/api/placement.py,sha256=9yADLulo1HfUnPLE7IJt4ZY8e2jRTaoeV4J4MMiKCew,455
 osi_dump/batch_handler/__init__.py,sha256=wsiE42GCjbKgXBzpiahWEDF_-IXCKzr6PyrLn0oEKSc,288
@@ -52,7 +53,7 @@ osi_dump/exporter/volume/excel_volume_exporter.py,sha256=BhesTGXMQF3BAwHgJMYfnxF
 osi_dump/exporter/volume/volume_exporter.py,sha256=YoPvytC0ctWeWwVcG6pb0XwkF4N0QcGAoUHa3QldkEg,155
 osi_dump/importer/external_port/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/external_port/external_port_importer.py,sha256=mLFNwjaYiUNk3DO74GUCXC1eCaWbymGjKJKex3O2z-U,218
-osi_dump/importer/external_port/openstack_external_port_importer.py,sha256=RC2_ren_62oFPNJS_mkfVAuN_Yyt8JJBkxgewummWQs,5071
+osi_dump/importer/external_port/openstack_external_port_importer.py,sha256=lAcNOZA_dlFU4ncrRf_07GaA25PP61ynEwrj1r0Xau8,5172
 osi_dump/importer/flavor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/flavor/flavor_importer.py,sha256=IfU2L8N8EO4eESnEDirwe9U-GXSTuTcsdrlDxD95tcQ,186
 osi_dump/importer/flavor/openstack_flavor_importer.py,sha256=y3uFCls7H-l1tu11T_PaEoWghhdxINsf7baRAShXC1w,1876
@@ -67,7 +68,7 @@ osi_dump/importer/image/image_importer.py,sha256=6zwAMnS58S2HGwARwebqf4VE9IBQBv5
 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=hTCdrTvY-hsjXb15gDmpKaKTjJJACUVSRahvHsDOi38,3445
+osi_dump/importer/instance/openstack_instance_importer.py,sha256=FJqVnow-RdI8RI9geJ-E4teo_HTuQALupeFrK8HtUmc,4158
 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
@@ -89,8 +90,8 @@ osi_dump/model/external_port.py,sha256=4FlyG8ZmQO7nNdavmRBhK8ZMsNogmhMqEBa03okvq
 osi_dump/model/flavor.py,sha256=-G8FaH_qiVrgtRxAWhdpC1c9FRdXLRroG-WJ03-DRZ4,318
 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/image.py,sha256=bCwxdldJC7XpCJZ6Se6kIcQlc3qSRQHTxgr0bYVaRFQ,494
-osi_dump/model/instance.py,sha256=DSQ0F0CTHL0f_GMZ4GwH2D-Q_KvRmrNyCWTpCzDlqBs,494
+osi_dump/model/image.py,sha256=5dXlBsiT0BWo5orQj38jEGtiFEwiRCJDmdhghg3RcTc,504
+osi_dump/model/instance.py,sha256=z38nK0s5bmZXRMItJVsnZ1rQX6NO6skXR49ZojgSb2Q,548
 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
@@ -106,8 +107,8 @@ osi_dump/util/export_data_excel.py,sha256=VYSxDBZ7dgSbTj3n_8RRPqe183tILNh6wJW-Un
 osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo_AR0,111
 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.2.8.dist-info/METADATA,sha256=TetFO-4khPfpf8YoS1mYTn-xpfCELJl-qcMdZ3F9Fso,675
-osi_dump-0.1.2.8.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-osi_dump-0.1.2.8.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.2.8.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.2.8.dist-info/RECORD,,
+osi_dump-0.1.3.dist-info/METADATA,sha256=MaY9IAfpGuRL54svZNwYrkCRQeWsvTxECZr4Rkl056g,673
+osi_dump-0.1.3.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
+osi_dump-0.1.3.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.dist-info/RECORD,,

{osi_dump-0.1.2.8.dist-info → osi_dump-0.1.3.dist-info}/WHEEL

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