MRI version bumpup for Aluminium

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / l2gw / listeners / L2GatewayListener.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayListener.java
index 6ca606379963d6314e3cf53360e4d9c81a0f46e7..f0a01e055f6330a8379abd8003de50b8a7f41741 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayListener.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayListener.java
@@ -117,7 +117,7 @@ public class L2GatewayListener extends AbstractClusteredAsyncDataTreeChangeListe
     public void add(final InstanceIdentifier<L2gateway> identifier, final L2gateway input) {
         LOG.info("Adding L2gateway with ID: {}", input.getUuid());
 
-        for (Devices l2Device : input.nonnullDevices()) {
+        for (Devices l2Device : input.nonnullDevices().values()) {
             LOG.trace("Adding L2gateway device: {}", l2Device);
             addL2Device(l2Device, input);
         }
@@ -137,7 +137,7 @@ public class L2GatewayListener extends AbstractClusteredAsyncDataTreeChangeListe
         }), new FutureCallback<Void>() {
             @Override
             public void onSuccess(Void result) {
-                for (Devices l2Device : input.nonnullDevices()) {
+                for (Devices l2Device : input.nonnullDevices().values()) {
                     LOG.trace("Removing L2gateway device: {}", l2Device);
                     removeL2Device(l2Device, input);
                 }
@@ -168,7 +168,7 @@ public class L2GatewayListener extends AbstractClusteredAsyncDataTreeChangeListe
         jobCoordinator.enqueueJob("l2gw.update", () -> {
             ListenableFuture<Void> future = txRunner.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, tx -> {
                 DeviceInterfaces updatedDeviceInterfaces = new DeviceInterfaces(update);
-                original.getDevices()
+                original.getDevices().values()
                         .stream()
                         .filter((originalDevice) -> originalDevice.getInterfaces() != null)
                         .forEach((originalDevice) -> {
@@ -176,7 +176,7 @@ public class L2GatewayListener extends AbstractClusteredAsyncDataTreeChangeListe
                             L2GatewayDevice l2GwDevice = l2GatewayCache.get(deviceName);
                             NodeId physicalSwitchNodeId = HwvtepSouthboundUtils.createManagedNodeId(
                                     new NodeId(l2GwDevice.getHwvtepNodeId()), deviceName);
-                            originalDevice.getInterfaces()
+                            originalDevice.getInterfaces().values()
                                     .stream()
                                     .filter((intf) -> !updatedDeviceInterfaces.containsInterface(
                                             deviceName, intf.getInterfaceName()))
@@ -288,10 +288,10 @@ public class L2GatewayListener extends AbstractClusteredAsyncDataTreeChangeListe
 
         DeviceInterfaces(L2gateway l2gateway) {
             if (l2gateway.getDevices() != null) {
-                l2gateway.getDevices().forEach((device) -> {
+                l2gateway.getDevices().values().forEach((device) -> {
                     deviceInterfacesMap.putIfAbsent(device.getDeviceName(), new HashMap<>());
                     if (device.getInterfaces() != null) {
-                        device.getInterfaces().forEach((intf) ->
+                        device.getInterfaces().values().forEach((intf) ->
                                 deviceInterfacesMap.get(device.getDeviceName()).put(intf.getInterfaceName(), intf));
                     }
                 });