osi-dump 0.1.2.1__py3-none-any.whl → 0.1.2.3__py3-none-any.whl

osi_dump/api/octavia.py

@@ -1,17 +1,34 @@
 from openstack.connection import Connection
 from openstack.identity.v3.service import Service
+from openstack.load_balancer.v2.load_balancer import LoadBalancer
 
 
-def get_amphorae(connection: Connection, load_balancer_id: str) -> str | None:
+def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
+    octavia_endpoint = connection.endpoint_for(
+        service_type="load-balancer", interface="public"
+    )
+
+    url = f"{octavia_endpoint}/v2.0/lbaas/loadbalancers"
+
+    response = connection.session.get(url)
+
+    data = response.json()
+
+    return data["loadbalancers"]
+
+
+def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
 
     octavia_endpoint = connection.endpoint_for(
-        service_type="octavia", interface="public"
+        service_type="load-balancer", interface="public"
     )
 
-    url = f"{octavia_endpoint}/v2/octavia/amphorae"
+    url = f"{octavia_endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id"
 
     response = connection.session.get(url)
 
     data = response.json()
 
-    return data["usages"]
+    amphoraes = data["amphorae"]
+
+    return amphoraes

osi_dump/batch_handler/external_port_batch_handler.py

@@ -0,0 +1,57 @@
+import logging
+
+from openstack.connection import Connection
+
+from osi_dump.exporter.external_port.external_port_exporter import ExternalPortExporter
+from osi_dump.exporter.external_port.excel_external_port_exporter import (
+    ExcelExternalPortExporter,
+)
+
+from osi_dump.importer.external_port.external_port_importer import ExternalPortImporter
+from osi_dump.importer.external_port.openstack_external_port_importer import (
+    OpenStackExternalPortImporter,
+)
+
+
+from osi_dump import util
+
+logger = logging.getLogger(__name__)
+
+
+class ExternalPortBatchHandler:
+    def __init__(self):
+        self._importer_exporter_list: list[
+            tuple[ExternalPortImporter, ExternalPortExporter]
+        ] = []
+
+    def add_importer_exporter_from_openstack_connections(
+        self, connections: list[Connection], output_file: str
+    ):
+        for connection in connections:
+            importer = OpenStackExternalPortImporter(connection)
+
+            sheet_name = (
+                f"{util.extract_hostname(connection.auth['auth_url'])}-external_port"
+            )
+            exporter = ExcelExternalPortExporter(
+                sheet_name=sheet_name, output_file=output_file
+            )
+
+            self.add_importer_exporter(importer=importer, exporter=exporter)
+
+    def add_importer_exporter(
+        self, importer: ExternalPortImporter, exporter: ExternalPortExporter
+    ):
+        self._importer_exporter_list.append((importer, exporter))
+
+    def process(self):
+
+        for importer, exporter in self._importer_exporter_list:
+            try:
+
+                external_ports = importer.import_external_ports()
+
+                exporter.export_external_ports(external_ports=external_ports)
+            except Exception as e:
+                logger.warning(e)
+                logger.warning("Skipping...")

osi_dump/batch_handler/load_balancer_batch_handler.py

@@ -34,9 +34,7 @@ class LoadBalancerBatchHandler:
         for connection in connections:
             importer = OpenStackLoadBalancerImporter(connection)
 
-            sheet_name = (
-                f"{util.extract_hostname(connection.auth['auth_url'])}-load_balancer"
-            )
+            sheet_name = f"{util.extract_hostname(connection.auth['auth_url'])}-lb"
             exporter = ExcelLoadBalancerExporter(
                 sheet_name=sheet_name, output_file=output_file
             )

osi_dump/batch_handler/role_assignment_batch_handler.py

@@ -35,7 +35,7 @@ class RoleAssignmentBatchHandler:
             importer = OpenStackRoleAssignmentImporter(connection)
 
             sheet_name = (
-                f"{util.extract_hostname(connection.auth['auth_url'])}-role_assignment"
+                f"{util.extract_hostname(connection.auth['auth_url'])}-role_ass"
             )
             exporter = ExcelRoleAssignmentExporter(
                 sheet_name=sheet_name, output_file=output_file

osi_dump/batch_handler/router_batch_handler.py

@@ -0,0 +1,49 @@
+import logging
+
+from openstack.connection import Connection
+
+from osi_dump.exporter.router.router_exporter import (
+    RouterExporter,
+)
+from osi_dump.exporter.router.excel_router_exporter import ExcelRouterExporter
+
+from osi_dump.importer.router.router_importer import RouterImporter
+from osi_dump.importer.router.openstack_router_importer import (
+    OpenStackRouterImporter,
+)
+
+
+from osi_dump import util
+
+logger = logging.getLogger(__name__)
+
+
+class RouterBatchHandler:
+    def __init__(self):
+        self._importer_exporter_list: list[tuple[RouterImporter, RouterExporter]] = []
+
+    def add_importer_exporter_from_openstack_connections(
+        self, connections: list[Connection], output_file: str
+    ):
+        for connection in connections:
+            importer = OpenStackRouterImporter(connection)
+
+            sheet_name = f"{util.extract_hostname(connection.auth['auth_url'])}-router"
+            exporter = ExcelRouterExporter(
+                sheet_name=sheet_name, output_file=output_file
+            )
+
+            self.add_importer_exporter(importer=importer, exporter=exporter)
+
+    def add_importer_exporter(self, importer: RouterImporter, exporter: RouterExporter):
+        self._importer_exporter_list.append((importer, exporter))
+
+    def process(self):
+        for importer, exporter in self._importer_exporter_list:
+            try:
+                routers = importer.import_routers()
+
+                exporter.export_routers(routers=routers)
+            except Exception as e:
+                logger.warning(e)
+                logger.warning("Skipping...")

osi_dump/cli.py

@@ -8,10 +8,12 @@ import typer
 
 from typing_extensions import Annotated
 
+from osi_dump.batch_handler.external_port_batch_handler import ExternalPortBatchHandler
 from osi_dump.batch_handler.load_balancer_batch_handler import LoadBalancerBatchHandler
 from osi_dump.batch_handler.role_assignment_batch_handler import (
     RoleAssignmentBatchHandler,
 )
+from osi_dump.batch_handler.router_batch_handler import RouterBatchHandler
 
 app = typer.Typer()
 
@@ -30,6 +32,11 @@ from osi_dump.batch_handler import (
 )
 
 
+from osi_dump.importer.external_port.openstack_external_port_importer import (
+    OpenStackExternalPortImporter,
+)
+
+
 from osi_dump import util
 
 
@@ -123,6 +130,26 @@ def _load_balancer(connections, output_path: str):
     _load_balancer_batch_handler.process()
 
 
+def _router(connections, output_path: str):
+    _router_batch_handler = RouterBatchHandler()
+
+    _router_batch_handler.add_importer_exporter_from_openstack_connections(
+        connections, output_file=output_path
+    )
+
+    _router_batch_handler.process()
+
+
+def _external_port(connections, output_path: str):
+    _external_batch_handler = ExternalPortBatchHandler()
+
+    _external_batch_handler.add_importer_exporter_from_openstack_connections(
+        connections, output_file=output_path
+    )
+
+    _external_batch_handler.process()
+
+
 def inner_main(file_path: str, output_path: str):
 
     logger = logging.getLogger(__name__)
@@ -146,6 +173,11 @@ def inner_main(file_path: str, output_path: str):
     _role_assignment(connections=connections, output_path=output_path)
 
     _load_balancer(connections=connections, output_path=output_path)
+
+    _router(connections=connections, output_path=output_path)
+
+    _external_port(connections=connections, output_path=output_path)
+
     util.excel_autosize_column(output_path)
 
     util.excel_sort_sheet(output_path)

osi_dump/exporter/external_port/excel_external_port_exporter.py

@@ -0,0 +1,34 @@
+import pandas as pd
+
+import logging
+
+from openpyxl import load_workbook
+
+from osi_dump import util
+from osi_dump.exporter.external_port.external_port_exporter import ExternalPortExporter
+
+from osi_dump.model.external_port import ExternalPort
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelExternalPortExporter(ExternalPortExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_external_ports(self, external_ports: list[ExternalPort]):
+
+        df = pd.DataFrame(
+            [external_port.model_dump() for external_port in external_ports]
+        )
+
+        df = util.panda_excel.expand_list_column(df, "allowed_address_pairs")
+
+        logger.info(f"Exporting external_ports for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+
+            logger.info(f"Exported external_ports for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting external_ports for {self.sheet_name} error: {e}")

osi_dump/exporter/external_port/external_port_exporter.py

@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+
+
+class ExternalPortExporter(ABC):
+    @abstractmethod
+    def export_external_ports(self, projects, output_file: str):
+        pass

osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py

@@ -24,6 +24,8 @@ class ExcelLoadBalancerExporter(LoadBalancerExporter):
             [load_balancer.model_dump() for load_balancer in load_balancers]
         )
 
+        df = util.expand_list_column(df, "amphoraes")
+
         logger.info(f"Exporting load_balancers for {self.sheet_name}")
         try:
             util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)

osi_dump/exporter/router/excel_router_exporter.py

@@ -0,0 +1,30 @@
+import pandas as pd
+
+import logging
+
+from openpyxl import load_workbook
+
+from osi_dump import util
+from osi_dump.exporter.router.router_exporter import RouterExporter
+
+from osi_dump.model.router import Router
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelRouterExporter(RouterExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_routers(self, routers: list[Router]):
+
+        df = pd.DataFrame([router.model_dump() for router in routers])
+
+        logger.info(f"Exporting routers for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+
+            logger.info(f"Exported routers for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting routers for {self.sheet_name} error: {e}")

osi_dump/exporter/router/router_exporter.py

@@ -0,0 +1,7 @@
+from abc import ABC, abstractmethod
+
+
+class RouterExporter(ABC):
+    @abstractmethod
+    def export_routers(self, routers, output_file: str):
+        pass

osi_dump/importer/external_port/external_port_importer.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+
+from osi_dump.model.external_port import ExternalPort
+
+
+class ExternalPortImporter(ABC):
+    @abstractmethod
+    def import_external_ports(self) -> list[ExternalPort]:
+        pass

osi_dump/importer/external_port/openstack_external_port_importer.py

@@ -0,0 +1,129 @@
+import logging
+
+import ipaddress
+
+import concurrent
+
+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 osi_dump.importer.external_port.external_port_importer import ExternalPortImporter
+from osi_dump.model.external_port import ExternalPort
+
+logger = logging.getLogger(__name__)
+
+
+class OpenStackExternalPortImporter(ExternalPortImporter):
+    def __init__(self, connection: Connection):
+        self.connection = connection
+
+    def _get_external_ports(self) -> list[OSPort]:
+
+        self.connection.list_networks()
+        # Get all external networks
+        networks = self.connection.network.networks(
+            is_router_external=True,
+        )
+
+        external_ports = []
+
+        for network in networks:
+            ex_ports = list(self.connection.network.ports(network_id=network.id))
+
+            for ex_port in ex_ports:
+                ex_port["segmentation_id"] = network.provider_segmentation_id
+
+            external_ports.append(ex_ports)
+
+        # Get all port on those networks
+
+        external_ports = list(np.array(external_ports).flatten())
+
+        return external_ports
+
+    def import_external_ports(self) -> list[ExternalPort]:
+        """Import external_ports information from Openstack
+
+
+        Raises:
+            Exception: Raises exception if fetching external_port failed
+
+        Returns:
+            list[Instance]: _description_
+        """
+
+        logger.info(f"Importing external_ports for {self.connection.auth['auth_url']}")
+
+        try:
+            os_ports: list[OSPort] = self._get_external_ports()
+        except Exception as e:
+            raise Exception(
+                f"Can not fetch external_ports for {self.connection.auth['auth_url']}"
+            ) from e
+
+        external_ports: list[ExternalPort] = []
+
+        with concurrent.futures.ThreadPoolExecutor() as executor:
+            futures = [
+                executor.submit(self._get_external_port_info, external_port)
+                for external_port in os_ports
+            ]
+            for future in concurrent.futures.as_completed(futures):
+                external_ports.append(future.result())
+
+        logger.info(f"Imported external_ports for {self.connection.auth['auth_url']}")
+
+        external_ports = sorted(
+            external_ports,
+            key=lambda external_port: (
+                external_port.network_id,
+                (
+                    ipaddress.ip_address(external_port.ip_address)
+                    if external_port.ip_address
+                    else ipaddress.ip_address("0.0.0.0")
+                ),
+            ),
+        )
+
+        return external_ports
+
+    def _get_external_port_info(self, external_port: OSPort) -> ExternalPort:
+
+        subnet_id = None
+        ip_address = None
+        subnet_cidr = None
+
+        try:
+            ip_address = external_port.fixed_ips[0]["ip_address"]
+        except Exception as e:
+            logger.warning(f"No IP address found for port {external_port.id}")
+
+        try:
+            subnet_id = external_port.fixed_ips[0]["subnet_id"]
+        except Exception as e:
+            logger.warning(f"No subnet ID found for {external_port.id}")
+
+        try:
+            subnet: OSSubnet = self.connection.get_subnet_by_id(subnet_id)
+
+            subnet_cidr = subnet.cidr
+        except Exception as e:
+            logger.warning(f"No subnet cidr found for port {external_port.id}")
+
+        external_port_ret = ExternalPort(
+            port_id=external_port.id,
+            project_id=external_port.project_id,
+            network_id=external_port.network_id,
+            subnet_id=subnet_id,
+            subnet_cidr=subnet_cidr,
+            ip_address=ip_address,
+            allowed_address_pairs=external_port.allowed_address_pairs,
+            device_id=external_port.device_id,
+            device_owner=external_port.device_owner,
+            status=external_port.status,
+        )
+
+        return external_port_ret

osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -30,12 +30,11 @@ class OpenStackHypervisorImporter(HypervisorImporter):
             list[Hypervisor]: _description_
         """
 
-        logger.info(f"Importing hypervisors for {self.connection.auth['auth_url']}")
-
         try:
             oshypervisors: list[OSHypervisor] = list(
-                self.connection.compute.hypervisors(details=True)
+                self.connection.compute.hypervisors(details=True, with_servers=True)
             )
+
         except Exception as e:
             raise Exception(
                 f"Can not fetch hypervisor for {self.connection.auth['auth_url']}"
@@ -65,12 +64,6 @@ class OpenStackHypervisorImporter(HypervisorImporter):
             )
         )
 
-        servers = list(
-            self.connection.compute.servers(
-                details=False, all_project=True, hypervisor=hypervisor.id
-            )
-        )
-
         usage_data = get_usage(self.connection, resource_provider_id=hypervisor.id)
 
         vcpu = rpi[0]
@@ -89,7 +82,7 @@ class OpenStackHypervisorImporter(HypervisorImporter):
             vcpus_usage=usage_data["VCPU"],
             memory_usage=usage_data["MEMORY_MB"],
             local_disk_usage=usage_data["DISK_GB"],
-            vm_count=len(servers),
+            vm_count=len(hypervisor.servers),
         )
 
         return ret_hypervisor

osi_dump/importer/instance/openstack_instance_importer.py

@@ -96,6 +96,7 @@ class OpenStackInstanceImporter(InstanceImporter):
             private_v4_ips=private_v4_ips,
             floating_ip=floating_ip,
             status=server.status,
+            hypervisor=server.hypervisor_hostname,
             ram=server.flavor["ram"],
             vcpus=server.flavor["vcpus"],
             created_at=server.created_at,

osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -11,6 +11,8 @@ from osi_dump.importer.load_balancer.load_balancer_importer import (
 )
 from osi_dump.model.load_balancer import LoadBalancer
 
+import osi_dump.api.octavia as octavia_api
+
 logger = logging.getLogger(__name__)
 
 
@@ -31,12 +33,12 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
         logger.info(f"Importing load_balancers for {self.connection.auth['auth_url']}")
 
         try:
-            osload_balancers: list[OSLoadBalancer] = list(
-                self.connection.network.load_balancers()
+            osload_balancers: list[OSLoadBalancer] = octavia_api.get_load_balancers(
+                connection=self.connection
             )
         except Exception as e:
             raise Exception(
-                f"Can not fetch load_balancers for {self.connection.auth['auth_url']}"
+                f"Can not fetch load_balancers for {self.connection.auth['auth_url']} {e}"
             ) from e
 
         load_balancers: list[LoadBalancer] = []
@@ -55,11 +57,17 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
 
     def _get_load_balancer_info(self, load_balancer: OSLoadBalancer) -> LoadBalancer:
 
+        amphoraes = octavia_api.get_amphoraes(
+            connection=self.connection, load_balancer_id=load_balancer["id"]
+        )
+
         load_balancer_ret = LoadBalancer(
-            id=load_balancer.id,
-            load_balancer_name=load_balancer.name,
-            status=load_balancer.operating_status,
-            project_id=load_balancer.project_id,
+            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"],
+            amphoraes=amphoraes,
         )
 
         return load_balancer_ret

osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -58,6 +58,19 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         self, role_assignment: OSRoleAssignment
     ) -> RoleAssignment:
 
+        user_id = None
+        role_id = None
+
+        try:
+            user_id = role_assignment.user["id"]
+        except Exception as e:
+            logger.warning(f"Can not get user id: {e}")
+
+        try:
+            role_id = role_assignment.role["id"]
+        except Exception as e:
+            logger.warning(f"Can not get role id: {e}")
+
         user_name = None
         role_name = None
 
@@ -65,17 +78,21 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
             role_name = self.connection.identity.get_role(
                 role_assignment.role["id"]
             ).name
+
+        except Exception as e:
+            logger.warning(f"Can not get role name: {e}")
+
+        try:
             user_name = self.connection.identity.get_user(
                 role_assignment.user["id"]
             ).name
-
         except Exception as e:
-            logger.warning("Can not get role name or user name")
+            logger.warning(f"Can not get user name: {e}")
 
         role_assignment_ret = RoleAssignment(
-            user_id=role_assignment.user["id"],
+            user_id=user_id,
             user_name=user_name,
-            role_id=role_assignment.role["id"],
+            role_id=role_id,
             role_name=role_name,
             scope=role_assignment.scope,
         )

osi_dump/importer/router/openstack_router_importer.py

@@ -0,0 +1,86 @@
+import logging
+
+import concurrent
+
+from openstack.connection import Connection
+from openstack.network.v2.router import Router as OSRouter
+
+from osi_dump.importer.router.router_importer import (
+    RouterImporter,
+)
+from osi_dump.model.router import Router
+
+logger = logging.getLogger(__name__)
+
+
+class OpenStackRouterImporter(RouterImporter):
+    def __init__(self, connection: Connection):
+        self.connection = connection
+
+    def import_routers(self) -> list[Router]:
+        """Import routers information from Openstack
+
+        Raises:
+            Exception: Raises exception if fetching router failed
+
+        Returns:
+            list[Router]: _description_
+        """
+
+        logger.info(f"Importing routers for {self.connection.auth['auth_url']}")
+
+        try:
+            osrouters: list[OSRouter] = list(self.connection.network.routers())
+        except Exception as e:
+            raise Exception(
+                f"Can not fetch routers for {self.connection.auth['auth_url']}"
+            ) from e
+
+        routers: list[Router] = []
+
+        with concurrent.futures.ThreadPoolExecutor() as executor:
+            futures = [
+                executor.submit(self._get_router_info, router) for router in osrouters
+            ]
+            for future in concurrent.futures.as_completed(futures):
+                routers.append(future.result())
+
+        logger.info(f"Imported routers for {self.connection.auth['auth_url']}")
+
+        return routers
+
+    def _get_router_info(self, router: OSRouter) -> Router:
+        """
+                {"network_id": "49760654-71d8-4967-8fdd-5a35d3ff78ef", "external_fixed_ips": [{"subnet_id":                                   |
+        |                           | "c044a5c0-4b11-4d8d-ae5e-9ff4ce6c1be6", "ip_address": "10.0.2.188"}], "enable_snat": true}
+        """
+
+        external_net_id = None
+
+        try:
+            external_net_id = router.external_gateway_info["network_id"]
+        except Exception as e:
+            logger.warning(f"Could not get external net id for router: {router.id}")
+
+        external_net_ip = None
+
+        try:
+            external_net_ip = router.external_gateway_info["external_fixed_ips"][0][
+                "ip_address"
+            ]
+
+        except Exception as e:
+            logger.warning(f"Could not get external net ip for router {router.id}")
+
+        router_ret = Router(
+            router_id=router.id,
+            name=router.name,
+            external_net_id=external_net_id,
+            external_net_ip=external_net_ip,
+            status=router.status,
+            project_id=router.project_id,
+            created_at=router.created_at,
+            updated_at=router.updated_at,
+        )
+
+        return router_ret

osi_dump/importer/router/router_importer.py

@@ -0,0 +1,9 @@
+from abc import ABC, abstractmethod
+
+from osi_dump.model.router import Router
+
+
+class RouterImporter(ABC):
+    @abstractmethod
+    def import_routers(self) -> list[Router]:
+        pass

osi_dump/model/external_port.py

@@ -0,0 +1,27 @@
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict, ValidationError
+
+
+class ExternalPort(BaseModel):
+    model_config = ConfigDict(strict=True)
+
+    port_id: str
+
+    project_id: Optional[str]
+
+    subnet_id: Optional[str]
+
+    subnet_cidr: Optional[str]
+
+    ip_address: Optional[str]
+
+    network_id: Optional[str]
+
+    allowed_address_pairs: Optional[list[dict]]
+
+    device_id: Optional[str]
+
+    device_owner: Optional[str]
+
+    status: Optional[str]

osi_dump/model/image.py

@@ -18,8 +18,8 @@ class Image(BaseModel):
 
     protected: bool
     status: str
-    size: int
-    virtual_size: int
+    size: Optional[int]
+    virtual_size: Optional[int]
     visibility: str
 
     created_at: str

osi_dump/model/instance.py

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

osi_dump/model/load_balancer.py

@@ -10,8 +10,10 @@ class LoadBalancer(BaseModel):
 
     load_balancer_name: Optional[str]
 
-    status: str
+    provisioning_status: Optional[str]
 
-    # amphora_id: Optional[str]
+    operating_status: Optional[str]
+
+    amphoraes: list[dict]
 
     project_id: Optional[str]

osi_dump/model/role_assignment.py

@@ -6,11 +6,11 @@ from pydantic import BaseModel, ConfigDict, ValidationError
 class RoleAssignment(BaseModel):
     model_config = ConfigDict(strict=True)
 
-    user_id: str
+    user_id: Optional[str]
 
     user_name: Optional[str]
 
-    role_id: str
+    role_id: Optional[str]
 
     role_name: Optional[str]
 

osi_dump/model/router.py

@@ -0,0 +1,20 @@
+from typing import Optional
+
+from pydantic import BaseModel, ConfigDict, ValidationError
+
+
+class Router(BaseModel):
+    model_config = ConfigDict(strict=True)
+
+    router_id: str
+
+    name: Optional[str]
+
+    external_net_id: Optional[str]
+    external_net_ip: Optional[str]
+
+    status: str
+    project_id: Optional[str]
+
+    created_at: str
+    updated_at: str

osi_dump/util/__init__.py

@@ -4,3 +4,4 @@ from .create_file import create_file
 from .export_data_excel import export_data_excel
 from .excel_sort_sheet import excel_sort_sheet
 from .validate_dir_path import validate_dir_path
+from .panda_excel import expand_list_column

osi_dump/util/panda_excel.py

@@ -0,0 +1,33 @@
+import pandas as pd
+
+from pandas import DataFrame
+
+
+def expand_list_column(df, column):
+    # Find the maximum length of the list in the column
+    max_len = df[column].apply(len).max()
+
+    # Expand each dictionary in the list into columns
+    expanded_df = pd.DataFrame(
+        df[column]
+        .apply(lambda x: [{**item} for item in x] + [{}] * (max_len - len(x)))
+        .tolist(),
+        index=df.index,
+    )
+
+    # Flatten the nested dictionaries into separate columns
+    expanded_df = pd.json_normalize(expanded_df.to_dict(orient="records"))
+
+    new_columns = []
+    for i in range(max_len):
+        for key in expanded_df.columns[i::max_len]:
+            new_key = key.split(".")[-1]  # Get the actual key name
+            new_columns.append(f"{column}_{i+1}.{new_key}")
+
+    # Rename the columns to reflect the nested structure
+    expanded_df.columns = new_columns
+
+    # Drop the original column and join the expanded columns
+    df = df.drop(column, axis=1).join(expanded_df)
+
+    return df

{osi_dump-0.1.2.1.dist-info → osi_dump-0.1.2.3.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: osi-dump
-Version: 0.1.2.1
-Summary: OpenStack instances information dump tool
+Version: 0.1.2.3
+Summary: OpenStack information dump tool
 Author: TVKain
 License: Apache-2.0
 Classifier: License :: OSI Approved :: Apache Software License
@@ -12,6 +12,7 @@ Requires-Dist: openstacksdk
 Requires-Dist: pydantic
 Requires-Dist: pandas
 Requires-Dist: openpyxl
+Requires-Dist: numpy
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'
 

{osi_dump-0.1.2.1.dist-info → osi_dump-0.1.2.3.dist-info}/RECORD

@@ -1,20 +1,25 @@
 osi_dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/__main__.py,sha256=fCVTLFipB-P0872_4j7iOJNNosOMBj3YdHr8TH_fhRY,71
-osi_dump/cli.py,sha256=5sFtsS91Em26PmziWybKFW7bxnfRompH-1UTnWIKGkc,5425
+osi_dump/cli.py,sha256=vLijmcrWieCVK4cSLN2sK9ltWlercw9Zg6yBEvZtPkg,6379
 osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/api/octavia.py,sha256=rT6d10OCQRdMnqvZTlW1gRMe1vOk8Rgct58oUIvDoyg,433
+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
+osi_dump/batch_handler/external_port_batch_handler.py,sha256=kWT7cKmcZZPY1mauYDB_qaCd42CzVbTof7lm7le4U6c,1821
 osi_dump/batch_handler/flavor_batch_handler.py,sha256=Cxf-rkuW5MrrOyiKi9N3InsdDGku7Bf0CAaPNhhM0hE,1589
 osi_dump/batch_handler/floating_ip_batch_handler.py,sha256=bEkT4BRi85qir-a1i7eEI_arA0LENq1gD6xHj8IdXu0,1771
 osi_dump/batch_handler/hypervisor_batch_handler.py,sha256=vkv6SAx1arPNVvFJ6RyvbJjC2F2Hes9km7dwhL4NJDY,1755
 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=Y8K5raUPX-ZtIRE9G0rgVBP9WsxKpqN3wv6eDYmXau4,1839
+osi_dump/batch_handler/load_balancer_batch_handler.py,sha256=rpbi-n-KsYPGDmlRND5zqcVW6DYVgffmE5najUf2wT4,1796
 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=x0LuRIyaBQq17aDznXqLxtZOPj79ufGz7TKFSM63vMA,1889
+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
 osi_dump/batch_handler/volume_batch_handler.py,sha256=UAU34FZD8XkJkmlr4Idk4NgFBzjD52PxekJDgV1ekG0,1569
 osi_dump/exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osi_dump/exporter/external_port/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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/flavor_exporter.py,sha256=-zQ8776yk7vHpiZUOcX61V8KxA40AAq8foV7fD0i1g0,155
@@ -31,7 +36,7 @@ osi_dump/exporter/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 osi_dump/exporter/instance/excel_instance_exporter.py,sha256=8WTv3RDOdUkumyWzwUK4KAZCnnq9P2yKi5TC091I9fs,931
 osi_dump/exporter/instance/instance_exporter.py,sha256=5CuKKvTa5S2_Ds7fap6tle4go9pOFmQ5VEf6O7tjwBo,161
 osi_dump/exporter/load_balancer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py,sha256=BM3dzGL7UAug1v3Re04RBowOLGvHwc6mc0gsTfRJJwo,1008
+osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py,sha256=LX_4olvcHEfhTejTKoE_UStUpaRHslU_hcIBkk_9rnE,1063
 osi_dump/exporter/load_balancer/load_balancer_exporter.py,sha256=Z5uvEKz1UG_dpAw5KVh-IX5PWLzlPt7pV9773bkgjXs,175
 osi_dump/exporter/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/project/excel_project_exporter.py,sha256=2U3Tvn_Bk4xEQk3Tmh-oj5WXAG1bfxI6m7WVPF1upQw,916
@@ -39,9 +44,15 @@ osi_dump/exporter/project/project_exporter.py,sha256=q3VAmtmBP4iq9YEW9Eescm3vjAV
 osi_dump/exporter/role_assignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/role_assignment/excel_role_assignment_exporter.py,sha256=CvMmueVclc22A7BPx8qR2-zXyr6FptI31bMHtyih2CA,1070
 osi_dump/exporter/role_assignment/role_assignment_exporter.py,sha256=MmqFhhF7HWFoULNdDPt8yuW0GZmDxV262iEnLkLKw1s,181
+osi_dump/exporter/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osi_dump/exporter/router/excel_router_exporter.py,sha256=RNvTWCDbp5NYvqPoh82FfLcVwvYa49MSG0pRC1d-Cgo,900
+osi_dump/exporter/router/router_exporter.py,sha256=DZxDVnBnHZej3ZfMHO9gwsvonUWlRSAH1q9ShtFu_iM,155
 osi_dump/exporter/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/volume/excel_volume_exporter.py,sha256=BhesTGXMQF3BAwHgJMYfnxFgHxZo7TKPePG8q9T8ONI,865
 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=qnGTDVu-F7xNh7TSOmhyz8bV4fgMZm3WkcYRO1iTDZ8,4055
 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
@@ -50,47 +61,53 @@ 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=8EP99VPMrm4RUSHDbMmiuZeDOnwY17RLtJGotHd6ETs,3093
+osi_dump/importer/hypervisor/openstack_hypervisor_importer.py,sha256=82lSo5cMdvMQ9snU_eIVNOsHp5cT5v8Sf9xSEGZfBzg,2870
 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=Tc2eZ4fU_2S-fp_vuDWutqPcyV6Erz17nDLjzjusihY,2413
 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=b1OB-8_7DlwvOo7TX5zUG64XXtUufKhgCc3lhgNqxaY,3394
+osi_dump/importer/instance/openstack_instance_importer.py,sha256=hTCdrTvY-hsjXb15gDmpKaKTjJJACUVSRahvHsDOi38,3445
 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=Uh94UJLeKCSmDAuPORf-TJbl3nVYzkB4lDxt2J6-d88,2072
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=sX5ZMHT-QPIuAD4YBwitxj8l5fMvbOsA-BOQxLL84lU,2392
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/project/openstack_project_importer.py,sha256=K8Si2uaC88L2CxXi68A4ML9mlWKwnZp1ABDiufFUZ8g,2988
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
 osi_dump/importer/role_assignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=nESax2gka0BpKUA2phmk1-wx0IjFLA1xGf-mORHZgFg,2598
+osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=bff9rutp2835KA0ibVsvtCZStNgtiTkc7IKUsCmaXRo,3003
 osi_dump/importer/role_assignment/role_assignment_importer.py,sha256=Faorx0qsgdXjv5y2t-7obpV3wFfbmByx_-8b9yBr7L8,228
+osi_dump/importer/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+osi_dump/importer/router/openstack_router_importer.py,sha256=-8xJ9hV7Y9ZpUXIEl3PHsGvggp9r57-A9hL8Tm_lb7c,2731
+osi_dump/importer/router/router_importer.py,sha256=L2i0Fnh3iZEsP_PFtx1j0yWTpkmgHsc6Pobii8lDRCo,186
 osi_dump/importer/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/volume/openstack_volume_importer.py,sha256=Tte9fX91oxEoRcUZPJd7g6oH6izcWy8WwFCapg_ZY1M,2454
 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/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=ahW0rRb2mgqoPqYhRzn_qnyShKvCvNZPlcDs_bnyt6g,445
-osi_dump/model/instance.py,sha256=flNywojuBj7ZyFTnWvl2rpvzL3Ju-QtuUY69DSPfPs8,464
-osi_dump/model/load_balancer.py,sha256=ve0vEbIAZLR7RBCbEk_MGR8wrfKQ9dI21Jx6V7nFoR4,298
+osi_dump/model/image.py,sha256=XidrVfSYEidgKP5Qh4auRAi1AgDagvTW-zMdhfwSenE,465
+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
-osi_dump/model/role_assignment.py,sha256=dwuXVxgHJ8pIu8_i_w9kZ0r0uaQQXAMDTYnLrDY3O9U,290
+osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
+osi_dump/model/router.py,sha256=nO0XW0mpabr4ajM40Biuva63N8YWulZUrhH5kmPnKgI,363
 osi_dump/model/volume.py,sha256=1p5Xw0LPxfroJwSYtE-n_Gv4MsRDA_sSvc7SQY_Uo8I,371
 osi_dump/os_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/os_connection/get_connections.py,sha256=1zeir4cEtzJOUOn53zUmlD9lWMvYXhuRr0IhI5U1DAw,1753
-osi_dump/util/__init__.py,sha256=GvhYTETVePJAsp0LfseMGtuRFWbbCc2xox-QSGQA3Us,286
+osi_dump/util/__init__.py,sha256=obJLcem8iWbVC3NIk4GHBMwwAsW-FcrwRdfzphuDjpY,330
 osi_dump/util/create_file.py,sha256=hcEspFD0VZDtXCaG5QtMkV37GsbAHATdxYlClTszVK8,242
 osi_dump/util/excel_autosize_column.py,sha256=zzQ6uXkQhHAqVn9fUAgNjoCH_HiNEC9Dcj4OBqHd6rw,1102
 osi_dump/util/excel_sort_sheet.py,sha256=o4jXtP1ZFYtAGzkAP5S8Tym4h-SEoFBAI3j24y-24UM,1047
 osi_dump/util/export_data_excel.py,sha256=VYSxDBZ7dgSbTj3n_8RRPqe183tILNh6wJW-UnFvJUU,882
 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.1.dist-info/METADATA,sha256=DCMaAo3uYHiZeiyqjcWStEokaKxFKuzgYH-_-JIDBnE,664
-osi_dump-0.1.2.1.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-osi_dump-0.1.2.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.2.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.2.1.dist-info/RECORD,,
+osi_dump-0.1.2.3.dist-info/METADATA,sha256=5XPQ1B8SqhBGn8zazSnh-eTjMceLCvp2gFNdoZrmBG4,675
+osi_dump-0.1.2.3.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+osi_dump-0.1.2.3.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.2.3.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.2.3.dist-info/RECORD,,