osi-dump 0.1.2.7__py3-none-any.whl → 0.1.2.9__py3-none-any.whl

osi_dump/importer/external_port/openstack_external_port_importer.py

@@ -9,6 +9,8 @@ import numpy as np
 from openstack.connection import Connection
 from openstack.network.v2.port import Port as OSPort
 from openstack.network.v2.subnet import Subnet as OSSubnet
+from openstack.network.v2.floating_ip import FloatingIP as OSFloatingIP
+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
@@ -108,9 +110,20 @@ class OpenStackExternalPortImporter(ExternalPortImporter):
         except Exception as e:
             logger.warning(f"No subnet cidr found for port {external_port.id}")
 
+        mapped_device_project = ["network:floatingip", "network:router_gateway"]
+
+        project_id = (
+            external_port.project_id
+            if external_port.device_owner not in mapped_device_project
+            else self._map_project_id(
+                device_owner=external_port.device_owner,
+                device_id=external_port.device_id,
+            )
+        )
+
         external_port_ret = ExternalPort(
             port_id=external_port.id,
-            project_id=external_port.project_id,
+            project_id=project_id,
             network_id=external_port.network_id,
             subnet_id=subnet_id,
             subnet_cidr=subnet_cidr,
@@ -122,3 +135,22 @@ class OpenStackExternalPortImporter(ExternalPortImporter):
         )
 
         return external_port_ret
+
+    def _map_project_id(self, device_owner: str, device_id: str) -> str:
+
+        if device_owner == "network:router_gateway":
+            return self._map_project_id_router(device_id=device_id)
+        elif device_owner == "network:floatingip":
+            return self._map_project_id_floating(device_id=device_id)
+
+        return ""
+
+    def _map_project_id_router(self, device_id: str) -> str:
+        router: OSRouter = self.connection.get_router(name_or_id=device_id)
+
+        return router.project_id
+
+    def _map_project_id_floating(self, device_id: str) -> str:
+        floating_ip: OSFloatingIP = self.connection.get_floating_ip(id=device_id)
+
+        return floating_ip.project_id

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

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

{osi_dump-0.1.2.7.dist-info → osi_dump-0.1.2.9.dist-info}/RECORD

@@ -52,7 +52,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=F_tHT70rfIHZO0kK8x80ym-zDDh-oztRPCJySFflxGQ,3876
+osi_dump/importer/external_port/openstack_external_port_importer.py,sha256=RC2_ren_62oFPNJS_mkfVAuN_Yyt8JJBkxgewummWQs,5071
 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
@@ -89,7 +89,7 @@ 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/image.py,sha256=5dXlBsiT0BWo5orQj38jEGtiFEwiRCJDmdhghg3RcTc,504
 osi_dump/model/instance.py,sha256=DSQ0F0CTHL0f_GMZ4GwH2D-Q_KvRmrNyCWTpCzDlqBs,494
 osi_dump/model/load_balancer.py,sha256=T5RU6gm36ePYCh3KQ_OYO44FHMfxTcSNaiuKP5E_9CY,352
 osi_dump/model/project.py,sha256=3fNsDcWxuRVBS96W98C_Fia82qt14InjUM7n7rBCX6E,679
@@ -106,8 +106,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.7.dist-info/METADATA,sha256=DAVAiuD-M_6yn5a8NsXapT3J8Q7D5bMFghND7-IY6ys,675
-osi_dump-0.1.2.7.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-osi_dump-0.1.2.7.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.2.7.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.2.7.dist-info/RECORD,,
+osi_dump-0.1.2.9.dist-info/METADATA,sha256=wKSCwOTVb8CW-3s1qjjvcFZrI2uxFkpKkRJltfSUTok,675
+osi_dump-0.1.2.9.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+osi_dump-0.1.2.9.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.2.9.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.2.9.dist-info/RECORD,,