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

{osi_dump-0.1.3.3.4.0 → 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.4.0
+Version: 0.1.3.3.4.1
 Summary: OpenStack information dump tool
 Author: TVKain
 License: Apache-2.0

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

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

{osi_dump-0.1.3.3.4.0 → 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.0 → osi_dump-0.1.3.3.4.1}/src/osi_dump/cli.py

@@ -166,29 +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)
+    #_network(connections=connections, output_path=output_path)
 
     util.excel_autosize_column(output_path)
 

{osi_dump-0.1.3.3.4.0 → 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.0 → 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.4.0 → 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.4.0
+Version: 0.1.3.3.4.1
 Summary: OpenStack information dump tool
 Author: TVKain
 License: Apache-2.0