MRI version bumpup for Aluminium

[netvirt.git] / natservice / impl / src / main / java / org / opendaylight / netvirt / natservice / internal / NatVpnMapsChangeListener.java

diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatVpnMapsChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatVpnMapsChangeListener.java
index a66b2baa87786283a0fe4d4952b1c50c0555121e..f30f9aefbc2e1f93d4e50e5d83cea4fb2a512c58 100644 (file)
--- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatVpnMapsChangeListener.java
+++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatVpnMapsChangeListener.java
@@ -9,6 +9,7 @@ package org.opendaylight.netvirt.natservice.internal;
 
 import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -79,7 +80,7 @@ public class NatVpnMapsChangeListener extends AbstractAsyncDataTreeChangeListene
         Uuid vpnUuid = vpnMap.getVpnId();
         String vpnName = vpnUuid.getValue();
         if (vpnMap.getRouterIds() != null) {
-            vpnMap.getRouterIds().stream()
+            vpnMap.getRouterIds().values().stream()
                 .filter(router -> !(Objects.equals(router.getRouterId(), vpnUuid)))
                 .forEach(router -> {
                     String routerName = router.getRouterId().getValue();
@@ -94,7 +95,7 @@ public class NatVpnMapsChangeListener extends AbstractAsyncDataTreeChangeListene
         Uuid vpnUuid = vpnMap.getVpnId();
         String vpnName = vpnUuid.getValue();
         if (vpnMap.getRouterIds() != null) {
-            vpnMap.getRouterIds().stream()
+            vpnMap.getRouterIds().values().stream()
                 .filter(router -> !(Objects.equals(router.getRouterId(), vpnUuid)))
                 .forEach(router -> {
                     String routerName = router.getRouterId().getValue();
@@ -109,8 +110,8 @@ public class NatVpnMapsChangeListener extends AbstractAsyncDataTreeChangeListene
         Uuid vpnUuid = updated.getVpnId();
         String vpnName = vpnUuid.getValue();
 
-        List<RouterIds> updatedRouterIdList = updated.getRouterIds();
-        List<RouterIds> originalRouterIdList = original.getRouterIds();
+        List<RouterIds> updatedRouterIdList = new ArrayList<RouterIds>(updated.getRouterIds().values());
+        List<RouterIds> originalRouterIdList = new ArrayList<RouterIds>(original.getRouterIds().values());
         List<RouterIds> routersAddedList = null;
         List<RouterIds> routersRemovedList = null;
 
@@ -231,7 +232,7 @@ public class NatVpnMapsChangeListener extends AbstractAsyncDataTreeChangeListene
             return;
         }
         Uuid networkId = Uuid.getDefaultInstance(externalNetwork);
-        for (Ports port : optRouterPorts.get().nonnullPorts()) {
+        for (Ports port : optRouterPorts.get().nonnullPorts().values()) {
             String portName = port.getPortName();
             Uint64 dpnId = NatUtil.getDpnForInterface(interfaceManager, portName);
             if (dpnId.equals(Uint64.ZERO)) {
@@ -240,7 +241,7 @@ public class NatVpnMapsChangeListener extends AbstractAsyncDataTreeChangeListene
                 continue;
             }
 
-            for (InternalToExternalPortMap intExtPortMap : port.nonnullInternalToExternalPortMap()) {
+            for (InternalToExternalPortMap intExtPortMap : port.nonnullInternalToExternalPortMap().values()) {
                 //remove all NAT related entries with routerName
                 //floatingIpListener.removeNATOnlyFlowEntries(dpnId, portName, routerName, null,
                 // intExtPortMap.getInternalIp(), externalIp);
@@ -263,7 +264,7 @@ public class NatVpnMapsChangeListener extends AbstractAsyncDataTreeChangeListene
             return;
         }
         Uuid networkId = Uuid.getDefaultInstance(externalNetwork);
-        for (Ports port : optRouterPorts.get().nonnullPorts()) {
+        for (Ports port : optRouterPorts.get().nonnullPorts().values()) {
             String portName = port.getPortName();
             Uint64 dpnId = NatUtil.getDpnForInterface(interfaceManager, portName);
             if (dpnId.equals(Uint64.ZERO)) {
@@ -271,7 +272,7 @@ public class NatVpnMapsChangeListener extends AbstractAsyncDataTreeChangeListene
                         + "skip handling of router {} association with vpn {}", portName, routerName, vpnName);
                 continue;
             }
-            for (InternalToExternalPortMap intExtPortMap : port.nonnullInternalToExternalPortMap()) {
+            for (InternalToExternalPortMap intExtPortMap : port.nonnullInternalToExternalPortMap().values()) {
                 //remove all NAT related entries with routerName
                 //floatingIpListener.removeNATOnlyFlowEntries(dpnId, portName, routerName, vpnName,
                 // intExtPortMap.getInternalIp(), externalIp);