osi-dump 0.1.3.3.3.1__tar.gz → 0.1.3.3.3.3__tar.gz

{osi_dump-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/PKG-INFO

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

{osi_dump-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/pyproject.toml

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

{osi_dump-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/src/osi_dump/api/octavia.py

@@ -48,7 +48,7 @@ def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
 
     for endpoint in octavia_endpoints:
         try:
-            url = f"{endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id&fields=compute_flavor"
+            url = f"{endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id&fields=compute_flavor&fields=role"
             response = connection.session.get(url)
             if response.status_code == 200:
                 break

{osi_dump-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/src/osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -81,6 +81,7 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
                 created_at=load_balancer["created_at"],
                 updated_at=load_balancer["updated_at"],
                 amphoraes=amphoraes,
+                vip=load_balancer["vip_address"]
             )
 
             return load_balancer_ret

{osi_dump-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/src/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-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/src/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-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/src/osi_dump/model/load_balancer.py

@@ -15,6 +15,7 @@ class LoadBalancer(BaseModel):
     operating_status: Optional[str]
 
     amphoraes: list[dict]
+    vip: Optional[str]
 
     project_id: Optional[str]
 

{osi_dump-0.1.3.3.3.1 → osi_dump-0.1.3.3.3.3}/src/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 → osi_dump-0.1.3.3.3.3}/src/osi_dump.egg-info/PKG-INFO

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