osi-dump 0.1.3.3.3.6__tar.gz → 0.1.3.3.3.8__tar.gz

{osi_dump-0.1.3.3.3.6 → osi_dump-0.1.3.3.3.8}/PKG-INFO

@@ -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 → osi_dump-0.1.3.3.3.8}/pyproject.toml

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

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

@@ -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