Bug 7979: Fix issue where VM is unable to acquire address during IPv6 tests

Tempest IPv6 Scenario tests validate usecases like IPAM, multi_prefix,
dualnetworks etc. While running IPv6 tempest scenario tests, we have
noticed some exceptions, because of which the test-cases are failing.
This patch fixes those exceptions in the file ExternalRoutersListener,
by skipping the IPv6 subnets. The necessary implementation in
ExternalRoutersListener will be added as part of IPv6 external
connectivity blueprint.

Change-Id: Idea66303e1855d6ffaf2e7a73f0d04af5d66be89
Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com>

diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
index 8680672b90ef53416ec9755fdab370d7e36d6017..39e05bf923f9d0f0abd266dd9dc68be5b30ac573 100644 (file)
--- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
+++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java
@@ -14,6 +14,9 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.JdkFutureAdapters;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.math.BigInteger;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -353,6 +356,17 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
                 String subnetString = subnetmapEntry.getSubnetIp();
                 String[] subnetSplit = subnetString.split("/");
                 String subnetIp = subnetSplit[0];
+                try {
+                    InetAddress address = InetAddress.getByName(subnetIp);
+                    if (address instanceof Inet6Address) {
+                        // TODO: Revisit when IPv6 external connectivity support is added.
+                        LOG.debug("Skipping ipv6 address {}.", address);
+                        return;
+                    }
+                } catch (UnknownHostException e) {
+                    LOG.warn("Invalid ip address {}", subnetIp, e);
+                    return;
+                }
                 String subnetPrefix = "0";
                 if (subnetSplit.length == 2) {
                     subnetPrefix = subnetSplit[1];
@@ -1398,13 +1412,24 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase<Rou
 
     private void allocateExternalIp(BigInteger dpnId, Routers router, long routerId, String routerName,
             Uuid networkId, String subnetIp) {
+        String[] subnetIpParts = NatUtil.getSubnetIpAndPrefix(subnetIp);
+        try {
+            InetAddress address = InetAddress.getByName(subnetIpParts[0]);
+            if (address instanceof Inet6Address) {
+                // TODO: Revisit when IPv6 external connectivity support is added.
+                LOG.debug("Currently skipping ipv6 address {}.", address);
+                return;
+            }
+        } catch (UnknownHostException e) {
+            LOG.warn("Invalid ip address {}", subnetIpParts[0], e);
+            return;
+        }
         String leastLoadedExtIpAddr = NatUtil.getLeastLoadedExternalIp(dataBroker, routerId);
         if (leastLoadedExtIpAddr != null) {
             String[] externalIpParts = NatUtil.getExternalIpAndPrefix(leastLoadedExtIpAddr);
             String leastLoadedExtIp = externalIpParts[0];
             String leastLoadedExtIpPrefix = externalIpParts[1];
             IPAddress externalIpAddr = new IPAddress(leastLoadedExtIp, Integer.parseInt(leastLoadedExtIpPrefix));
-            String[] subnetIpParts = NatUtil.getSubnetIpAndPrefix(subnetIp);
             subnetIp = subnetIpParts[0];
             String subnetIpPrefix = subnetIpParts[1];
             IPAddress subnetIpAddr = new IPAddress(subnetIp, Integer.parseInt(subnetIpPrefix));