osi-dump 0.1.3.2.1__py3-none-any.whl → 0.1.3.2.3__py3-none-any.whl

osi_dump/api/neutron.py

@@ -10,34 +10,55 @@ logger = logging.getLogger(__name__)
 
 
 def get_floating_ip_project(connection: Connection, floating_ip_id: str):
-    neutron_endpoint = os_util.get_endpoint(
+    # 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"
     )
 
-    try:
-        url = f"{neutron_endpoint}/v2.0/floatingips/{floating_ip_id}?fields=project_id"
-        response = connection.session.get(url)
+    response = None
 
-    except Exception as e:
-        print(e)
+    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)
 
-    data = response.json()
+    if response is None:
+        return None
 
-    return data["floatingip"]["project_id"]
+    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_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"
     )
 
-    try:
-        url = f"{neutron_endpoint}/v2.0/routers/{router_id}?fields=project_id"
+    response = None
+
+    for endpoint in neutron_endpoints:
+        try:
+            url = f"{endpoint}/v2.0/routers/{router_id}?fields=project_id"
+
+            response = connection.session.get(url)
 
-        response = connection.session.get(url)
+            if response.status_code == 200:
+                break
+        except Exception as e:
+            print(e)
 
-    except Exception as e:
-        print(e)
+    if response is None:
+        return None
 
     data = response.json()
 

osi_dump/api/octavia.py

@@ -7,13 +7,27 @@ import osi_dump.util.openstack_util as os_util
 
 
 def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
-    octavia_endpoint = os_util.get_endpoint(
+    # 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"
     )
 
-    url = f"{octavia_endpoint}/v2.0/lbaas/loadbalancers"
+    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)
 
-    response = connection.session.get(url)
+    if response is None:
+        return None
 
     data = response.json()
 
@@ -22,13 +36,27 @@ def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
 
 def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
 
-    octavia_endpoint = os_util.get_endpoint(
+    # 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"
     )
 
-    url = f"{octavia_endpoint}/v2/octavia/amphorae?load_balancer_id={load_balancer_id}&fields=status&fields=compute_id&fields=compute_flavor"
+    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)
 
-    response = connection.session.get(url)
+    if response is None:
+        return None
 
     data = response.json()
 

osi_dump/api/placement.py

@@ -6,13 +6,35 @@ import osi_dump.util.openstack_util as os_util
 
 def get_usage(connection: Connection, resource_provider_id: str):
 
-    placement_endpoint = os_util.get_endpoint(
+    # 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"
     )
 
-    url = f"{placement_endpoint}/resource_providers/{resource_provider_id}/usages"
+    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)
 
-    response = connection.session.get(url)
+    if response is None:
+        return None
 
     data = response.json()
 

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/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/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/util/openstack_util.py

@@ -20,3 +20,29 @@ def get_endpoint(connection: Connection, service_type: str, interface: str) -> s
     )
 
     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.dist-info → osi_dump-0.1.3.2.3.dist-info}/METADATA

@@ -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.dist-info → osi_dump-0.1.3.2.3.dist-info}/RECORD

@@ -2,9 +2,9 @@ osi_dump/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/__main__.py,sha256=fCVTLFipB-P0872_4j7iOJNNosOMBj3YdHr8TH_fhRY,71
 osi_dump/cli.py,sha256=vLijmcrWieCVK4cSLN2sK9ltWlercw9Zg6yBEvZtPkg,6379
 osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/api/neutron.py,sha256=xRhNkEBDzOoUQHSWmkoI_Tdbcs8kvdS0UpPNkzxQv3g,1170
-osi_dump/api/octavia.py,sha256=F03c9WaQpKbWOjCvFndZYStClfbhaGyYnIxtgqs1bQ0,1137
-osi_dump/api/placement.py,sha256=UvIGwAvowmCLobVARut8WnLVV-IdCDniyW9y16l2B_I,523
+osi_dump/api/neutron.py,sha256=pag_d6MsxA1gOUit4bvVUaTiTrPqLJjwz9KU_QSpxwM,1788
+osi_dump/api/octavia.py,sha256=Cgzz9Pf26YFETqbXSXYSHUA_PWDy_3V4zPm0RZ8QKBo,1905
+osi_dump/api/placement.py,sha256=yoWzg39b8nK2E1nrxDhLxLsa7FcBTw57gfy8b5F5ijc,1096
 osi_dump/batch_handler/__init__.py,sha256=wsiE42GCjbKgXBzpiahWEDF_-IXCKzr6PyrLn0oEKSc,288
 osi_dump/batch_handler/external_port_batch_handler.py,sha256=iGm0htGbLkpTX5RFPcrvXrVVn0eeTpavN3u4s58Z_pE,1783
 osi_dump/batch_handler/flavor_batch_handler.py,sha256=Cxf-rkuW5MrrOyiKi9N3InsdDGku7Bf0CAaPNhhM0hE,1589
@@ -37,7 +37,7 @@ osi_dump/exporter/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 osi_dump/exporter/instance/excel_instance_exporter.py,sha256=8WTv3RDOdUkumyWzwUK4KAZCnnq9P2yKi5TC091I9fs,931
 osi_dump/exporter/instance/instance_exporter.py,sha256=5CuKKvTa5S2_Ds7fap6tle4go9pOFmQ5VEf6O7tjwBo,161
 osi_dump/exporter/load_balancer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py,sha256=Wq5ik_BTfa2RqMZKtCP2AkFVyJXne7N5OTXj0RCQsbI,1071
+osi_dump/exporter/load_balancer/excel_load_balancer_exporter.py,sha256=gffLcLr8uvSbaf7rwZDgNRCPKh8bMIs2ShHtyotpKmw,1105
 osi_dump/exporter/load_balancer/load_balancer_exporter.py,sha256=Z5uvEKz1UG_dpAw5KVh-IX5PWLzlPt7pV9773bkgjXs,175
 osi_dump/exporter/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/exporter/project/excel_project_exporter.py,sha256=2U3Tvn_Bk4xEQk3Tmh-oj5WXAG1bfxI6m7WVPF1upQw,916
@@ -71,7 +71,7 @@ osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIB
 osi_dump/importer/instance/openstack_instance_importer.py,sha256=bvDZdwkxBZl40shIHAQ0QOkRcZEkWaeksROF7DZ5syA,4085
 osi_dump/importer/load_balancer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/load_balancer/load_balancer_importer.py,sha256=fzInBlkscqlbhCATeQYXvufc-WHq2pbofTJJifN0zaY,218
-osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=9yj60y4MEIHV10e9tStR2B7S0LAOR-jzd4BSshLbG-8,2596
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=eF6VqDDAjTzKsvSrbnEzSNhLRZV6nQL4M5XhbshCVTQ,2700
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/project/openstack_project_importer.py,sha256=ylcm3jEFqh4gW8vhzhIaBq5v4A-PV3BaaogC8uHlSkg,3295
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
@@ -92,7 +92,7 @@ osi_dump/model/floating_ip.py,sha256=CRJufC5ZaxxcbGvdot7Af-sO8uyKbyQK9zHljfBnyFA
 osi_dump/model/hypervisor.py,sha256=6dWEMVrrjOQolX936FqY994S7RAXpMPATpsLPVNeCyk,455
 osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
 osi_dump/model/instance.py,sha256=ixJUGMsNAsWIRSXXHZ2fHA9Wr1wPYZONyEhS75wfQp8,577
-osi_dump/model/load_balancer.py,sha256=T5RU6gm36ePYCh3KQ_OYO44FHMfxTcSNaiuKP5E_9CY,352
+osi_dump/model/load_balancer.py,sha256=x8mTvdXa5FmuJLwx4qu2DJqPQISoO-0A3a76Ki_jy34,413
 osi_dump/model/project.py,sha256=_mMaKKM9RQYiorh6zWMrC_WJ3x9RxhZxn4lLa_B3niY,710
 osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
 osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
@@ -105,11 +105,11 @@ osi_dump/util/excel_autosize_column.py,sha256=zzQ6uXkQhHAqVn9fUAgNjoCH_HiNEC9Dcj
 osi_dump/util/excel_sort_sheet.py,sha256=o4jXtP1ZFYtAGzkAP5S8Tym4h-SEoFBAI3j24y-24UM,1047
 osi_dump/util/export_data_excel.py,sha256=VYSxDBZ7dgSbTj3n_8RRPqe183tILNh6wJW-UnFvJUU,882
 osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo_AR0,111
-osi_dump/util/openstack_util.py,sha256=mPWLoVdSg4mukqtX87fN0Q9aDcRicJIqIsIOIIu1PnY,591
+osi_dump/util/openstack_util.py,sha256=PmoGlXNJqCQAbZBBHj-BM5JdY5g9FHERXtOn4Lv0p3k,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.2.1.dist-info/METADATA,sha256=PgoG_qZZ3C_EDSl6xRQ733hGybg3QKmiHhivQD_KnX0,677
-osi_dump-0.1.3.2.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-osi_dump-0.1.3.2.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.2.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.2.1.dist-info/RECORD,,
+osi_dump-0.1.3.2.3.dist-info/METADATA,sha256=dzxvfqhGDUONet8v93VLUT-zS6mZovOTttwI61Nhvg0,677
+osi_dump-0.1.3.2.3.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+osi_dump-0.1.3.2.3.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.2.3.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.2.3.dist-info/RECORD,,