osi-dump 0.1.3.3.2__tar.gz → 0.1.3.3.2.2__tar.gz

{osi_dump-0.1.3.3.2 → osi_dump-0.1.3.3.2.2}/PKG-INFO

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

{osi_dump-0.1.3.3.2 → osi_dump-0.1.3.3.2.2}/pyproject.toml

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

osi_dump-0.1.3.3.2.2/src/osi_dump/api/keystone.py

@@ -0,0 +1,48 @@
+import logging
+
+from openstack.connection import Connection
+from openstack.identity.v3.service import Service
+from openstack.load_balancer.v2.load_balancer import LoadBalancer
+
+import osi_dump.util.openstack_util as os_util
+
+logger = logging.getLogger(__name__)
+
+
+def get_role_assignments(connection: Connection): 
+    keystone_endpoint = connection.endpoint_for(service_type="identity", interface="public")
+    
+    logger.info(keystone_endpoint)
+    
+    try:
+        if "v3" not in keystone_endpoint: 
+            url = f"{keystone_endpoint}/v3/role_assignments?include_names"
+        else: 
+            url = f"{keystone_endpoint}/role_assignments?include_names"
+            
+        logger.info(url)
+        response = connection.session.get(url)
+    except Exception as e: 
+        logger.info(e)
+        
+    if response is None: 
+        return []
+    
+    return response.json()['role_assignments']    
+    
+    # keystone_endpoints = [connection.endpoint_for(service_type="keystone", interface="public")]
+    
+    # for endpoint in keystone_endpoints: 
+    #     try: 
+    #         url = f"{endpoint}/v3/role_assignments?include_names"
+    #         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()['role_assignments']
+    

{osi_dump-0.1.3.3.2 → osi_dump-0.1.3.3.2.2}/src/osi_dump/importer/role_assignment/openstack_role_assignment_importer.py

@@ -36,7 +36,7 @@ class OpenStackRoleAssignmentImporter(RoleAssignmentImporter):
         try:
             osrole_assignments = get_role_assignments(self.connection)
 
-           
+            logger.info(osrole_assignments)
         except Exception as e:
             raise Exception(
                 f"Can not fetch role_assignments for {self.connection.auth['auth_url']}"

{osi_dump-0.1.3.3.2 → osi_dump-0.1.3.3.2.2}/src/osi_dump.egg-info/PKG-INFO

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

osi_dump-0.1.3.3.2/src/osi_dump/api/keystone.py

@@ -1,30 +0,0 @@
-import logging
-
-from openstack.connection import Connection
-from openstack.identity.v3.service import Service
-from openstack.load_balancer.v2.load_balancer import LoadBalancer
-
-import osi_dump.util.openstack_util as os_util
-
-logger = logging.getLogger(__name__)
-
-
-def get_role_assignments(connection: Connection): 
-    keystone_endpoints = os_util.get_endpoints(
-        connection=connection, service_type="identity", interface="public"
-    )
-    
-    for endpoint in keystone_endpoints: 
-        try: 
-            url = f"{endpoint}/v3/role_assignments?include_names"
-            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()['role_assignments']
-