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 ebb2779..34af39e 100644
--- a/NG-RO/osm_ng_ro/monitor.py
+++ b/NG-RO/osm_ng_ro/monitor.py
@@ -625,9 +625,17 @@
)
@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: