osi-dump 0.1.3.3.3.8__py3-none-any.whl → 0.1.3.3.4.0__py3-none-any.whl

osi_dump/api/octavia.py

@@ -7,6 +7,10 @@ import osi_dump.util.openstack_util as os_util
 
 
 def get_load_balancer_flavor(connection: Connection, flavor_id: str) -> dict: 
+
+    if not flavor_id: 
+        return None
+
     octavia_endpoints = os_util.get_endpoints(
         connection=connection, service_type="load-balancer", interface="public"
     )

osi_dump/batch_handler/network_batch_handler.py

@@ -0,0 +1,51 @@
+import logging
+
+from openstack.connection import Connection
+
+from osi_dump.exporter.network.network_exporter import NetworkExporter
+from osi_dump.exporter.network.excel_network_exporter import (
+    ExcelNetworkExporter,
+)
+
+from osi_dump.importer.network.network_importer import NetworkImporter
+from osi_dump.importer.network.openstack_network_importer import (
+    OpenStackNetworkImporter,
+)
+
+
+from osi_dump import util
+
+logger = logging.getLogger(__name__)
+
+
+class NetworkBatchHandler:
+    def __init__(self):
+        self._importer_exporter_list: list[tuple[NetworkImporter, NetworkExporter]] = []
+
+    def add_importer_exporter_from_openstack_connections(
+        self, connections: list[Connection], output_file: str
+    ):
+        for connection in connections:
+            importer = OpenStackNetworkImporter(connection)
+
+            sheet_name = f"{util.extract_hostname(connection.auth['auth_url'])}-network"
+            exporter = ExcelNetworkExporter(
+                sheet_name=sheet_name, output_file=output_file
+            )
+
+            self.add_importer_exporter(importer=importer, exporter=exporter)
+
+    def add_importer_exporter(self, importer: NetworkImporter, exporter: NetworkExporter):
+        self._importer_exporter_list.append((importer, exporter))
+
+    def process(self):
+
+        for importer, exporter in self._importer_exporter_list:
+            try:
+
+                networks = importer.import_networks()
+
+                exporter.export_networks(networks=networks)
+            except Exception as e:
+                logger.warning(e)
+                logger.warning("Skipping...")

osi_dump/cli.py

@@ -19,6 +19,8 @@ app = typer.Typer()
 
 
 from osi_dump.batch_handler.flavor_batch_handler import FlavorBatchHandler
+from osi_dump.batch_handler.network_batch_handler import NetworkBatchHandler
+
 from osi_dump.batch_handler.image_batch_handler import ImageBatchHandler
 from osi_dump.batch_handler.volume_batch_handler import VolumeBatchHandler
 from osi_dump.os_connection.get_connections import get_connections
@@ -149,6 +151,14 @@ def _external_port(connections, output_path: str):
 
     _external_batch_handler.process()
 
+def _network(connections, output_path: str):
+    _network_batch_handler = NetworkBatchHandler()
+
+    _network_batch_handler.add_importer_exporter_from_openstack_connections(
+        connections, output_file=output_path
+    )
+
+    _network_batch_handler.process()
 
 def inner_main(file_path: str, output_path: str):
 
@@ -178,6 +188,8 @@ def inner_main(file_path: str, output_path: str):
 
     _external_port(connections=connections, output_path=output_path)
 
+    _network(connections=connections, output_path=output_path)
+
     util.excel_autosize_column(output_path)
 
     util.excel_sort_sheet(output_path)

osi_dump/exporter/flavor/excel_flavor_exporter.py

@@ -27,4 +27,4 @@ class ExcelFlavorExporter(FlavorExporter):
 
             logger.info(f"Exported flavors for {self.sheet_name}")
         except Exception as e:
-            logger.warning(f"Exporting floating ips for {self.sheet_name} error: {e}")
+            logger.warning(f"Exporting flavors for {self.sheet_name} error: {e}")

osi_dump/exporter/network/excel_network_exporter.py

@@ -0,0 +1,32 @@
+import logging
+
+
+import pandas as pd
+
+
+from osi_dump.exporter.network.network_exporter import NetworkExporter 
+
+from osi_dump.model.network import Network 
+
+from osi_dump import util
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelNetworkExporter(NetworkExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_networks(self, networks: list[Network]):
+        df = pd.json_normalize([network.model_dump() for network in networks])
+        
+        df = util.expand_list_column(df, "subnets")
+
+        logger.info(f"Exporting networks for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+
+            logger.info(f"Exported networks for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting networks for {self.sheet_name} error: {e}")

osi_dump/exporter/network/network_exporter.py

@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+
+
+class NetworkExporter(ABC):
+    @abstractmethod
+    def export_networks(self, networks, output_file: str):
+        pass

osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -56,6 +56,23 @@ class OpenStackHypervisorImporter(HypervisorImporter):
 
         return hypervisors
 
+
+    def _normalize_hypervisor_aggregate(self, hypervisors: list[Hypervisor]):
+        
+        aggregate_id_map = {
+
+        }
+
+        aggregates: list[list[dict]] = [
+
+        ]
+
+        for hypervisor in hypervisors:
+            aggregates.append(hypervisor.aggregates)
+
+    def _swap_element(array, i, j): 
+        array[i], array[j] = array[j], array[i]
+
     def _get_hypervisor_info(
         self, hypervisor: OSHypervisor, aggregates: list[OSAggregate]
     ) -> Hypervisor:

osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -72,8 +72,11 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
                 flavor_id=load_balancer["flavor_id"]
             )
 
-            lb_flavor_name = lb_flavor["name"]
-            lb_flavor_description = lb_flavor["description"]
+            if lb_flavor:
+                lb_flavor_name = lb_flavor["name"]
+                lb_flavor_description = lb_flavor["description"]
+            else: 
+                raise Exception(f'No flavor id found for {load_balancer["id"]}')
         except Exception as e: 
             logger.warning(f"Get load balancer flavor failed {e}")
 

osi_dump/importer/network/network_importer.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+
+from osi_dump.model.network import Network
+
+
+class NetworkImporter(ABC):
+    @abstractmethod
+    def import_networks(self) -> list[Network]:
+        pass

osi_dump/importer/network/openstack_network_importer.py

@@ -0,0 +1,94 @@
+import logging
+
+import concurrent
+
+from openstack.network.v2.network import Network as OSNetwork
+from openstack.network.v2.subnet import Subnet as OSSubnet
+
+from openstack.connection import Connection
+
+from osi_dump.importer.network.network_importer import NetworkImporter 
+from osi_dump.model.network import Network 
+
+
+logger = logging.getLogger(__name__)
+
+
+class OpenStackNetworkImporter(NetworkImporter):
+    def __init__(self, connection: Connection):
+        self.connection = connection
+
+    def import_networks(self) -> list[Network]:
+        """Import networks information from Openstack
+
+        Raises:
+            Exception: Raises exception if fetching networks failed
+
+        Returns:
+            list[Network]: _description_
+        """
+
+        try:
+            os_networks: list[OSNetwork] = list(self.connection.list_networks())
+        except Exception as e:
+            raise Exception(
+                f"Can not fetch hypervisor for {self.connection.auth['auth_url']}"
+            ) from e
+
+        networks: list[Network] = []
+
+        with concurrent.futures.ThreadPoolExecutor() as executor:
+            futures = [
+                executor.submit(self._get_network_info, network)
+                for network in os_networks
+            ]
+            for future in concurrent.futures.as_completed(futures):
+                networks.append(future.result())
+
+        logger.info(f"Imported networks for {self.connection.auth['auth_url']}")
+
+        return networks
+
+
+    def _get_network_info(
+        self, network: OSNetwork, 
+    ) -> Network:
+
+        subnets = self._get_subnets_info(subnet_ids=network.subnet_ids)
+
+        return Network(
+            network_id=network.id,
+            project_id=network.project_id, 
+            name=network.name, 
+            mtu=network.mtu, 
+            port_security_enabled=network.is_port_security_enabled,
+            network_type=network.provider_network_type, 
+            physical_network=network.provider_physical_network,
+            segmentation_id=network.provider_segmentation_id,
+            status=network.status, 
+            shared=network.is_shared,
+            created_at=network.created_at,
+            updated_at=network.updated_at,
+            subnets=subnets
+        )
+    
+
+    def _get_subnets_info(self, subnet_ids: list[str]) -> list[dict]: 
+        subnets = []
+
+        for subnet_id in subnet_ids: 
+            os_subnet: OSSubnet = self.connection.get_subnet(name_or_id=subnet_id) 
+
+            if not os_subnet: 
+                continue 
+                
+            subnets.append({
+                "id": os_subnet.id, 
+                "cidr": os_subnet.cidr
+            })
+
+        return subnets
+
+
+
+    

osi_dump/model/network.py

@@ -0,0 +1,26 @@
+from typing import Optional
+from pydantic import BaseModel, ConfigDict
+
+
+
+class Network(BaseModel):
+    model_config = ConfigDict(strict=True)
+
+    network_id: str
+    project_id: str
+    name: Optional[str]
+
+    subnets: Optional[list[dict]] # {"id": str, "cidr": "str"}
+    mtu: int  
+
+    port_security_enabled: Optional[bool]
+
+    network_type: str 
+    segmentation_id: Optional[int]
+    physical_network: Optional[str]
+
+    status: Optional[str]
+    shared: Optional[bool]
+
+    created_at: Optional[str]
+    updated_at: Optional[str] 

{osi_dump-0.1.3.3.3.8.dist-info → osi_dump-0.1.3.3.4.0.dist-info}/METADATA

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

{osi_dump-0.1.3.3.3.8.dist-info → osi_dump-0.1.3.3.4.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 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/cli.py,sha256=uvVOikUVa4Ly5x9_xORLNsYy3VNt664Iig7nlNIUVrQ,6784
 osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/api/keystone.py,sha256=3oCqzf1cHKs3THOiq6t39_OXNHHTVK9hwCnLVlP8FYg,1446
 osi_dump/api/neutron.py,sha256=pag_d6MsxA1gOUit4bvVUaTiTrPqLJjwz9KU_QSpxwM,1788
-osi_dump/api/octavia.py,sha256=rn7KJNb6X3O_JNFvDDb3cc3B94NmaTtCFiDvG9j7QHc,2541
+osi_dump/api/octavia.py,sha256=XqG406SuoJUGohAtREsTcBatLCANUM-dFSdXvdQ740I,2586
 osi_dump/api/placement.py,sha256=yoWzg39b8nK2E1nrxDhLxLsa7FcBTw57gfy8b5F5ijc,1096
 osi_dump/batch_handler/__init__.py,sha256=wsiE42GCjbKgXBzpiahWEDF_-IXCKzr6PyrLn0oEKSc,288
 osi_dump/batch_handler/external_port_batch_handler.py,sha256=iGm0htGbLkpTX5RFPcrvXrVVn0eeTpavN3u4s58Z_pE,1783
@@ -14,6 +14,7 @@ osi_dump/batch_handler/hypervisor_batch_handler.py,sha256=vkv6SAx1arPNVvFJ6RyvbJ
 osi_dump/batch_handler/image_batch_handler.py,sha256=aGF_jnHXuBc7IRFoLLCrSFD8h4TP0g98T_NtBXkZjd4,1564
 osi_dump/batch_handler/instance_batch_handler.py,sha256=tiHAdhH76BT9-ymnTmTr962cMUTqpPpAQyPSePKEgSM,1761
 osi_dump/batch_handler/load_balancer_batch_handler.py,sha256=rpbi-n-KsYPGDmlRND5zqcVW6DYVgffmE5najUf2wT4,1796
+osi_dump/batch_handler/network_batch_handler.py,sha256=Ra4Sz3IpjG7-k5-VGHL1W7pIsrfdMOo6dR35CozGcOs,1614
 osi_dump/batch_handler/project_batch_handler.py,sha256=uMHx_s-Z4tO1MBah5X-T5d6tLr0qUJuPIR_7RHJ64ck,1626
 osi_dump/batch_handler/role_assignment_batch_handler.py,sha256=45TtVDDRjp9scpW9GCxbl-b6MoTm_kp0YHchEz630Zk,1882
 osi_dump/batch_handler/router_batch_handler.py,sha256=XelVNw_2u00Rdnz20SI2HIPPJKwz3623BbceMGnDS8Q,1587
@@ -23,7 +24,7 @@ osi_dump/exporter/external_port/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 osi_dump/exporter/external_port/excel_external_port_exporter.py,sha256=FgLQersxmb-g2el02PxMFWSO0Chn5YdxEMXfDM_Jtn4,1108
 osi_dump/exporter/external_port/external_port_exporter.py,sha256=LK7r_Do87ZONgmlH8FdtB-k1C_tT0ie3I0dCQyb6OUA,169
 osi_dump/exporter/flavor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/exporter/flavor/excel_flavor_exporter.py,sha256=_wNVToj0FsIkaLbqn7-TWETrtUftBM1Pjr-0WaBJtBI,876
+osi_dump/exporter/flavor/excel_flavor_exporter.py,sha256=1-RJTG-fY2faK1L4B1nHTl1PRPWKgiX_c_CKPXIvbnA,871
 osi_dump/exporter/flavor/flavor_exporter.py,sha256=-zQ8776yk7vHpiZUOcX61V8KxA40AAq8foV7fD0i1g0,155
 osi_dump/exporter/floating_ip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/floating_ip/excel_floating_ip_exporter.py,sha256=Bn1yZTvZ8dP3EhVHW-Pr4O9TC2Cz2RbJaz_vRE66xTQ,975
@@ -40,6 +41,9 @@ osi_dump/exporter/instance/instance_exporter.py,sha256=5CuKKvTa5S2_Ds7fap6tle4go
 osi_dump/exporter/load_balancer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py,sha256=gffLcLr8uvSbaf7rwZDgNRCPKh8bMIs2ShHtyotpKmw,1105
 osi_dump/exporter/load_balancer/load_balancer_exporter.py,sha256=Z5uvEKz1UG_dpAw5KVh-IX5PWLzlPt7pV9773bkgjXs,175
+osi_dump/exporter/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osi_dump/exporter/network/excel_network_exporter.py,sha256=O007PFFPSmDzOagsGGv-zcSEZQVVLRIBLIOSuMl4vYY,950
+osi_dump/exporter/network/network_exporter.py,sha256=IprGl-jTLKxslEd1skiMzEQ2Qvl9Yu5yNm2uijqlFnA,158
 osi_dump/exporter/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/project/excel_project_exporter.py,sha256=2U3Tvn_Bk4xEQk3Tmh-oj5WXAG1bfxI6m7WVPF1upQw,916
 osi_dump/exporter/project/project_exporter.py,sha256=q3VAmtmBP4iq9YEW9Eescm3vjAVM4Ev3BDjzkGz9Pgo,158
@@ -63,7 +67,7 @@ osi_dump/importer/floating_ip/floating_ip_importer.py,sha256=2_lCZYF-r2dgdL4Yzws
 osi_dump/importer/floating_ip/openstack_floating_ip_importer.py,sha256=xuALHyiyb4LdRgFN0hZvOx0pImKpGsLUtPWW_1q52gc,2286
 osi_dump/importer/hypervisor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/hypervisor/hypervisor_importer.py,sha256=JuoJBltqFYhH-Ql9TLUPHX2YurS0JFV7Augrc6bDJ5Q,206
-osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=lVxVGWKNlNAPhEHC_nWg9cxIGz8Lv6AVQXwIgQsWnP0,3923
+osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=Y5JYSfmkwXMljdqhDyFk2LHGL7kHN9YDKjHnlhaiG-o,4284
 osi_dump/importer/image/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/image/image_importer.py,sha256=6zwAMnS58S2HGwARwebqf4VE9IBQBv5Ot6nmcn9H4fY,181
 osi_dump/importer/image/openstack_image_importer.py,sha256=dqQAsNDPljTDN82YPEjBbPDjvLOCtad_hgRWhIpCWXw,2585
@@ -72,7 +76,10 @@ osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIB
 osi_dump/importer/instance/openstack_instance_importer.py,sha256=HvA1hYLAneY0KtDTk7nz6TWXNGO5s6EOp7Hrm7-FxHI,4249
 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=jK7VZd_-5A6lUipFCwyO_n0KUUuZLfIw_DQaJPV2oMI,3899
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=ocZ8JcjXoxPL_6esNetapaeOrXUVs5tNqb83hL6ih-U,4033
+osi_dump/importer/network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osi_dump/importer/network/network_importer.py,sha256=LVak9W8NEu3cWHytttaJlmJ8FrtwaLerY85ZSzAAxOc,191
+osi_dump/importer/network/openstack_network_importer.py,sha256=1Z74Yb3dA8Z0UmFUHMna2suwB8GZxQ06O5Vfpx0usxo,2703
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/project/openstack_project_importer.py,sha256=nQRInUb0vtm57dQNLxSoUFnGrNbAytK2Zl0FaUMPqBc,4964
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
@@ -94,6 +101,7 @@ osi_dump/model/hypervisor.py,sha256=6dWEMVrrjOQolX936FqY994S7RAXpMPATpsLPVNeCyk,
 osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
 osi_dump/model/instance.py,sha256=8puhIKWWfoAaTURXb7XUpjG0lQ4nb0UwrsrTQdDaFbs,639
 osi_dump/model/load_balancer.py,sha256=3v4j949FM8jAwroWKE1ubaii2eM2XW9DWKl7HjtCdno,571
+osi_dump/model/network.py,sha256=xwLwayfZ_7Ql8ZDHQhgTFC8LA8yjydtL8uefo-AXMuE,540
 osi_dump/model/project.py,sha256=S5BtjeMoxZfiJ7z7G_5jYfp5mMTzlPi7DWT5fuBGCTw,749
 osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
 osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
@@ -109,8 +117,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.3.3.8.dist-info/METADATA,sha256=ujHSymvjyIy7-jQZQYR7SjM5s6AiJfNIbIXyBb4FM4s,685
-osi_dump-0.1.3.3.3.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-osi_dump-0.1.3.3.3.8.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.3.3.8.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.3.3.8.dist-info/RECORD,,
+osi_dump-0.1.3.3.4.0.dist-info/METADATA,sha256=qqAyBU1anhTUZHyK4nXj9rWII9w9I-au2vmNdatdf3k,685
+osi_dump-0.1.3.3.4.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+osi_dump-0.1.3.3.4.0.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.3.4.0.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.3.4.0.dist-info/RECORD,,