osi-dump 0.1.2.1__tar.gz → 0.1.2.2__tar.gz

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/PKG-INFO

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

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "osi-dump"
-version = "0.1.2.1"
+version = "0.1.2.2"
 description = "OpenStack instances information dump tool"
 readme = "README.md"
 authors = [{ name = "TVKain" }]

osi_dump-0.1.2.2/src/osi_dump/api/octavia.py

@@ -0,0 +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_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[str]:
+
+    octavia_endpoint = connection.endpoint_for(
+        service_type="load-balancer", interface="public"
+    )
+
+    url = f"{octavia_endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=id&fields=compute_id"
+
+    response = connection.session.get(url)
+
+    data = response.json()
+
+    amphoraes = data["amphorae"]
+
+    return [amphorae["compute_id"] for amphorae in amphoraes]

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.2/src/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-0.1.2.1 → osi_dump-0.1.2.2}/src/osi_dump/cli.py

@@ -12,6 +12,7 @@ from osi_dump.batch_handler.load_balancer_batch_handler import LoadBalancerBatch
 from osi_dump.batch_handler.role_assignment_batch_handler import (
     RoleAssignmentBatchHandler,
 )
+from osi_dump.batch_handler.router_batch_handler import RouterBatchHandler
 
 app = typer.Typer()
 
@@ -123,6 +124,16 @@ 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 inner_main(file_path: str, output_path: str):
 
     logger = logging.getLogger(__name__)
@@ -146,6 +157,9 @@ 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)
+
     util.excel_autosize_column(output_path)
 
     util.excel_sort_sheet(output_path)

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.2/src/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-0.1.2.2/src/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-0.1.2.1 → osi_dump-0.1.2.2}/src/osi_dump/importer/hypervisor/openstack_hypervisor_importer.py

@@ -67,7 +67,7 @@ class OpenStackHypervisorImporter(HypervisorImporter):
 
         servers = list(
             self.connection.compute.servers(
-                details=False, all_project=True, hypervisor=hypervisor.id
+                details=True, all_project=True, hypervisor_hostname=hypervisor.name
             )
         )
 

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.1 → osi_dump-0.1.2.2}/src/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,16 @@ 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"],
+            status=load_balancer["operating_status"],
+            project_id=load_balancer["project_id"],
+            amphoraes=amphoraes,
         )
 
         return load_balancer_ret

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.2/src/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-0.1.2.2/src/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-0.1.2.1 → osi_dump-0.1.2.2}/src/osi_dump/model/image.py

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

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.1 → osi_dump-0.1.2.2}/src/osi_dump/model/load_balancer.py

@@ -12,6 +12,6 @@ class LoadBalancer(BaseModel):
 
     status: str
 
-    # amphora_id: Optional[str]
+    amphoraes: list[str]
 
     project_id: Optional[str]

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.2/src/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-0.1.2.1 → osi_dump-0.1.2.2}/src/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-0.1.2.2/src/osi_dump/util/panda_excel.py

@@ -0,0 +1,22 @@
+import pandas as pd
+
+from pandas import DataFrame
+
+
+def expand_list_column(df: DataFrame, column: str) -> DataFrame:
+    # Find the maximum length of the list in the column
+    max_len = df[column].apply(len).max()
+
+    # Create a DataFrame from the list column
+    expanded_df = pd.DataFrame(
+        df[column].apply(lambda x: x + [None] * (max_len - len(x))).tolist(),
+        index=df.index,
+    )
+
+    # Rename the columns
+    expanded_df.columns = [f"{column}_{i+1}" for i in range(expanded_df.shape[1])]
+
+    # 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 → osi_dump-0.1.2.2}/src/osi_dump.egg-info/PKG-INFO

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

{osi_dump-0.1.2.1 → osi_dump-0.1.2.2}/src/osi_dump.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ src/osi_dump/batch_handler/instance_batch_handler.py
 src/osi_dump/batch_handler/load_balancer_batch_handler.py
 src/osi_dump/batch_handler/project_batch_handler.py
 src/osi_dump/batch_handler/role_assignment_batch_handler.py
+src/osi_dump/batch_handler/router_batch_handler.py
 src/osi_dump/batch_handler/volume_batch_handler.py
 src/osi_dump/exporter/__init__.py
 src/osi_dump/exporter/flavor/__init__.py
@@ -47,6 +48,9 @@ src/osi_dump/exporter/project/project_exporter.py
 src/osi_dump/exporter/role_assignment/__init__.py
 src/osi_dump/exporter/role_assignment/excel_role_assignment_exporter.py
 src/osi_dump/exporter/role_assignment/role_assignment_exporter.py
+src/osi_dump/exporter/router/__init__.py
+src/osi_dump/exporter/router/excel_router_exporter.py
+src/osi_dump/exporter/router/router_exporter.py
 src/osi_dump/exporter/volume/__init__.py
 src/osi_dump/exporter/volume/excel_volume_exporter.py
 src/osi_dump/exporter/volume/volume_exporter.py
@@ -74,6 +78,9 @@ src/osi_dump/importer/project/project_importer.py
 src/osi_dump/importer/role_assignment/__init__.py
 src/osi_dump/importer/role_assignment/openstack_role_assignment_importer.py
 src/osi_dump/importer/role_assignment/role_assignment_importer.py
+src/osi_dump/importer/router/__init__.py
+src/osi_dump/importer/router/openstack_router_importer.py
+src/osi_dump/importer/router/router_importer.py
 src/osi_dump/importer/volume/__init__.py
 src/osi_dump/importer/volume/openstack_volume_importer.py
 src/osi_dump/importer/volume/volume_importer.py
@@ -87,6 +94,7 @@ src/osi_dump/model/instance.py
 src/osi_dump/model/load_balancer.py
 src/osi_dump/model/project.py
 src/osi_dump/model/role_assignment.py
+src/osi_dump/model/router.py
 src/osi_dump/model/volume.py
 src/osi_dump/os_connection/__init__.py
 src/osi_dump/os_connection/get_connections.py
@@ -96,4 +104,5 @@ src/osi_dump/util/excel_autosize_column.py
 src/osi_dump/util/excel_sort_sheet.py
 src/osi_dump/util/export_data_excel.py
 src/osi_dump/util/extract_hostname.py
+src/osi_dump/util/panda_excel.py
 src/osi_dump/util/validate_dir_path.py

osi_dump-0.1.2.1/src/osi_dump/api/octavia.py

@@ -1,17 +0,0 @@
-from openstack.connection import Connection
-from openstack.identity.v3.service import Service
-
-
-def get_amphorae(connection: Connection, load_balancer_id: str) -> str | None:
-
-    octavia_endpoint = connection.endpoint_for(
-        service_type="octavia", interface="public"
-    )
-
-    url = f"{octavia_endpoint}/v2/octavia/amphorae"
-
-    response = connection.session.get(url)
-
-    data = response.json()
-
-    return data["usages"]