osi-dump 0.1.3.3.4.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

osi_dump/exporter/flavor/flavor_exporter.py

@@ -1,7 +1,7 @@
-from abc import ABC, abstractmethod
-
-
-class FlavorExporter(ABC):
-    @abstractmethod
-    def export_flavors(self, flavors, output_file: str):
-        pass
+from abc import ABC, abstractmethod
+
+
+class FlavorExporter(ABC):
+    @abstractmethod
+    def export_flavors(self, flavors, output_file: str):
+        pass

osi_dump/exporter/floating_ip/excel_floating_ip_exporter.py

@@ -1,30 +1,30 @@
-import logging
-
-from openpyxl import load_workbook
-import pandas as pd
-
-
-from osi_dump.exporter.floating_ip.floating_ip_exporter import FloatingIPExporter
-
-from osi_dump.model.floating_ip import FloatingIP
-
-from osi_dump import util
-
-logger = logging.getLogger(__name__)
-
-
-class ExcelFloatingIPExporter(FloatingIPExporter):
-    def __init__(self, sheet_name: str, output_file: str):
-        self.sheet_name = sheet_name
-        self.output_file = output_file
-
-    def export_floating_ips(self, floating_ips: list[FloatingIP]):
-        df = pd.DataFrame([floating_ip.model_dump() for floating_ip in floating_ips])
-
-        logger.info(f"Exporting floating ips for {self.sheet_name}")
-        try:
-            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
-
-            logger.info(f"Exported floating ips for {self.sheet_name}")
-        except Exception as e:
-            logger.warning(f"Exporting floating ips for {self.sheet_name} error: {e}")
+import logging
+
+from openpyxl import load_workbook
+import pandas as pd
+
+
+from osi_dump.exporter.floating_ip.floating_ip_exporter import FloatingIPExporter
+
+from osi_dump.model.floating_ip import FloatingIP
+
+from osi_dump import util
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelFloatingIPExporter(FloatingIPExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_floating_ips(self, floating_ips: list[FloatingIP]):
+        df = pd.DataFrame([floating_ip.model_dump() for floating_ip in floating_ips])
+
+        logger.info(f"Exporting floating ips for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+
+            logger.info(f"Exported floating ips for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting floating ips for {self.sheet_name} error: {e}")

osi_dump/exporter/floating_ip/floating_ip_exporter.py

@@ -1,7 +1,7 @@
-from abc import ABC, abstractmethod
-
-
-class FloatingIPExporter(ABC):
-    @abstractmethod
-    def export_floating_ips(self, floating_ips, output_file: str):
-        pass
+from abc import ABC, abstractmethod
+
+
+class FloatingIPExporter(ABC):
+    @abstractmethod
+    def export_floating_ips(self, floating_ips, output_file: str):
+        pass

osi_dump/exporter/hypervisor/excel_hypervisor_exporter.py

@@ -1,32 +1,32 @@
-import logging
-
-from openpyxl import load_workbook
-import pandas as pd
-
-
-from osi_dump.exporter.hypervisor.hypervisor_exporter import HypervisorExporter
-
-from osi_dump.model.hypervisor import Hypervisor
-
-from osi_dump import util
-
-logger = logging.getLogger(__name__)
-
-
-class ExcelHypervisorExporter(HypervisorExporter):
-    def __init__(self, sheet_name: str, output_file: str):
-        self.sheet_name = sheet_name
-        self.output_file = output_file
-
-    def export_hypervisors(self, hypervisors: list[Hypervisor]):
-        df = pd.DataFrame([hypervisor.model_dump() for hypervisor in hypervisors])
-
-        df = util.expand_list_column(df, "aggregates")
-
-        logger.info(f"Exporting hypervisors for {self.sheet_name}")
-        try:
-            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
-
-            logger.info(f"Exported hypervisors for {self.sheet_name}")
-        except Exception as e:
-            logger.warning(f"Exporting hypervisors for {self.sheet_name} error: {e}")
+import logging
+
+from openpyxl import load_workbook
+import pandas as pd
+
+
+from osi_dump.exporter.hypervisor.hypervisor_exporter import HypervisorExporter
+
+from osi_dump.model.hypervisor import Hypervisor
+
+from osi_dump import util
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelHypervisorExporter(HypervisorExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_hypervisors(self, hypervisors: list[Hypervisor]):
+        df = pd.DataFrame([hypervisor.model_dump() for hypervisor in hypervisors])
+
+        df = util.expand_list_column(df, "aggregates")
+
+        logger.info(f"Exporting hypervisors for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+
+            logger.info(f"Exported hypervisors for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting hypervisors for {self.sheet_name} error: {e}")

osi_dump/exporter/hypervisor/hypervisor_exporter.py

@@ -1,7 +1,7 @@
-from abc import ABC, abstractmethod
-
-
-class HypervisorExporter(ABC):
-    @abstractmethod
-    def export_hypervisors(self, hypervisors, output_file: str):
-        pass
+from abc import ABC, abstractmethod
+
+
+class HypervisorExporter(ABC):
+    @abstractmethod
+    def export_hypervisors(self, hypervisors, output_file: str):
+        pass

osi_dump/exporter/image/excel_image_exporter.py

@@ -1,28 +1,28 @@
-import pandas as pd
-
-import logging
-
-
-from osi_dump import util
-from osi_dump.exporter.image.image_exporter import ImageExporter
-
-from osi_dump.model.image import Image
-
-logger = logging.getLogger(__name__)
-
-
-class ExcelImageExporter(ImageExporter):
-    def __init__(self, sheet_name: str, output_file: str):
-        self.sheet_name = sheet_name
-        self.output_file = output_file
-
-    def export_images(self, images: list[Image]):
-        df = pd.json_normalize([image.model_dump() for image in images])
-
-        logger.info(f"Exporting images for {self.sheet_name}")
-        try:
-            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
-
-            logger.info(f"Exported images for {self.sheet_name}")
-        except Exception as e:
-            logger.warning(f"Exporting images for {self.sheet_name} error: {e}")
+import pandas as pd
+
+import logging
+
+
+from osi_dump import util
+from osi_dump.exporter.image.image_exporter import ImageExporter
+
+from osi_dump.model.image import Image
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelImageExporter(ImageExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_images(self, images: list[Image]):
+        df = pd.json_normalize([image.model_dump() for image in images])
+
+        logger.info(f"Exporting images for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+
+            logger.info(f"Exported images for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting images for {self.sheet_name} error: {e}")

osi_dump/exporter/image/image_exporter.py

@@ -1,7 +1,7 @@
-from abc import ABC, abstractmethod
-
-
-class ImageExporter(ABC):
-    @abstractmethod
-    def export_images(self, images, output_file: str):
-        pass
+from abc import ABC, abstractmethod
+
+
+class ImageExporter(ABC):
+    @abstractmethod
+    def export_images(self, images, output_file: str):
+        pass

osi_dump/exporter/instance/excel_instance_exporter.py

@@ -1,29 +1,29 @@
-import pandas as pd
-
-import logging
-
-from openpyxl import load_workbook
-
-from osi_dump import util
-from osi_dump.exporter.instance.instance_exporter import InstanceExporter
-
-from osi_dump.model.instance import Instance
-
-logger = logging.getLogger(__name__)
-
-
-class ExcelInstanceExporter(InstanceExporter):
-    def __init__(self, sheet_name: str, output_file: str):
-        self.sheet_name = sheet_name
-        self.output_file = output_file
-
-    def export_instances(self, instances: list[Instance]):
-        df = pd.DataFrame([instance.model_dump() for instance in instances])
-
-        logger.info(f"Exporting instances for {self.sheet_name}")
-        try:
-            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
-
-            logger.info(f"Exported instances for {self.sheet_name}")
-        except Exception as e:
-            logger.warning(f"Exporting instances for {self.sheet_name} error: {e}")
+import pandas as pd
+import logging
+from typing import Generator
+
+from osi_dump import util
+from osi_dump.exporter.instance.instance_exporter import InstanceExporter
+from osi_dump.model.instance import Instance
+
+logger = logging.getLogger(__name__)
+
+class ExcelInstanceExporter(InstanceExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_instances(self, instances: Generator[Instance, None, None]):
+        df = pd.DataFrame(instance.model_dump() for instance in instances)
+
+        if df.empty:
+            logger.info(f"No instances to export for {self.sheet_name}")
+            return
+        df.sort_values(by='instance_name', inplace=True, na_position='last')
+
+        logger.info(f"Exporting instances for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+            logger.info(f"Exported instances for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting instances for {self.sheet_name} error: {e}")

osi_dump/exporter/instance/instance_exporter.py

@@ -1,7 +1,8 @@
-from abc import ABC, abstractmethod
-
-
-class InstanceExporter(ABC):
-    @abstractmethod
-    def export_instances(self, instances, output_file: str):
-        pass
+from abc import ABC, abstractmethod
+from typing import Generator
+from osi_dump.model.instance import Instance
+
+class InstanceExporter(ABC):
+    @abstractmethod
+    def export_instances(self, instances: Generator[Instance, None, None]):
+        pass

osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py

@@ -1,36 +1,36 @@
-import pandas as pd
-
-import logging
-
-
-from osi_dump import util
-
-from osi_dump.exporter.load_balancer.load_balancer_exporter import (
-    LoadBalancerExporter,
-)
-
-from osi_dump.model.load_balancer import LoadBalancer
-
-logger = logging.getLogger(__name__)
-
-
-class ExcelLoadBalancerExporter(LoadBalancerExporter):
-    def __init__(self, sheet_name: str, output_file: str):
-        self.sheet_name = sheet_name
-        self.output_file = output_file
-
-    def export_load_balancers(self, load_balancers: list[LoadBalancer]):
-        df = pd.json_normalize(
-            [load_balancer.model_dump() for load_balancer in load_balancers]
-        )
-
-        if "amphoraes" in df.columns:
-            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)
-
-            logger.info(f"Exported load_balancers for {self.sheet_name}")
-        except Exception as e:
-            logger.warning(f"Exporting load_balancers for {self.sheet_name} error: {e}")
+import pandas as pd
+
+import logging
+
+
+from osi_dump import util
+
+from osi_dump.exporter.load_balancer.load_balancer_exporter import (
+    LoadBalancerExporter,
+)
+
+from osi_dump.model.load_balancer import LoadBalancer
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelLoadBalancerExporter(LoadBalancerExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_load_balancers(self, load_balancers: list[LoadBalancer]):
+        df = pd.json_normalize(
+            [load_balancer.model_dump() for load_balancer in load_balancers]
+        )
+
+        if "amphoraes" in df.columns:
+            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)
+
+            logger.info(f"Exported load_balancers for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting load_balancers for {self.sheet_name} error: {e}")

osi_dump/exporter/load_balancer/load_balancer_exporter.py

@@ -1,7 +1,7 @@
-from abc import ABC, abstractmethod
-
-
-class LoadBalancerExporter(ABC):
-    @abstractmethod
-    def export_load_balancers(self, load_balancers, output_file: str):
-        pass
+from abc import ABC, abstractmethod
+
+
+class LoadBalancerExporter(ABC):
+    @abstractmethod
+    def export_load_balancers(self, load_balancers, output_file: str):
+        pass

osi_dump/exporter/network/excel_network_exporter.py

@@ -1,32 +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}")
+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

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

osi_dump/exporter/project/excel_project_exporter.py

@@ -1,30 +1,30 @@
-import pandas as pd
-
-import logging
-
-from openpyxl import load_workbook
-
-from osi_dump import util
-from osi_dump.exporter.project.project_exporter import ProjectExporter
-
-from osi_dump.model.project import Project
-
-logger = logging.getLogger(__name__)
-
-
-class ExcelProjectExporter(ProjectExporter):
-    def __init__(self, sheet_name: str, output_file: str):
-        self.sheet_name = sheet_name
-        self.output_file = output_file
-
-    def export_projects(self, projects: list[Project]):
-
-        df = pd.DataFrame([project.model_dump() for project in projects])
-
-        logger.info(f"Exporting projects for {self.sheet_name}")
-        try:
-            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
-
-            logger.info(f"Exported projects for {self.sheet_name}")
-        except Exception as e:
-            logger.warning(f"Exporting projects for {self.sheet_name} error: {e}")
+import pandas as pd
+
+import logging
+
+from openpyxl import load_workbook
+
+from osi_dump import util
+from osi_dump.exporter.project.project_exporter import ProjectExporter
+
+from osi_dump.model.project import Project
+
+logger = logging.getLogger(__name__)
+
+
+class ExcelProjectExporter(ProjectExporter):
+    def __init__(self, sheet_name: str, output_file: str):
+        self.sheet_name = sheet_name
+        self.output_file = output_file
+
+    def export_projects(self, projects: list[Project]):
+
+        df = pd.DataFrame([project.model_dump() for project in projects])
+
+        logger.info(f"Exporting projects for {self.sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
+
+            logger.info(f"Exported projects for {self.sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting projects for {self.sheet_name} error: {e}")

osi_dump/exporter/project/project_exporter.py

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

osi_dump/exporter/role_assignment/excel_role_assignment_exporter.py

@@ -1,35 +1,43 @@
-import pandas as pd
-
-import logging
-
-
-from osi_dump import util
-
-from osi_dump.exporter.role_assignment.role_assignment_exporter import (
-    RoleAssignmentExporter,
-)
-
-from osi_dump.model.role_assignment import RoleAssignment
-
-logger = logging.getLogger(__name__)
-
-
-class ExcelRoleAssignmentExporter(RoleAssignmentExporter):
-    def __init__(self, sheet_name: str, output_file: str):
-        self.sheet_name = sheet_name
-        self.output_file = output_file
-
-    def export_role_assignments(self, role_assignments: list[RoleAssignment]):
-        df = pd.json_normalize(
-            [role_assignment.model_dump() for role_assignment in role_assignments]
-        )
-
-        logger.info(f"Exporting role_assignments for {self.sheet_name}")
-        try:
-            util.export_data_excel(self.output_file, sheet_name=self.sheet_name, df=df)
-
-            logger.info(f"Exported role_assignments for {self.sheet_name}")
-        except Exception as e:
-            logger.warning(
-                f"Exporting role_assignments for {self.sheet_name} error: {e}"
-            )
+import logging
+import pandas as pd
+from osi_dump import util
+from .role_assignment_exporter import RoleAssignmentExporter
+from osi_dump.importer.role_assignment.role_assignment_importer import RoleAssignmentImporter
+
+logger = logging.getLogger(__name__)
+
+class ExcelRoleAssignmentExporter(RoleAssignmentExporter):
+    def __init__(self, sheet_name_prefix: str, output_file: str):
+        self.sheet_name_prefix = sheet_name_prefix
+        self.output_file = output_file
+
+    def export_role_assignments(self, importer: RoleAssignmentImporter):
+        # Sheet 1: User Effective Roles
+        df_effective = pd.json_normalize(
+            (role.model_dump() for role in importer.calculate_effective_roles())
+        )
+        if not df_effective.empty:
+            df_effective.sort_values(by=['user_name', 'role_name'], inplace=True)
+            self._export_to_sheet(df_effective, f"{self.sheet_name_prefix}-effective")
+
+        # Sheet 2: Raw User Roles
+        df_user = pd.json_normalize(
+            (role.model_dump() for role in importer.get_user_roles())
+        )
+        if not df_user.empty:
+            self._export_to_sheet(df_user, f"{self.sheet_name_prefix}-user")
+            
+        # Sheet 3: Raw Group Roles
+        df_group = pd.json_normalize(
+            (role.model_dump() for role in importer.get_group_roles())
+        )
+        if not df_group.empty:
+            self._export_to_sheet(df_group, f"{self.sheet_name_prefix}-group")
+
+    def _export_to_sheet(self, df: pd.DataFrame, sheet_name: str):
+        logger.info(f"Exporting data to sheet: {sheet_name}")
+        try:
+            util.export_data_excel(self.output_file, sheet_name=sheet_name, df=df)
+            logger.info(f"Exported data to sheet: {sheet_name}")
+        except Exception as e:
+            logger.warning(f"Exporting to {sheet_name} error: {e}")