osi-dump 0.1.3__py3-none-any.whl → 0.1.3.1.1__py3-none-any.whl

osi_dump/api/neutron.py

@@ -4,12 +4,14 @@ 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 = connection.endpoint_for(
-        service_type="network", interface="public"
+    neutron_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="network", interface="public"
     )
 
     try:
@@ -25,12 +27,12 @@ def get_floating_ip_project(connection: Connection, floating_ip_id: str):
 
 
 def get_router_project(connection: Connection, router_id: str):
-    octavia_endpoint = connection.endpoint_for(
-        service_type="network", interface="internal"
+    neutron_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="network", interface="internal"
     )
 
     try:
-        url = f"{octavia_endpoint}/v2.0/routers/{router_id}?fields=project_id"
+        url = f"{neutron_endpoint}/v2.0/routers/{router_id}?fields=project_id"
 
         response = connection.session.get(url)
 

osi_dump/api/octavia.py

@@ -3,9 +3,12 @@ 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 = connection.endpoint_for(
-        service_type="load-balancer", interface="public"
+    octavia_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="load-balancer", interface="public"
     )
 
     url = f"{octavia_endpoint}/v2.0/lbaas/loadbalancers"
@@ -19,8 +22,8 @@ def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
 
 def get_amphoraes(connection: Connection, load_balancer_id: str) -> list[dict]:
 
-    octavia_endpoint = connection.endpoint_for(
-        service_type="load-balancer", interface="public"
+    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"

osi_dump/api/placement.py

@@ -1,11 +1,13 @@
 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 = connection.endpoint_for(
-        service_type="placement", interface="public"
+    placement_endpoint = os_util.get_endpoint(
+        connection=connection, service_type="placement", interface="public"
     )
 
     url = f"{placement_endpoint}/resource_providers/{resource_provider_id}/usages"

osi_dump/importer/instance/openstack_instance_importer.py

@@ -107,9 +107,7 @@ class OpenStackInstanceImporter(InstanceImporter):
             vgpus = int(vgpu_props[1])
 
         except Exception as e:
-            logger.warning(
-                f"Unable to obtain GPU information for instance {server.name}: {e}"
-            )
+            pass
 
         instance = Instance(
             instance_id=server.id,

osi_dump/importer/router/openstack_router_importer.py

@@ -78,6 +78,7 @@ class OpenStackRouterImporter(RouterImporter):
             external_net_id=external_net_id,
             external_net_ip=external_net_ip,
             status=router.status,
+            admin_state=router.is_admin_state_up,
             project_id=router.project_id,
             created_at=router.created_at,
             updated_at=router.updated_at,

osi_dump/model/image.py

@@ -23,5 +23,5 @@ class Image(BaseModel):
     virtual_size: Optional[int]
     visibility: str
 
-    created_at: str
-    updated_at: str
+    created_at: Optional[str]
+    updated_at: Optional[str]

osi_dump/model/router.py

@@ -13,8 +13,10 @@ class Router(BaseModel):
     external_net_id: Optional[str]
     external_net_ip: Optional[str]
 
+    admin_state: Optional[bool]
+
     status: str
     project_id: Optional[str]
 
-    created_at: str
-    updated_at: str
+    created_at: Optional[str]
+    updated_at: Optional[str]

osi_dump/model/volume.py

@@ -19,5 +19,5 @@ class Volume(BaseModel):
 
     snapshots: Optional[list[str]]
 
-    updated_at: str
-    created_at: str
+    updated_at: Optional[str]
+    created_at: Optional[str]

osi_dump/util/openstack_util.py

@@ -0,0 +1,22 @@
+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

{osi_dump-0.1.3.dist-info → osi_dump-0.1.3.1.1.dist-info}/METADATA

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

{osi_dump-0.1.3.dist-info → osi_dump-0.1.3.1.1.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=m3pfDbwbE4sWKMYOWPiFDK4PsCHxiJmn4QWu29vvcYw,1082
-osi_dump/api/octavia.py,sha256=_vuuZ-Pcj4oV1A3Sf_RSiuc_UxcHXKLty87HEyipPGg,950
-osi_dump/api/placement.py,sha256=9yADLulo1HfUnPLE7IJt4ZY8e2jRTaoeV4J4MMiKCew,455
+osi_dump/api/neutron.py,sha256=xRhNkEBDzOoUQHSWmkoI_Tdbcs8kvdS0UpPNkzxQv3g,1170
+osi_dump/api/octavia.py,sha256=sOFoH89knyuI_gkIxvHfjuZ9mCFzc4zBw8GHN_kb794,1039
+osi_dump/api/placement.py,sha256=UvIGwAvowmCLobVARut8WnLVV-IdCDniyW9y16l2B_I,523
 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
@@ -68,7 +68,7 @@ osi_dump/importer/image/image_importer.py,sha256=6zwAMnS58S2HGwARwebqf4VE9IBQBv5
 osi_dump/importer/image/openstack_image_importer.py,sha256=ffc13qnIGu07OXnIPaKiVxGdufep82RfQoKqLb1bwHc,2455
 osi_dump/importer/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIBPBwwANpEaWCgRsgImc,196
-osi_dump/importer/instance/openstack_instance_importer.py,sha256=FJqVnow-RdI8RI9geJ-E4teo_HTuQALupeFrK8HtUmc,4158
+osi_dump/importer/instance/openstack_instance_importer.py,sha256=o5ld1weNM8X4ibZMQYhfhckTkea5TqVEsG4Zs0q2T90,4049
 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=sX5ZMHT-QPIuAD4YBwitxj8l5fMvbOsA-BOQxLL84lU,2392
@@ -79,7 +79,7 @@ osi_dump/importer/role_assignment/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 osi_dump/importer/role_assignment/openstack_role_assignment_importer.py,sha256=bff9rutp2835KA0ibVsvtCZStNgtiTkc7IKUsCmaXRo,3003
 osi_dump/importer/role_assignment/role_assignment_importer.py,sha256=Faorx0qsgdXjv5y2t-7obpV3wFfbmByx_-8b9yBr7L8,228
 osi_dump/importer/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-osi_dump/importer/router/openstack_router_importer.py,sha256=-8xJ9hV7Y9ZpUXIEl3PHsGvggp9r57-A9hL8Tm_lb7c,2731
+osi_dump/importer/router/openstack_router_importer.py,sha256=T_Wr45nJrCcp2OOdRawmdQkNBDzczA-3DPx9dlewd4g,2781
 osi_dump/importer/router/router_importer.py,sha256=L2i0Fnh3iZEsP_PFtx1j0yWTpkmgHsc6Pobii8lDRCo,186
 osi_dump/importer/volume/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/volume/openstack_volume_importer.py,sha256=Tte9fX91oxEoRcUZPJd7g6oH6izcWy8WwFCapg_ZY1M,2454
@@ -90,13 +90,13 @@ osi_dump/model/external_port.py,sha256=4FlyG8ZmQO7nNdavmRBhK8ZMsNogmhMqEBa03okvq
 osi_dump/model/flavor.py,sha256=-G8FaH_qiVrgtRxAWhdpC1c9FRdXLRroG-WJ03-DRZ4,318
 osi_dump/model/floating_ip.py,sha256=CRJufC5ZaxxcbGvdot7Af-sO8uyKbyQK9zHljfBnyFA,427
 osi_dump/model/hypervisor.py,sha256=pToa-rg7LldKd-h3aNZDJQPy5dhYDIXehq-tr8_xv1I,336
-osi_dump/model/image.py,sha256=5dXlBsiT0BWo5orQj38jEGtiFEwiRCJDmdhghg3RcTc,504
+osi_dump/model/image.py,sha256=JUr90XQgA6d3EyoZyV-Cyz4Y1GkEBIDhALsf-_eoR-Y,524
 osi_dump/model/instance.py,sha256=z38nK0s5bmZXRMItJVsnZ1rQX6NO6skXR49ZojgSb2Q,548
 osi_dump/model/load_balancer.py,sha256=T5RU6gm36ePYCh3KQ_OYO44FHMfxTcSNaiuKP5E_9CY,352
 osi_dump/model/project.py,sha256=3fNsDcWxuRVBS96W98C_Fia82qt14InjUM7n7rBCX6E,679
 osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
-osi_dump/model/router.py,sha256=nO0XW0mpabr4ajM40Biuva63N8YWulZUrhH5kmPnKgI,363
-osi_dump/model/volume.py,sha256=1p5Xw0LPxfroJwSYtE-n_Gv4MsRDA_sSvc7SQY_Uo8I,371
+osi_dump/model/router.py,sha256=bT533cP50XrzPzwbkXwjdnmm5j5nM8jVEIqmfJ2T8G8,416
+osi_dump/model/volume.py,sha256=CPlZ2NUKLZ2QI-WYNcxFrpd2kYEHPITpCztdGRGBHgM,391
 osi_dump/os_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/os_connection/get_connections.py,sha256=1zeir4cEtzJOUOn53zUmlD9lWMvYXhuRr0IhI5U1DAw,1753
 osi_dump/util/__init__.py,sha256=obJLcem8iWbVC3NIk4GHBMwwAsW-FcrwRdfzphuDjpY,330
@@ -105,10 +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/panda_excel.py,sha256=GHHLguKLMm1sq4FHTPHABTjx7IqpOcGF_3OJT-cJORE,1011
 osi_dump/util/validate_dir_path.py,sha256=pL_OrY8JnNwk3vj6Zp6bsZtgHXhszSGRoqIt-1G5S90,507
-osi_dump-0.1.3.dist-info/METADATA,sha256=MaY9IAfpGuRL54svZNwYrkCRQeWsvTxECZr4Rkl056g,673
-osi_dump-0.1.3.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
-osi_dump-0.1.3.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.dist-info/RECORD,,
+osi_dump-0.1.3.1.1.dist-info/METADATA,sha256=OCkJgALyHZdg7eUWvh6_gZmI6EFP9GnU-qMhimiPbR4,677
+osi_dump-0.1.3.1.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+osi_dump-0.1.3.1.1.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.1.1.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.1.1.dist-info/RECORD,,

{osi_dump-0.1.3.dist-info → osi_dump-0.1.3.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any