MRI version bumpup for Aluminium

[netvirt.git] / elanmanager / impl / src / main / java / org / opendaylight / netvirt / elan / utils / ElanItmUtils.java

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java
index a319c94e04ba71c9729bc9458f4c171752c7be70..0334efcf7ee0a4abad9c72a8ab7c11ab3cac41f1 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.netvirt.elan.utils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -14,8 +15,8 @@ import java.util.concurrent.Future;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
+import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
@@ -212,7 +213,7 @@ public class ElanItmUtils {
                 Future<RpcResult<GetEgressActionsForTunnelOutput>> egressActionsOutputItm =
                         itmRpcService.getEgressActionsForTunnel(getEgressActInputItm);
                 if (egressActionsOutputItm.get().isSuccessful()) {
-                    return egressActionsOutputItm.get().getResult().getAction();
+                    return new ArrayList<Action>(egressActionsOutputItm.get().getResult().getAction().values());
                 }
             } else {
                 GetEgressActionsForInterfaceInput getEgressActInput = new GetEgressActionsForInterfaceInputBuilder()
@@ -220,7 +221,7 @@ public class ElanItmUtils {
                 Future<RpcResult<GetEgressActionsForInterfaceOutput>> egressActionsOutputFuture =
                         interfaceManagerRpcService.getEgressActionsForInterface(getEgressActInput);
                 if (egressActionsOutputFuture.get().isSuccessful()) {
-                    return egressActionsOutputFuture.get().getResult().getAction();
+                    return new ArrayList<Action>(egressActionsOutputFuture.get().getResult().getAction().values());
                 }
             }
         } catch (Exception e) {