osi-dump 0.1.3.3.3.6__py3-none-any.whl → 0.1.3.3.3.8__py3-none-any.whl

osi_dump/api/octavia.py

@@ -6,6 +6,29 @@ from openstack.load_balancer.v2.load_balancer import LoadBalancer
 import osi_dump.util.openstack_util as os_util
 
 
+def get_load_balancer_flavor(connection: Connection, flavor_id: str) -> dict: 
+    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/flavors/{flavor_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["flavor"]
+
 def get_load_balancers(connection: Connection) -> list[LoadBalancer]:
     # octavia_endpoint = os_util.get_endpoint(
     #     connection=connection, service_type="load-balancer", interface="public"

osi_dump/importer/load_balancer/openstack_load_balancer_importer.py

@@ -62,6 +62,21 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
         return load_balancers
 
     def _get_load_balancer_info(self, load_balancer: OSLoadBalancer) -> LoadBalancer:
+
+        lb_flavor_name = None 
+        lb_flavor_description = None 
+
+        try: 
+            lb_flavor = octavia_api.get_load_balancer_flavor(
+                connection=self.connection, 
+                flavor_id=load_balancer["flavor_id"]
+            )
+
+            lb_flavor_name = lb_flavor["name"]
+            lb_flavor_description = lb_flavor["description"]
+        except Exception as e: 
+            logger.warning(f"Get load balancer flavor failed {e}")
+
         try: 
             amphoraes = octavia_api.get_amphoraes(
                 connection=self.connection, load_balancer_id=load_balancer["id"]
@@ -83,7 +98,9 @@ class OpenStackLoadBalancerImporter(LoadBalancerImporter):
                 created_at=load_balancer["created_at"],
                 updated_at=load_balancer["updated_at"],
                 amphoraes=amphoraes,
-                vip=load_balancer["vip_address"]
+                vip=load_balancer["vip_address"],
+                flavor_name=lb_flavor_name, 
+                flavor_description=lb_flavor_description
             )
 
             return load_balancer_ret

osi_dump/model/load_balancer.py

@@ -14,6 +14,9 @@ class LoadBalancer(BaseModel):
 
     operating_status: Optional[str]
 
+    flavor_name: Optional[str]
+    flavor_description: Optional[str]
+
     amphoraes: list[dict] # compute_id, compute_flavor_id, flavor_name, flavor_description
     vip: Optional[str]
 

{osi_dump-0.1.3.3.3.6.dist-info → osi_dump-0.1.3.3.3.8.dist-info}/METADATA

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

{osi_dump-0.1.3.3.3.6.dist-info → osi_dump-0.1.3.3.3.8.dist-info}/RECORD

@@ -4,7 +4,7 @@ osi_dump/cli.py,sha256=vLijmcrWieCVK4cSLN2sK9ltWlercw9Zg6yBEvZtPkg,6379
 osi_dump/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/api/keystone.py,sha256=3oCqzf1cHKs3THOiq6t39_OXNHHTVK9hwCnLVlP8FYg,1446
 osi_dump/api/neutron.py,sha256=pag_d6MsxA1gOUit4bvVUaTiTrPqLJjwz9KU_QSpxwM,1788
-osi_dump/api/octavia.py,sha256=WM8_7911CIWU-x1FiN_5kX_CUgXwqG4VloJp7AsGFsI,1917
+osi_dump/api/octavia.py,sha256=rn7KJNb6X3O_JNFvDDb3cc3B94NmaTtCFiDvG9j7QHc,2541
 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
@@ -72,7 +72,7 @@ osi_dump/importer/instance/instance_importer.py,sha256=TaaPgEFVVMRT3mSXrzQkSaSIB
 osi_dump/importer/instance/openstack_instance_importer.py,sha256=HvA1hYLAneY0KtDTk7nz6TWXNGO5s6EOp7Hrm7-FxHI,4249
 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=1BUIoE5K3KHKaoGDa5Spnx8K2exxV_0grYzZ9esk41w,3328
+osi_dump/importer/load_balancer/openstack_load_balancer_importer.py,sha256=jK7VZd_-5A6lUipFCwyO_n0KUUuZLfIw_DQaJPV2oMI,3899
 osi_dump/importer/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 osi_dump/importer/project/openstack_project_importer.py,sha256=nQRInUb0vtm57dQNLxSoUFnGrNbAytK2Zl0FaUMPqBc,4964
 osi_dump/importer/project/project_importer.py,sha256=jwEvxteFbSwyWMV8hKAtf5Lo2bZysWkQ1L_NVUE8XOQ,191
@@ -93,7 +93,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=8puhIKWWfoAaTURXb7XUpjG0lQ4nb0UwrsrTQdDaFbs,639
-osi_dump/model/load_balancer.py,sha256=3FT8FCPW3gHWbupfqAzHE0lN7Wp3YCvTAmgmRoVWIKc,501
+osi_dump/model/load_balancer.py,sha256=3v4j949FM8jAwroWKE1ubaii2eM2XW9DWKl7HjtCdno,571
 osi_dump/model/project.py,sha256=S5BtjeMoxZfiJ7z7G_5jYfp5mMTzlPi7DWT5fuBGCTw,749
 osi_dump/model/role_assignment.py,sha256=fNt05y4aFF6b71Yps_EHzWavv8wF-jYx7gd3WAhqy6Y,310
 osi_dump/model/router.py,sha256=K8B6w97DYcFNRPmXN6CAZatm_0XSo2qIFVTvgdMfufY,417
@@ -109,8 +109,8 @@ osi_dump/util/extract_hostname.py,sha256=IpdklGHevmtRu67xeSRE_5n2mvWGI1sDsnJwExo
 osi_dump/util/openstack_util.py,sha256=_o8LiRmQKtxQ8hU3rbrMNwIAxt0-aWD2rjq-NvVdK9E,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.3.3.6.dist-info/METADATA,sha256=DtKEqD2WRDbHuLQPjkuQA92GVwafa7zWaWuBz3Ea-uQ,685
-osi_dump-0.1.3.3.3.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-osi_dump-0.1.3.3.3.6.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
-osi_dump-0.1.3.3.3.6.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
-osi_dump-0.1.3.3.3.6.dist-info/RECORD,,
+osi_dump-0.1.3.3.3.8.dist-info/METADATA,sha256=ujHSymvjyIy7-jQZQYR7SjM5s6AiJfNIbIXyBb4FM4s,685
+osi_dump-0.1.3.3.3.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+osi_dump-0.1.3.3.3.8.dist-info/entry_points.txt,sha256=ozm5sIBtXzLv6_FiUe26v1BgA3_xUReGLPhKQKZ56wQ,46
+osi_dump-0.1.3.3.3.8.dist-info/top_level.txt,sha256=OtAAwmJfcoPvlw_Cemo_H1aXIGV_7w0O2941KQt6faQ,9
+osi_dump-0.1.3.3.3.8.dist-info/RECORD,,