From: rahulkumarr <rahul.k4@tataelxsi.co.in>
Date: Mon, 17 Jun 2024 10:20:30 +0000 (+0530)
Subject: Fix Bug 2306: Monitoring task in RO defined in RO/monitoring.py is replacing the... 
X-Git-Tag: release-v16.0-start~6
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F14427%2F1;p=osm%2FRO.git

Fix Bug 2306: Monitoring task in RO defined in RO/monitoring.py is replacing the dual-stcak [IPV4, IPV6] with IPV4 in Vnfrs collection

Change-Id: Ie6395ed4b8499943ebbd57dd1c7aeed2433ae92c
Signed-off-by: rahulkumarr <rahul.k4@tataelxsi.co.in>
---

diff --git a/NG-RO/osm_ng_ro/monitor.py b/NG-RO/osm_ng_ro/monitor.py
index ebb27799..34af39ec 100644
--- a/NG-RO/osm_ng_ro/monitor.py
+++ b/NG-RO/osm_ng_ro/monitor.py
@@ -624,10 +624,18 @@ class MonitorVms:
             interface_info.get("mac_address")
         )
 
+    @staticmethod
+    def _get_dual_ip(data=None):
+        if data:
+            ip_addresses = [item["ip_address"] for item in data]
+            return ";".join(ip_addresses) if len(ip_addresses) > 1 else ip_addresses[0]
+        else:
+            return None
+
     @staticmethod
     def _get_current_ip_address(interface_info: dict) -> Optional[str]:
         if interface_info.get("fixed_ips") and interface_info["fixed_ips"][0]:
-            return interface_info["fixed_ips"][0].get("ip_address")
+            return MonitorVms._get_dual_ip(interface_info.get("fixed_ips"))
 
     @staticmethod
     def backup_vdu_interfaces(vdur_vim_info_update: dict) -> None: