osi-dump 0.1.3.3.3.1__py3-none-any.whl → 0.1.3.3.3.2__py3-none-any.whl

osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -15,28 +15,24 @@ from osi_dump.api.keystone import get_role_assignments
 logger = logging.getLogger(__name__)
 
 
-class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):    
+class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
     def __init__(self, connection: Connection):
         self.connection = connection
-        
+
         self.users = {}
         self.roles = {}
-        
-    def _get_users(self): 
+
+    def _get_users(self):
         os_users = self.connection.identity.users()
-        
-        for os_user in os_users: 
-            print(os_user)
-            self.users[os_user.id] = os_user.name 
-    
-    def _get_roles(self): 
+
+        for os_user in os_users:
+            self.users[os_user.id] = os_user.name
+
+    def _get_roles(self):
         os_roles = self.connection.identity.roles()
-        
-        for os_role in os_roles: 
-            
-            print(os_role)
-            self.roles[os_role.id] = os_role.name 
-        
+
+        for os_role in os_roles:
+            self.roles[os_role.id] = os_role.name
 
     def import_role_assignments(self) -> list[RoleAssignment]:
         """Import role_assignments information from Openstack
@@ -51,15 +47,15 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         logger.info(
             f"Importing role_assignments for {self.connection.auth['auth_url']}"
         )
-        
-        try: 
+
+        try:
             self._get_users()
-        except Exception as e: 
+        except Exception as e:
             logger.info(f"Getting user list failed {e}")
-            
-        try: 
-            self._get_roles() 
-        except Exception as e: 
+
+        try:
+            self._get_roles()
+        except Exception as e:
             logger.info(f"Getting role list failed {e}")
 
         try:
@@ -73,7 +69,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
             ) from e
 
         role_assignments: list[RoleAssignment] = []
-        
+
         with concurrent.futures.ThreadPoolExecutor() as executor:
             futures = [
                 executor.submit(self._get_role_assignment_info, role_assignment)
@@ -83,7 +79,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
                 role_assignments.append(future.result())
 
         logger.info(f"Imported role_assignments for {self.connection.auth['auth_url']}")
-        
+
         return role_assignments
 
     def _get_role_assignment_info(
@@ -121,7 +117,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
             user_name=user_name,
             role_id=role_id,
             role_name=role_name,
-            scope=role_assignment['scope'],
+            scope=role_assignment["scope"],
         )
 
         return role_assignment_ret

osi_dump/model/authentication_info.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from pydantic import BaseModel, ConfigDict
 
 
@@ -10,3 +12,4 @@ class AuthenticationInfo(BaseModel):
     password: str
     user_domain_name: str
     project_domain_name: str
+    interface: Optional[str] = "public"

osi_dump/os_connection/get_connections.py

@@ -33,6 +33,7 @@ def get_connections(file_path) -> list[Connection]:
                 password=auth.password,
                 project_domain_name=auth.project_domain_name,
                 user_domain_name=auth.user_domain_name,
+                interface=auth.interface,
             )
 
             connections.append(connection)

{osi_dump-0.1.3.3.3.1.dist-info → osi_dump-0.1.3.3.3.2.dist-info}/METADATA

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

{osi_dump-0.1.3.3.3.1.dist-info → osi_dump-0.1.3.3.3.2.dist-info}/RECORD

@@ -77,7 +77,7 @@ osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 osi_dump/importer/project/openstack_project_importer.py,sha256=ylcm3jEFqh4gW8vhzhIaBq5v4A-PV3BaaogC8uHlSkg,3295
 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=iJYSY8VWNZ8K7xz8wotGOqbvS5fjJsA6WQcmyPLh3mU,3720
+osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=p7Ocn27Esh-QipqNyQCviO6xt4TTWuIbqiNQ8oAPVpY,3557
 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=T_Wr45nJrCcp2OOdRawmdQkNBDzczA-3DPx9dlewd4g,2781
@@ -86,7 +86,7 @@ osi_dump/importer/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 osi_dump/importer/volume/openstack_volume_importer.py,sha256=XmTa0FP8VUmnOofVEkaHQEAQUNfa7ODO4kV9SfKPui4,2491
 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/authentication_info.py,sha256=a_E2g1FFhqanvCGkvSFtfukBm-Hfaa9sxmM9NYg87U8,326
 osi_dump/model/external_port.py,sha256=xnCFQkbpPgc9Bq5MSA9nRHP3X6tiadQSvB2p94Hsxhc,541
 osi_dump/model/flavor.py,sha256=bV1DAL0fMN-bZ0Is7Cd-LLuEdL1ihVPeGcLvbhOcB-I,301
 osi_dump/model/floating_ip.py,sha256=CRJufC5ZaxxcbGvdot7Af-sO8uyKbyQK9zHljfBnyFA,427
@@ -99,7 +99,7 @@ osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAh
 osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
 osi_dump/model/volume.py,sha256=C1WdZ_GwlL-iaBqrFpgPMfIQZj3ST2KQHzwXceYxRZg,423
 osi_dump/os_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/os_connection/get_connections.py,sha256=1zeir4cEtzJOUOn53zUmlD9lWMvYXhuRr0IhI5U1DAw,1753
+osi_dump/os_connection/get_connections.py,sha256=3FcsOHL6lD8gIDrBEfUhVrTIyCNYG9HKlDDtHakTNUQ,1795
 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
@@ -109,8 +109,8 @@ osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo
 osi_dump/util/openstack_util.py,sha256=_o8LiRmQKtxQ8hU3rbrMNwIAxt0-aWD2rjq-NvVdK9E,1299
 osi_dump/util/panda_excel.py,sha256=owr8AffIxqN3yY8kIv55Ox4j2dRz7kXZvSZFZeft8dw,734
 osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
-osi_dump-0.1.3.3.3.1.dist-info/METADATA,sha256=YbY5lHDZayEXU_QNelfw0wiCQl8PDzaK0OALn4Lt-9c,679
-osi_dump-0.1.3.3.3.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-osi_dump-0.1.3.3.3.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.3.3.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.3.3.1.dist-info/RECORD,,
+osi_dump-0.1.3.3.3.2.dist-info/METADATA,sha256=mrCAboJm8Gv9jHz5qPXzMt643tKOWzz2LlC2zOE1Ilc,679
+osi_dump-0.1.3.3.3.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+osi_dump-0.1.3.3.3.2.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.3.3.2.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.3.3.2.dist-info/RECORD,,