osi-dump 0.1.3.3.3.9__tar.gz → 0.1.3.3.4.1__tar.gz

{osi_dump-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/PKG-INFO

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

{osi_dump-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/pyproject.toml

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

{osi_dump-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/src/osi_dump/api/keystone.py

@@ -9,6 +9,29 @@ import osi_dump.util.openstack_util as os_util
 logger = logging.getLogger(__name__)
 
 
+def get_users(connection: Connection):
+
+    keystone_endpoints = os_util.get_endpoints(connection=connection, service_type="identity", interface="public")
+
+    for keystone_endpoint in keystone_endpoints:
+        try:
+            if "v3" not in keystone_endpoint: 
+                url = f"{keystone_endpoint}/v3/users"
+            else: 
+                url = f"{keystone_endpoint}/users"
+                
+            response = connection.session.get(url)
+            if response.status_code == 200:
+                break
+        except Exception as e: 
+            logger.info(e)
+
+
+    if response is None:
+        return []
+
+    return response.json()["users"]
+
 def get_role_assignments(connection: Connection): 
     keystone_endpoint = connection.endpoint_for(service_type="identity", interface="public")
     

osi_dump-0.1.3.3.4.1/src/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-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/src/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):
 
@@ -156,27 +166,29 @@ def inner_main(file_path: str, output_path: str):
 
     connections = get_connections(file_path=file_path)
 
-    _instance(connections=connections, output_path=output_path)
+    #_instance(connections=connections, output_path=output_path)
 
-    _floating_ip(connections=connections, output_path=output_path)
+    #_floating_ip(connections=connections, output_path=output_path)
 
-    _volume(connections=connections, output_path=output_path)
+    #_volume(connections=connections, output_path=output_path)
 
-    _hypervisor(connections=connections, output_path=output_path)
+    #_hypervisor(connections=connections, output_path=output_path)
 
-    _project(connections=connections, output_path=output_path)
+    #_project(connections=connections, output_path=output_path)
 
-    _image(connections=connections, output_path=output_path)
+    #_image(connections=connections, output_path=output_path)
 
-    _flavor(connections=connections, output_path=output_path)
+    #_flavor(connections=connections, output_path=output_path)
 
     _role_assignment(connections=connections, output_path=output_path)
 
-    _load_balancer(connections=connections, output_path=output_path)
+    #_load_balancer(connections=connections, output_path=output_path)
+
+    #_router(connections=connections, output_path=output_path)
 
-    _router(connections=connections, output_path=output_path)
+    #_external_port(connections=connections, output_path=output_path)
 
-    _external_port(connections=connections, output_path=output_path)
+    #_network(connections=connections, output_path=output_path)
 
     util.excel_autosize_column(output_path)
 

{osi_dump-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/src/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-0.1.3.3.4.1/src/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-0.1.3.3.4.1/src/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-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/src/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-0.1.3.3.4.1/src/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-0.1.3.3.4.1/src/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-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/src/osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -4,13 +4,15 @@ import concurrent
 
 from openstack.connection import Connection
 from openstack.identity.v3.role_assignment import RoleAssignment as OSRoleAssignment
+from openstack.identity.v3.user import User as OSUser
+
 
 from osi_dump.importer.role_assignment.role_assignment_importer import (
     RoleAssignmentImporter,
 )
 from osi_dump.model.role_assignment import RoleAssignment
 
-from osi_dump.api.keystone import get_role_assignments
+from osi_dump.api.keystone import get_role_assignments, get_users
 
 logger = logging.getLogger(__name__)
 
@@ -19,14 +21,14 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
     def __init__(self, connection: Connection):
         self.connection = connection
 
-        self.users = {}
+        self.users: dict[str, dict] = {}
         self.roles = {}
 
     def _get_users(self):
-        os_users = self.connection.identity.users()
+        os_users = get_users(self.connection)
 
         for os_user in os_users:
-            self.users[os_user.id] = os_user.name
+            self.users[os_user["id"]] = os_user
 
     def _get_roles(self):
         os_roles = self.connection.identity.roles()
@@ -90,7 +92,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         role_id = None
 
         try:
-            user_id = role_assignment["user"]["id"]
+            user_id: str = role_assignment["user"]["id"]
         except Exception as e:
             logger.warning(f"Can not get user id: {e}")
 
@@ -102,8 +104,11 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         user_name = None
         role_name = None
 
+        password_expires_at = None
+        options = None
+
         try:
-            user_name = self.users[user_id]
+            user_name = self.users[user_id]["name"]
         except Exception as e:
             logger.warning(f"Can not get user name: {e}")
 
@@ -112,12 +117,25 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         except Exception as e:
             logger.warning(f"Can not get role name: {e}")
 
+        try:
+            password_expires_at = self.users[user_id]["password_expires_at"]
+        except Exception as e: 
+            logger.warning(f"Can not get password expires at: {e}")
+
+
+        try:
+            options = self.users[user_id]["options"]
+        except Exception as e:
+            logger.warning(f"Can not get option")
+
         role_assignment_ret = RoleAssignment(
             user_id=user_id,
             user_name=user_name,
             role_id=role_id,
             role_name=role_name,
             scope=role_assignment["scope"],
+            password_expires_at=password_expires_at,
+            options=options
         )
 
         return role_assignment_ret

osi_dump-0.1.3.3.4.1/src/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.9 → osi_dump-0.1.3.3.4.1}/src/osi_dump/model/role_assignment.py

@@ -14,4 +14,8 @@ class RoleAssignment(BaseModel):
 
     role_name: Optional[str]
 
+    options: Optional[dict]
+
+    password_expires_at: Optional[str]
+
     scope: Optional[dict]

{osi_dump-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/src/osi_dump.egg-info/PKG-INFO

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

{osi_dump-0.1.3.3.3.9 → osi_dump-0.1.3.3.4.1}/src/osi_dump.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ src/osi_dump/batch_handler/hypervisor_batch_handler.py
 src/osi_dump/batch_handler/image_batch_handler.py
 src/osi_dump/batch_handler/instance_batch_handler.py
 src/osi_dump/batch_handler/load_balancer_batch_handler.py
+src/osi_dump/batch_handler/network_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
@@ -48,6 +49,9 @@ src/osi_dump/exporter/instance/instance_exporter.py
 src/osi_dump/exporter/load_balancer/__init__.py
 src/osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py
 src/osi_dump/exporter/load_balancer/load_balancer_exporter.py
+src/osi_dump/exporter/network/__init__.py
+src/osi_dump/exporter/network/excel_network_exporter.py
+src/osi_dump/exporter/network/network_exporter.py
 src/osi_dump/exporter/project/__init__.py
 src/osi_dump/exporter/project/excel_project_exporter.py
 src/osi_dump/exporter/project/project_exporter.py
@@ -81,6 +85,9 @@ src/osi_dump/importer/instance/openstack_instance_importer.py
 src/osi_dump/importer/load_balancer/__init__.py
 src/osi_dump/importer/load_balancer/load_balancer_importer.py
 src/osi_dump/importer/load_balancer/openstack_load_balancer_importer.py
+src/osi_dump/importer/network/__init__.py
+src/osi_dump/importer/network/network_importer.py
+src/osi_dump/importer/network/openstack_network_importer.py
 src/osi_dump/importer/project/__init__.py
 src/osi_dump/importer/project/openstack_project_importer.py
 src/osi_dump/importer/project/project_importer.py
@@ -102,6 +109,7 @@ src/osi_dump/model/hypervisor.py
 src/osi_dump/model/image.py
 src/osi_dump/model/instance.py
 src/osi_dump/model/load_balancer.py
+src/osi_dump/model/network.py
 src/osi_dump/model/project.py
 src/osi_dump/model/role_assignment.py
 src/osi_dump/model/router.py