Merge "Action redesign: convert set_tunnel_{src,dest}_ip"

[genius.git] / interfacemanager / interfacemanager-impl / src / main / java / org / opendaylight / genius / interfacemanager / IfmUtil.java

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java
index 1f1e8b1ec8896e2825377181226ec56c5cbb0e59..9ab995e9d81916bc11a59dc108484140c106f2e5 100755 (executable)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java
@@ -25,16 +25,21 @@ import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUt
 import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo;
 import org.opendaylight.genius.interfacemanager.globals.VlanInterfaceInfo;
 import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils;
-import org.opendaylight.genius.mdsalutil.ActionType;
 import org.opendaylight.genius.mdsalutil.ActionInfo;
+import org.opendaylight.genius.mdsalutil.ActionType;
 import org.opendaylight.genius.mdsalutil.MDSALUtil;
 import org.opendaylight.genius.mdsalutil.MetaDataUtil;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.genius.mdsalutil.actions.ActionOutput;
 import org.opendaylight.genius.mdsalutil.actions.ActionPushVlan;
 import org.opendaylight.genius.mdsalutil.actions.ActionRegLoad;
+import org.opendaylight.genius.mdsalutil.actions.ActionSetFieldTunnelId;
+import org.opendaylight.genius.mdsalutil.actions.ActionSetFieldVlanVid;
+import org.opendaylight.genius.mdsalutil.actions.ActionSetTunnelDestinationIp;
+import org.opendaylight.genius.mdsalutil.actions.ActionSetTunnelSourceIp;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
@@ -136,6 +141,16 @@ public class IfmUtil {
         return split[2];
     }
 
+    public static Long getPortNumberFromNodeConnectorId(NodeConnectorId portId) {
+        String portNo = getPortNoFromNodeConnectorId(portId);
+        try{
+            return Long.valueOf(portNo);
+        }catch(NumberFormatException ex){
+            LOG.trace("Unable to retrieve port number from nodeconnector id for {}", portId);
+        }
+        return IfmConstants.INVALID_PORT_NO;
+    }
+
     public static NodeId buildDpnNodeId(BigInteger dpnId) {
         return new NodeId(IfmConstants.OF_URI_PREFIX + dpnId);
     }
@@ -301,17 +316,16 @@ public class IfmUtil {
                     IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
                     LOG.trace("L2Vlan: {}", vlanIface);
                     boolean isVlanTransparent = false;
-                    long vlanVid = 0;
+                    int vlanVid = 0;
                     if (vlanIface != null) {
                         vlanVid = vlanIface.getVlanId() == null ? 0 : vlanIface.getVlanId().getValue();
                         isVlanTransparent = vlanIface.getL2vlanMode() == IfL2vlan.L2vlanMode.Transparent;
                     }
                     if (vlanVid != 0 && !isVlanTransparent) {
                         result.add(new ActionPushVlan(actionKeyStart++));
-                        result.add(new ActionInfo(ActionType.set_field_vlan_vid,
-                                new String[]{Long.toString(vlanVid)}, actionKeyStart++));
+                        result.add(new ActionSetFieldVlanVid(actionKeyStart++, vlanVid));
                     }
-                    result.add(new ActionOutput(actionKeyStart++, Long.parseLong(portNo)));
+                    result.add(new ActionOutput(actionKeyStart++, new Uri(portNo)));
                 }else{
                     long regValue = MetaDataUtil.getReg6ValueForLPortDispatcher(ifIndex, NwConstants.DEFAULT_SERVICE_INDEX);
                     result.add(new ActionRegLoad(actionKeyStart++, NxmNxReg6.class, IfmConstants.REG6_START_INDEX,
@@ -328,21 +342,16 @@ public class IfmUtil {
                 if (tunnelKey == null) {
                     tunnelKey = 0L;
                 }
-                result.add(new ActionInfo(ActionType.set_field_tunnel_id,
-                    new BigInteger[]{BigInteger.valueOf(tunnelKey)},actionKeyStart++));
+                result.add(new ActionSetFieldTunnelId(actionKeyStart++, BigInteger.valueOf(tunnelKey)));
 
                 IfTunnel ifTunnel = interfaceInfo.getAugmentation(IfTunnel.class);
                 if(BooleanUtils.isTrue(ifTunnel.isTunnelRemoteIpFlow())) {
-                    BigInteger destIp = MDSALUtil.getBigIntIpFromIpAddress(ifTunnel.getTunnelDestination());
-                    result.add(new ActionInfo(ActionType.set_tunnel_dest_ip, new BigInteger[]{destIp},
-                            actionKeyStart++));
+                    result.add(new ActionSetTunnelDestinationIp(actionKeyStart++, ifTunnel.getTunnelDestination()));
                 }
                 if(BooleanUtils.isTrue(ifTunnel.isTunnelSourceIpFlow())) {
-                    BigInteger sourceIp = MDSALUtil.getBigIntIpFromIpAddress(ifTunnel.getTunnelSource());
-                    result.add(new ActionInfo(ActionType.set_tunnel_src_ip, new BigInteger[]{sourceIp},
-                            actionKeyStart++));
+                    result.add(new ActionSetTunnelSourceIp(actionKeyStart++, ifTunnel.getTunnelSource()));
                 }
-                result.add(new ActionOutput(actionKeyStart++, Long.parseLong(portNo)));
+                result.add(new ActionOutput(actionKeyStart++, new Uri(portNo)));
                 break;
 
             default: