[VR] Fix IPv6 NIC IP on the VR

Author: nvazquez

systemvm/debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py

@@ -58,6 +58,8 @@ def add_address_route(self, entry):
             self.enable_ipv6(entry['device'])
             cidr_size = entry['router_guest_ip6_cidr'].split("/")[-1]
             full_addr = entry['router_guest_ip6_gateway'] + "/" + cidr_size
+            if entry['router_guest_ip6'] is not entry['router_guest_ip6_gateway']:
+                full_addr = entry['router_guest_ip6'] + "/" + cidr_size
             if not CsHelper.execute("ip -6 addr show dev %s | grep -w %s" % (entry['device'], full_addr)):
                 CsHelper.execute("ip -6 addr add %s dev %s" % (full_addr, entry['device']))
             if 'router_ip6' in list(entry.keys()) and entry['router_ip6']:
@@ -74,6 +76,8 @@ def remove_address_route(self, entry):
         if 'router_guest_ip6' in list(entry.keys()) and entry['router_guest_ip6']:
             cidr_size = entry['router_guest_ip6_cidr'].split("/")[-1]
             full_addr = entry['router_guest_ip6_gateway'] + "/" + cidr_size
+            if entry['router_guest_ip6'] is not entry['router_guest_ip6_gateway']:
+                full_addr = entry['router_guest_ip6'] + "/" + cidr_size
             CsHelper.execute("ip -6 addr del %s dev %s" % (full_addr, entry['device']))
             if 'router_ip6' in list(entry.keys()) and entry['router_ip6']:
                 full_public_addr = entry['router_ip6'] + "/" + cidr_size
@@ -98,6 +102,8 @@ def add_radvd_conf(self, entry):
         if 'router_guest_ip6' in list(entry.keys()) and entry['router_guest_ip6']:
             cidr_size = entry['router_guest_ip6_cidr'].split("/")[-1]
             full_addr = entry['router_guest_ip6_gateway'] + "/" + cidr_size
+            if entry['router_guest_ip6'] is not entry['router_guest_ip6_gateway']:
+                full_addr = entry['router_guest_ip6_cidr']
             self.conf.append("interface %s" % entry['device'])
             self.conf.append("{")
             self.conf.append("    AdvSendAdvert on;")