commit 72d90d9217ee99b8e05cfe345f59db28f6d54d93
author rahul <rahul.k4@tataelxsi.co.in> Wed Aug 30 14:48:01 2023 +0530
committer cubag <gcuba@whitestack.com> Wed Feb 28 21:25:53 2024 +0100
tree 3e76daddad18b0a423b51334bfac1d6555d72ecb
parent 44521d2f95845ef025090aef82b51f43755cd738

Fix 2280: Random IP's are geeting assigned for Dual stack NS when doing scaling-out/in operation

https://osm.etsi.org/bugzilla/show_bug.cgi?id=2280

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

osm_lcm/ns.py

diff --git a/osm_lcm/ns.py b/osm_lcm/ns.py
index 76f0bf5..1504fb1 100644
--- a/osm_lcm/ns.py
+++ b/osm_lcm/ns.py
@@ -23,6 +23,7 @@
 import logging
 import logging.handlers
 import traceback
+import ipaddress
 import json
 from jinja2 import (
     Environment,
@@ -221,6 +222,18 @@
         if not isinstance(ip_mac, str):
             return ip_mac
         try:
+            next_ipv6 = None
+            next_ipv4 = None
+            dual_ip = ip_mac.split(";")
+            if len(dual_ip) == 2:
+                for ip in dual_ip:
+                    if ipaddress.ip_address(ip).version == 6:
+                        ipv6 = ipaddress.IPv6Address(ip)
+                        next_ipv6 = str(ipaddress.IPv6Address(int(ipv6) + 1))
+                    elif ipaddress.ip_address(ip).version == 4:
+                        ipv4 = ipaddress.IPv4Address(ip)
+                        next_ipv4 = str(ipaddress.IPv4Address(int(ipv4) + 1))
+                return [next_ipv4, next_ipv6]
             # try with ipv4 look for last dot
             i = ip_mac.rfind(".")
             if i > 0: