osi-dump 0.1.3.2.6__py3-none-any.whl → 0.1.3.2.8__py3-none-any.whl

osi_dump/importer/external_port/openstack_external_port_importer.py

@@ -11,6 +11,7 @@ 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 openstack.network.v2.network import Network as OSNetwork
 
 from osi_dump.importer.external_port.external_port_importer import ExternalPortImporter
 from osi_dump.model.external_port import ExternalPort
@@ -122,7 +123,19 @@ class OpenStackExternalPortImporter(ExternalPortImporter):
                 device_id=external_port.device_id,
             )
         )
-
+        
+        network: OSNetwork = self.connection.get_network(name_or_id=external_port.network_id)
+
+        vlan_id = None
+        
+        try: 
+            if not network.segments: 
+                vlan_id = network.provider_segmentation_id
+            else: 
+                logger.warning(f"Multiple segments mapped for net id {network.id}")
+        except Exception as e: 
+            logger.warning(f"Can not get vlan ID for external port {external_port.id}, net id {network.id}")
+        
         external_port_ret = ExternalPort(
             port_id=external_port.id,
             project_id=project_id,
@@ -134,6 +147,7 @@ class OpenStackExternalPortImporter(ExternalPortImporter):
             device_id=external_port.device_id,
             device_owner=external_port.device_owner,
             status=external_port.status,
+            vlan_id=vlan_id
         )
 
         return external_port_ret

osi_dump/importer/instance/openstack_instance_importer.py

@@ -108,7 +108,10 @@ class OpenStackInstanceImporter(InstanceImporter):
 
         except Exception as e:
             pass
-
+        
+        image_id = server.image["id"]
+        flavor_id = server.flavor["id"]
+        
         instance = Instance(
             instance_id=server.id,
             instance_name=server.name,
@@ -126,6 +129,8 @@ class OpenStackInstanceImporter(InstanceImporter):
             user_id=server.user_id,
             vgpus=vgpus,
             vgpu_type=vgpu_type,
+            image_id=image_id, 
+            flavor_id=flavor_id
         )
 
         return instance

osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -52,31 +52,39 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
                     futures.append(executor.submit(self._get_load_balancer_info, load_balancer))
             
             for future in concurrent.futures.as_completed(futures):
-                load_balancers.append(future.result())
+                result = future.result() 
+                
+                if result != None: 
+                    load_balancers.append(result)
 
         logger.info(f"Imported load_balancers for {self.connection.auth['auth_url']}")
 
         return load_balancers
 
     def _get_load_balancer_info(self, load_balancer: OSLoadBalancer) -> LoadBalancer:
-        amphoraes = octavia_api.get_amphoraes(
-            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"],
-            operating_status=load_balancer["operating_status"],
-            project_id=load_balancer["project_id"],
-            provisioning_status=load_balancer["provisioning_status"],
-            created_at=load_balancer["created_at"],
-            updated_at=load_balancer["updated_at"],
-            amphoraes=amphoraes,
-        )
-
-        return load_balancer_ret
+        try: 
+            amphoraes = octavia_api.get_amphoraes(
+                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"],
+                operating_status=load_balancer["operating_status"],
+                project_id=load_balancer["project_id"],
+                provisioning_status=load_balancer["provisioning_status"],
+                created_at=load_balancer["created_at"],
+                updated_at=load_balancer["updated_at"],
+                amphoraes=amphoraes,
+            )
+
+            return load_balancer_ret
+        except Exception as e: 
+            logger.warning(f"Getting lb failed {e}")
+            
+            return None

osi_dump/model/external_port.py

@@ -25,3 +25,5 @@ class ExternalPort(BaseModel):
     device_owner: Optional[str]
 
     status: Optional[str]
+    
+    vlan_id: Optional[str]

osi_dump/model/instance.py

@@ -21,6 +21,9 @@ class Instance(BaseModel):
     hypervisor: Optional[str]
 
     user_id: Optional[str]
+    
+    image_id: Optional[str]
+    flavor_id: Optional[str]
 
     created_at: str
     updated_at: str

{osi_dump-0.1.3.2.6.dist-info → osi_dump-0.1.3.2.8.dist-info}/METADATA

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

{osi_dump-0.1.3.2.6.dist-info → osi_dump-0.1.3.2.8.dist-info}/RECORD

@@ -53,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=lAcNOZA_dlFU4ncrRf_07GaA25PP61ynEwrj1r0Xau8,5172
+osi_dump/importer/external_port/openstack_external_port_importer.py,sha256=iTIUd0jpsROCtPJyQ0L8iL4Z-O_mQWfach_mNa8KiXA,5761
 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
@@ -68,10 +68,10 @@ 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=bvDZdwkxBZl40shIHAQ0QOkRcZEkWaeksROF7DZ5syA,4085
+osi_dump/importer/instance/openstack_instance_importer.py,sha256=D-Q9AIN81g2GW-SRWpKxBeagxvJvhN_AumSt5WGQrEc,4244
 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=XCE5MYIaOqcv-j4XmyHJkgjXgzGLbwhrC-AJGvToUrA,2858
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=8Wa-obk9WygQ-4G5aNqa6yhIPyjTxc__vDq9Ix5TC8E,3156
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/project/openstack_project_importer.py,sha256=ylcm3jEFqh4gW8vhzhIaBq5v4A-PV3BaaogC8uHlSkg,3295
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
@@ -86,12 +86,12 @@ osi_dump/importer/volume/openstack_volume_importer.py,sha256=XmTa0FP8VUmnOofVEka
 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/external_port.py,sha256=ytro2BQsCnorATXlbGbPJCgdZaTxE76WXSBjlzmpDhI,509
 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=6dWEMVrrjOQolX936FqY994S7RAXpMPATpsLPVNeCyk,455
 osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
-osi_dump/model/instance.py,sha256=ixJUGMsNAsWIRSXXHZ2fHA9Wr1wPYZONyEhS75wfQp8,577
+osi_dump/model/instance.py,sha256=8puhIKWWfoAaTURXb7XUpjG0lQ4nb0UwrsrTQdDaFbs,639
 osi_dump/model/load_balancer.py,sha256=x8mTvdXa5FmuJLwx4qu2DJqPQISoO-0A3a76Ki_jy34,413
 osi_dump/model/project.py,sha256=_mMaKKM9RQYiorh6zWMrC_WJ3x9RxhZxn4lLa_B3niY,710
 osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
@@ -108,8 +108,8 @@ osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo
 osi_dump/util/openstack_util.py,sha256=_o8LiRmQKtxQ8hU3rbrMNwIAxt0-aWD2rjq-NvVdK9E,1299
 osi_dump/util/panda_excel.py,sha256=owr8AffIxqN3yY8kIv55Ox4j2dRz7kXZvSZFZeft8dw,734
 osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
-osi_dump-0.1.3.2.6.dist-info/METADATA,sha256=ai9ioSzsiH59GpJ25t5DCZc3vOhGRATb0oGzlDRuwiE,677
-osi_dump-0.1.3.2.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-osi_dump-0.1.3.2.6.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.2.6.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.2.6.dist-info/RECORD,,
+osi_dump-0.1.3.2.8.dist-info/METADATA,sha256=tg8SFasgvA3RlmS6n79qm0VLo1PofbWTMphhw6jBtrE,677
+osi_dump-0.1.3.2.8.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+osi_dump-0.1.3.2.8.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.2.8.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.2.8.dist-info/RECORD,,