osi-dump 0.1.3.2.1__tar.gz → 0.1.3.2.3__tar.gz

{osi_dump-0.1.3.2.1 → osi_dump-0.1.3.2.3}/PKG-INFO

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

{osi_dump-0.1.3.2.1 → osi_dump-0.1.3.2.3}/pyproject.toml

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

osi_dump-0.1.3.2.3/src/osi_dump/api/neutron.py

@@ -0,0 +1,65 @@
+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_floating_ip_project(connection: Connection, floating_ip_id: str):
+    # neutron_endpoint = os_util.get_endpoint(
+    #     connection=connection, service_type="network", interface="public"
+    # )
+
+    neutron_endpoints = os_util.get_endpoints(
+        connection=connection, service_type="network", interface="public"
+    )
+
+    response = None
+
+    for endpoint in neutron_endpoints:
+        try:
+            url = f"{endpoint}/v2.0/floatingips/{floating_ip_id}?fields=project_id"
+            response = connection.session.get(url)
+            if response.status_code == 200:
+                break
+        except Exception as e:
+            print(e)
+
+    if response is None:
+        return None
+
+    return response.json()["floatingip"]["project_id"]
+
+
+def get_router_project(connection: Connection, router_id: str):
+    # neutron_endpoint = os_util.get_endpoint(
+    #     connection=connection, service_type="network", interface="internal"
+    # )
+
+    neutron_endpoints = os_util.get_endpoints(
+        connection=connection, service_type="network", interface="public"
+    )
+
+    response = None
+
+    for endpoint in neutron_endpoints:
+        try:
+            url = f"{endpoint}/v2.0/routers/{router_id}?fields=project_id"
+
+            response = connection.session.get(url)
+
+            if response.status_code == 200:
+                break
+        except Exception as e:
+            print(e)
+
+    if response is None:
+        return None
+
+    data = response.json()
+
+    return data["router"]["project_id"]

osi_dump-0.1.3.2.3/src/osi_dump/api/octavia.py

@@ -0,0 +1,67 @@
+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
+
+
+def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
+    # octavia_endpoint = os_util.get_endpoint(
+    #     connection=connection, service_type="load-balancer", interface="public"
+    # )
+
+    octavia_endpoints = os_util.get_endpoints(
+        connection=connection, service_type="load-balancer", interface="public"
+    )
+
+    response = None
+
+    for endpoint in octavia_endpoints:
+        try:
+            url = f"{endpoint}/v2.0/lbaas/loadbalancers"
+            response = connection.session.get(url)
+            if response.status_code == 200:
+                break
+        except Exception as e:
+            print(e)
+
+    if response is None:
+        return None
+
+    data = response.json()
+
+    return data["loadbalancers"]
+
+
+def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
+
+    # octavia_endpoint = os_util.get_endpoint(
+    #     connection=connection, service_type="load-balancer", interface="public"
+    # )
+
+    octavia_endpoints = os_util.get_endpoints(
+        connection=connection, service_type="load-balancer", interface="public"
+    )
+
+    response = None
+
+    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"
+            response = connection.session.get(url)
+            if response.status_code == 200:
+                break
+        except Exception as e:
+            print(e)
+
+    if response is None:
+        return None
+
+    data = response.json()
+
+    amphoraes = data["amphorae"]
+
+    amphoraes = [dict(sorted(amphorae.items())) for amphorae in amphoraes]
+
+    return amphoraes

osi_dump-0.1.3.2.3/src/osi_dump/api/placement.py

@@ -0,0 +1,41 @@
+from openstack.connection import Connection
+from openstack.identity.v3.service import Service
+
+import osi_dump.util.openstack_util as os_util
+
+
+def get_usage(connection: Connection, resource_provider_id: str):
+
+    # placement_endpoint = os_util.get_endpoint(
+    #     connection=connection, service_type="placement", interface="public"
+    # )
+
+    # url = f"{placement_endpoint}/resource_providers/{resource_provider_id}/usages"
+
+    # response = connection.session.get(url)
+
+    # data = response.json()
+
+    # return data["usages"]
+
+    placement_endpoints = os_util.get_endpoints(
+        connection=connection, service_type="placement", interface="public"
+    )
+
+    response = None
+
+    for endpoint in placement_endpoints:
+        try:
+            url = f"{endpoint}/resource_providers/{resource_provider_id}/usages"
+            response = connection.session.get(url)
+            if response.status_code == 200:
+                break
+        except Exception as e:
+            print(e)
+
+    if response is None:
+        return None
+
+    data = response.json()
+
+    return data["usages"]

{osi_dump-0.1.3.2.1 → osi_dump-0.1.3.2.3}/src/osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py

@@ -23,8 +23,9 @@ class ExcelLoadBalancerExporter(LoadBalancerExporter):
         df = pd.json_normalize(
             [load_balancer.model_dump() for load_balancer in load_balancers]
         )
-        
-        df = util.expand_list_column(df, "amphoraes")
+
+        if "amphoraes" in df.columns:
+            df = util.expand_list_column(df, "amphoraes")
 
         logger.info(f"Exporting load_balancers for {self.sheet_name}")
         try:

{osi_dump-0.1.3.2.1 → osi_dump-0.1.3.2.3}/src/osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -72,6 +72,8 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
             operating_status=load_balancer["operating_status"],
             project_id=load_balancer["project_id"],
             provisioning_status=load_balancer["provisioning_status"],
+            created_at=load_balancer["created_at"],
+            updated_at=load_balancer["updated_at"],
             amphoraes=amphoraes,
         )
 

{osi_dump-0.1.3.2.1 → osi_dump-0.1.3.2.3}/src/osi_dump/model/load_balancer.py

@@ -17,3 +17,6 @@ class LoadBalancer(BaseModel):
     amphoraes: list[dict]
 
     project_id: Optional[str]
+
+    created_at: Optional[str]
+    updated_at: Optional[str]

osi_dump-0.1.3.2.3/src/osi_dump/util/openstack_util.py

@@ -0,0 +1,48 @@
+import urllib
+import urllib.parse
+
+from openstack.connection import Connection
+
+
+def get_endpoint(connection: Connection, service_type: str, interface: str) -> str:
+    endpoint = connection.endpoint_for(service_type=service_type, interface=interface)
+
+    parsed_endpoint = urllib.parse.urlparse(endpoint)
+
+    new_hostname = urllib.parse.urlparse(connection.auth["auth_url"]).hostname
+
+    port = parsed_endpoint.port
+
+    ret = urllib.parse.urlunparse(
+        parsed_endpoint._replace(netloc=f"{new_hostname}:{port}")._replace(
+            scheme="https"
+        )
+    )
+
+    return ret
+
+
+def get_endpoints(
+    connection: Connection, service_type: str, interface: str
+) -> list[str]:
+    endpoint = connection.endpoint_for(service_type=service_type, interface=interface)
+
+    parsed_endpoint = urllib.parse.urlparse(endpoint)
+
+    new_hostname = urllib.parse.urlparse(connection.auth["auth_url"]).hostname
+
+    port = parsed_endpoint.port
+
+    http_ret = urllib.parse.urlunparse(
+        parsed_endpoint._replace(netloc=f"{new_hostname}:{port}")._replace(
+            scheme="http"
+        )
+    )
+
+    https_ret = urllib.parse.urlunparse(
+        parsed_endpoint._replace(netloc=f"{new_hostname}:{port}")._replace(
+            scheme="https"
+        )
+    )
+
+    return [http_ret, https_ret]

{osi_dump-0.1.3.2.1 → osi_dump-0.1.3.2.3}/src/osi_dump.egg-info/PKG-INFO

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

osi_dump-0.1.3.2.1/src/osi_dump/api/neutron.py

@@ -1,44 +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_floating_ip_project(connection: Connection, floating_ip_id: str):
-    neutron_endpoint = os_util.get_endpoint(
-        connection=connection, service_type="network", interface="public"
-    )
-
-    try:
-        url = f"{neutron_endpoint}/v2.0/floatingips/{floating_ip_id}?fields=project_id"
-        response = connection.session.get(url)
-
-    except Exception as e:
-        print(e)
-
-    data = response.json()
-
-    return data["floatingip"]["project_id"]
-
-
-def get_router_project(connection: Connection, router_id: str):
-    neutron_endpoint = os_util.get_endpoint(
-        connection=connection, service_type="network", interface="internal"
-    )
-
-    try:
-        url = f"{neutron_endpoint}/v2.0/routers/{router_id}?fields=project_id"
-
-        response = connection.session.get(url)
-
-    except Exception as e:
-        print(e)
-
-    data = response.json()
-
-    return data["router"]["project_id"]

osi_dump-0.1.3.2.1/src/osi_dump/api/octavia.py

@@ -1,39 +0,0 @@
-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
-
-
-def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
-    octavia_endpoint = os_util.get_endpoint(
-        connection=connection, service_type="load-balancer", interface="public"
-    )
-
-    url = f"{octavia_endpoint}/v2.0/lbaas/loadbalancers"
-
-    response = connection.session.get(url)
-
-    data = response.json()
-
-    return data["loadbalancers"]
-
-
-def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
-
-    octavia_endpoint = os_util.get_endpoint(
-        connection=connection, service_type="load-balancer", interface="public"
-    )
-
-    url = f"{octavia_endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id&fields=compute_flavor"
-
-    response = connection.session.get(url)
-
-    data = response.json()
-
-    amphoraes = data["amphorae"]
-
-    amphoraes = [dict(sorted(amphorae.items())) for amphorae in amphoraes]
-
-    return amphoraes

osi_dump-0.1.3.2.1/src/osi_dump/api/placement.py

@@ -1,19 +0,0 @@
-from openstack.connection import Connection
-from openstack.identity.v3.service import Service
-
-import osi_dump.util.openstack_util as os_util
-
-
-def get_usage(connection: Connection, resource_provider_id: str):
-
-    placement_endpoint = os_util.get_endpoint(
-        connection=connection, service_type="placement", interface="public"
-    )
-
-    url = f"{placement_endpoint}/resource_providers/{resource_provider_id}/usages"
-
-    response = connection.session.get(url)
-
-    data = response.json()
-
-    return data["usages"]

osi_dump-0.1.3.2.1/src/osi_dump/util/openstack_util.py

@@ -1,22 +0,0 @@
-import urllib
-import urllib.parse
-
-from openstack.connection import Connection
-
-
-def get_endpoint(connection: Connection, service_type: str, interface: str) -> str:
-    endpoint = connection.endpoint_for(service_type=service_type, interface=interface)
-
-    parsed_endpoint = urllib.parse.urlparse(endpoint)
-
-    new_hostname = urllib.parse.urlparse(connection.auth["auth_url"]).hostname
-
-    port = parsed_endpoint.port
-
-    ret = urllib.parse.urlunparse(
-        parsed_endpoint._replace(netloc=f"{new_hostname}:{port}")._replace(
-            scheme="https"
-        )
-    )
-
-    return ret