Ignore null tunnel id in getEgressActionInfosForInterface for VxLAN tunnels
[genius.git] / interfacemanager / interfacemanager-impl / src / main / java / org / opendaylight / genius / interfacemanager / IfmUtil.java
index 6355fb02b0b69c3cebb6b5a8a9cb9ce792bf5f29..6e3b28ab9848ddd533d2353b8dffe411555ea29b 100755 (executable)
@@ -7,29 +7,80 @@
  */
 package org.opendaylight.genius.interfacemanager;
 
+import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.GRE_TRUNK_INTERFACE;
+import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.MPLS_OVER_GRE;
+import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.VLAN_INTERFACE;
+import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.VXLAN_TRUNK_INTERFACE;
+
 import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableBiMap;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import org.apache.commons.lang3.BooleanUtils;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
 import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUtils;
 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.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.ActionNxResubmit;
+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.interfaces.rev140508.InterfaceType;
+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;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.PhysAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteMetadataCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.write.metadata._case.WriteMetadata;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdPools;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.ReleaseIdInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.ReleaseIdInputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPool;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPoolKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan.L2vlanMode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfTunnel;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefs;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.ParentRefsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeGre;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeMplsOverGre;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeVxlan;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeVxlanGpe;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceBindings;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.ServicesInfo;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.ServicesInfoKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServicesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
@@ -37,14 +88,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg6;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.*;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPool;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.id.pools.IdPoolKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.*;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan.L2vlanMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeGre;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeVxlan;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
@@ -52,36 +97,30 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
 public class IfmUtil {
     private static final Logger LOG = LoggerFactory.getLogger(IfmUtil.class);
     private static final int INVALID_ID = 0;
 
-    public static final ImmutableBiMap<Class<? extends TunnelTypeBase>, InterfaceInfo.InterfaceType> TUNNEL_TYPE_MAP =
-            new ImmutableBiMap.Builder<Class<? extends TunnelTypeBase>, InterfaceInfo.InterfaceType>()
-                    .put(TunnelTypeGre.class, InterfaceInfo.InterfaceType.GRE_TRUNK_INTERFACE)
-                    .put(TunnelTypeMplsOverGre.class, InterfaceInfo.InterfaceType.MPLS_OVER_GRE)
-                    .put(TunnelTypeVxlan.class, InterfaceInfo.InterfaceType.VXLAN_TRUNK_INTERFACE)
+    private static final ImmutableMap<Class<? extends TunnelTypeBase>, InterfaceInfo.InterfaceType> TUNNEL_TYPE_MAP =
+            new ImmutableMap.Builder<Class<? extends TunnelTypeBase>, InterfaceInfo.InterfaceType>()
+                    .put(TunnelTypeGre.class, GRE_TRUNK_INTERFACE)
+                    .put(TunnelTypeMplsOverGre.class, MPLS_OVER_GRE)
+                    .put(TunnelTypeVxlan.class, VXLAN_TRUNK_INTERFACE)
+                    .put(TunnelTypeVxlanGpe.class, VXLAN_TRUNK_INTERFACE)
                     .build();
 
-
-    public static String getDpnFromNodeConnectorId(NodeConnectorId portId) {
+    public static BigInteger getDpnFromNodeConnectorId(NodeConnectorId portId) {
         /*
          * NodeConnectorId is of form 'openflow:dpnid:portnum'
          */
         String[] split = portId.getValue().split(IfmConstants.OF_URI_SEPARATOR);
-        return split[1];
+        return new BigInteger(split[1]);
     }
 
     public static BigInteger getDpnFromInterface(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState){
         NodeConnectorId ncId = getNodeConnectorIdFromInterface(ifState);
         if(ncId != null){
-            return new BigInteger(getDpnFromNodeConnectorId(ncId));
+            return getDpnFromNodeConnectorId(ncId);
         }
         return null;
     }
@@ -107,6 +146,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);
     }
@@ -154,7 +203,7 @@ public class IfmUtil {
         if (infType == InterfaceInfo.InterfaceType.LOGICAL_GROUP_INTERFACE) {
             return ifIndex + IfmConstants.LOGICAL_GROUP_START;
         }
-        else if (infType == InterfaceInfo.InterfaceType.VLAN_INTERFACE) {
+        else if (infType == VLAN_INTERFACE) {
             return ifIndex + IfmConstants.VLAN_GROUP_START;
         } else {
             return ifIndex + IfmConstants.TRUNK_GROUP_START;
@@ -180,21 +229,16 @@ public class IfmUtil {
 
     public static <T extends DataObject> Optional<T> read(LogicalDatastoreType datastoreType,
                                                           InstanceIdentifier<T> path, DataBroker broker) {
-
-        ReadOnlyTransaction tx = broker.newReadOnlyTransaction();
-
-        Optional<T> result = Optional.absent();
-        try {
-            result = tx.read(datastoreType, path).get();
+        try (ReadOnlyTransaction tx = broker.newReadOnlyTransaction()) {
+            return tx.read(datastoreType, path).get();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-
-        return result;
     }
 
-    public static List<Action> getEgressActionsForInterface(String interfaceName, Long tunnelKey, DataBroker dataBroker) {
-        List<ActionInfo> listActionInfo = getEgressActionInfosForInterface(interfaceName, tunnelKey, 0, dataBroker);
+    public static List<Action> getEgressActionsForInterface(String interfaceName, Long tunnelKey, Integer actionKey,
+                                                            DataBroker dataBroker, Boolean isDefaultEgress) {
+        List<ActionInfo> listActionInfo = getEgressActionInfosForInterface(interfaceName, tunnelKey, actionKey==null?0:actionKey, dataBroker, isDefaultEgress);
         List<Action> actionsList = new ArrayList<>();
         for (ActionInfo actionInfo : listActionInfo) {
             actionsList.add(actionInfo.buildAction());
@@ -202,10 +246,31 @@ public class IfmUtil {
         return actionsList;
     }
 
+    public static List<Instruction> getEgressInstructionsForInterface(String interfaceName, Long tunnelKey,
+                                                                      DataBroker dataBroker, Boolean isDefaultEgress) {
+        List<Instruction> instructions = new ArrayList<>();
+        List<Action> actionList = MDSALUtil.buildActions(getEgressActionInfosForInterface(
+                interfaceName, tunnelKey, 0, dataBroker, isDefaultEgress));
+        instructions.add(MDSALUtil.buildApplyActionsInstruction(actionList));
+        return  instructions;
+    }
+
+    public static List<Instruction> getEgressInstructionsForInterface(Interface interfaceInfo, String portNo,
+                                                                      Long tunnelKey, boolean isDefaultEgress, int ifIndex) {
+        List<Instruction> instructions = new ArrayList<>();
+        InterfaceInfo.InterfaceType ifaceType = getInterfaceType(interfaceInfo);
+        List<Action> actionList = MDSALUtil.buildActions(
+                getEgressActionInfosForInterface(interfaceInfo, portNo, ifaceType, tunnelKey, 0, isDefaultEgress, ifIndex));
+        instructions.add(MDSALUtil.buildApplyActionsInstruction(actionList));
+        return  instructions;
+    }
+
+
     public static List<ActionInfo> getEgressActionInfosForInterface(String     interfaceName,
                                                                     int        actionKeyStart,
-                                                                    DataBroker dataBroker) {
-        return getEgressActionInfosForInterface(interfaceName, null, actionKeyStart, dataBroker);
+                                                                    DataBroker dataBroker,
+                                                                    Boolean isDefaultEgress) {
+        return getEgressActionInfosForInterface(interfaceName, null, actionKeyStart, dataBroker, isDefaultEgress);
     }
 
     /**
@@ -220,60 +285,89 @@ public class IfmUtil {
     public static List<ActionInfo> getEgressActionInfosForInterface(String     interfaceName,
                                                                     Long       tunnelKey,
                                                                     int        actionKeyStart,
-                                                                    DataBroker dataBroker) {
-        List<ActionInfo> result = new ArrayList<ActionInfo>();
+                                                                    DataBroker dataBroker,
+                                                                    Boolean isDefaultEgress) {
         Interface interfaceInfo = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(new InterfaceKey(interfaceName),
                 dataBroker);
         if(interfaceInfo == null){
             throw new NullPointerException("Interface information not present in config DS for " +interfaceName);
         }
-        String portNo = IfmUtil.getPortNoFromInterfaceName(interfaceName, dataBroker);
+        org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState =
+                InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(interfaceName, dataBroker);
+        if(ifState == null){
+            throw new NullPointerException("Interface information not present in oper DS for " +interfaceName);
+        }
+        String lowerLayerIf = ifState.getLowerLayerIf().get(0);
+        NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf);
+        String portNo = IfmUtil.getPortNoFromNodeConnectorId(nodeConnectorId);
 
         InterfaceInfo.InterfaceType ifaceType = getInterfaceType(interfaceInfo);
+        return getEgressActionInfosForInterface(interfaceInfo, portNo, ifaceType, tunnelKey, actionKeyStart,
+                isDefaultEgress, ifState.getIfIndex());
+    }
 
-        switch (ifaceType ) {
-            case VLAN_INTERFACE:
-                IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
-                LOG.trace("L2Vlan: {}",vlanIface);
-                boolean isVlanTransparent = false;
-                long 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 ActionInfo(ActionType.push_vlan, new String[] {}, actionKeyStart));
-                    actionKeyStart++;
-                    result.add(new ActionInfo(ActionType.set_field_vlan_vid,
-                            new String[] { Long.toString(vlanVid) }, actionKeyStart));
-                    actionKeyStart++;
-                }
-                result.add(new ActionInfo(ActionType.output, new String[] {portNo}, actionKeyStart));
-                actionKeyStart++;
-                break;
+
+    public static List<ActionInfo> getEgressActionInfosForInterface(Interface interfaceInfo,
+                                                                    String portNo,
+                                                                    InterfaceInfo.InterfaceType ifaceType,
+                                                                    Long       tunnelKey,
+                                                                    int        actionKeyStart,
+                                                                    boolean isDefaultEgress,
+                                                                    int ifIndex) {
+        List<ActionInfo> result = new ArrayList<>();
+        switch (ifaceType) {
             case MPLS_OVER_GRE:
-            case VXLAN_TRUNK_INTERFACE:
             case GRE_TRUNK_INTERFACE:
-                if(tunnelKey != null) {
-                    result.add(new ActionInfo(ActionType.set_field_tunnel_id,
-                            new BigInteger[] { BigInteger.valueOf(tunnelKey.longValue()) },
-                            actionKeyStart) );
-                    actionKeyStart++;
+                if(!isDefaultEgress) {
+                    //TODO tunnel_id to encode GRE key, once it is supported
+                    // Until then, tunnel_id should be "cleaned", otherwise it stores the value coming from a VXLAN tunnel
+                    if (tunnelKey == null) {
+                        tunnelKey = 0L;
+                    }
+                }
+            case VXLAN_TRUNK_INTERFACE:
+                if(!isDefaultEgress) {
+                    if (tunnelKey != null) {
+                        result.add(new ActionSetFieldTunnelId(actionKeyStart++, BigInteger.valueOf(tunnelKey)));
+                    }
+
+                    IfTunnel ifTunnel = interfaceInfo.getAugmentation(IfTunnel.class);
+                    if (BooleanUtils.isTrue(ifTunnel.isTunnelRemoteIpFlow())) {
+                        result.add(new ActionSetTunnelDestinationIp(actionKeyStart++, ifTunnel.getTunnelDestination()));
+                    }
+                    if (BooleanUtils.isTrue(ifTunnel.isTunnelSourceIpFlow())) {
+                        result.add(new ActionSetTunnelSourceIp(actionKeyStart++, ifTunnel.getTunnelSource()));
+                    }
+                }
+            case VLAN_INTERFACE:
+                if(isDefaultEgress) {
+                    IfL2vlan vlanIface = interfaceInfo.getAugmentation(IfL2vlan.class);
+                    LOG.trace("L2Vlan: {}", vlanIface);
+                    boolean isVlanTransparent = false;
+                    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 ActionSetFieldVlanVid(actionKeyStart++, vlanVid));
+                    }
+                    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,
+                            IfmConstants.REG6_END_INDEX, regValue));
+                    result.add(new ActionNxResubmit(actionKeyStart++, NwConstants.EGRESS_LPORT_DISPATCHER_TABLE));
                 }
-
-                result.add(new ActionInfo(ActionType.output, new String[] { portNo}, actionKeyStart));
-                actionKeyStart++;
                 break;
-
             default:
                 LOG.warn("Interface Type {} not handled yet", ifaceType);
                 break;
         }
-
         return result;
     }
 
-
     public static NodeId getNodeIdFromNodeConnectorId(NodeConnectorId ncId) {
         return new NodeId(ncId.getValue().substring(0,ncId.getValue().lastIndexOf(":")));
     }
@@ -349,13 +443,8 @@ public class IfmUtil {
                 InstanceIdentifier.builder(Nodes.class)
                         .child(Node.class, new NodeKey(getNodeIdFromNodeConnectorId(ncId)))
                         .child(NodeConnector.class, new NodeConnectorKey(ncId)).build();
-        Optional<NodeConnector> optNc = read(LogicalDatastoreType.OPERATIONAL, ncIdentifier, dataBroker);
-        if(optNc.isPresent()) {
-            NodeConnector nc = optNc.get();
-            FlowCapableNodeConnector fcnc = nc.getAugmentation(FlowCapableNodeConnector.class);
-            return fcnc.getName();
-        }
-        return null;
+        return read(LogicalDatastoreType.OPERATIONAL, ncIdentifier, dataBroker).transform(
+                nc -> nc.getAugmentation(FlowCapableNodeConnector.class).getName()).orNull();
     }
 
     public static NodeConnectorId getNodeConnectorIdFromInterface(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState){
@@ -366,46 +455,19 @@ public class IfmUtil {
         return null;
     }
 
-    public static boolean isTunnelType(Interface iface,org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState) {
-        boolean isTunnelInterface = InterfaceManagerCommonUtils.isTunnelInterface(iface);
-        if (!isTunnelInterface && ifState != null) {
-            isTunnelInterface = IfmUtil.isTunnelType(ifState.getType());
-        }
-        return isTunnelInterface;
-    }
-
-    public static boolean isTunnelType(Class<? extends InterfaceType> ifType) {
-        if( (ifType != null) && (ifType.isAssignableFrom(Tunnel.class)) ) {
-            return true;
-        }
-        return false;
-    }
-
     public static InterfaceInfo.InterfaceType getInterfaceType(Interface iface) {
-        InterfaceInfo.InterfaceType interfaceType =
-                org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.UNKNOWN_INTERFACE;
-        Class<? extends org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType> ifType = iface.getType();
+        InterfaceInfo.InterfaceType interfaceType = org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.UNKNOWN_INTERFACE;
+        Class<? extends org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType> ifType = iface
+                .getType();
 
         if (ifType.isAssignableFrom(L2vlan.class)) {
-            interfaceType =  org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.VLAN_INTERFACE;
+            interfaceType = VLAN_INTERFACE;
         } else if (ifType.isAssignableFrom(Tunnel.class)) {
             IfTunnel ifTunnel = iface.getAugmentation(IfTunnel.class);
-            Class<? extends  org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase> tunnelType = ifTunnel.getTunnelInterfaceType();
+            Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase> tunnelType = ifTunnel
+                    .getTunnelInterfaceType();
             interfaceType = TUNNEL_TYPE_MAP.get(tunnelType);
-            /*if (tunnelType.isAssignableFrom(TunnelTypeVxlan.class)) {
-                interfaceType = InterfaceInfo.InterfaceType.VXLAN_TRUNK_INTERFACE;
-            } else if (tunnelType.isAssignableFrom(TunnelTypeGre.class)) {
-                interfaceType = InterfaceInfo.InterfaceType.GRE_TRUNK_INTERFACE;
-            } else if(tunnelType.isAssignableFrom(TunnelTypeMplsOverGre.class)){
-                interfaceType = InterfaceInfo.InterfaceType.MPLS_OVER_GRE;
-            } else if(tunnelType.isAssignableFrom(TunnelTypeMplsOverUdp.class)){
-                interfaceType = InterfaceInfo.InterfaceType.MPLS_OVER_UDP;
-            }*/
         }
-        // TODO: Check if the below condition is still needed/valid
-        //else if (ifType.isAssignableFrom(InterfaceGroup.class)) {
-        //    interfaceType =  org.opendaylight.vpnservice.interfacemgr.globals.InterfaceInfo.InterfaceType.LOGICAL_GROUP_INTERFACE;
-        //}
         return interfaceType;
     }
 
@@ -437,4 +499,67 @@ public class IfmUtil {
         }
         return vlanInterfaceInfo;
     }
+
+    public static BigInteger getDeadBeefBytesForMac() {
+        return new BigInteger("FFFFFFFF", 16).and(new BigInteger(IfmConstants.DEAD_BEEF_MAC_PREFIX, 16)).shiftLeft(16);
+    }
+
+    public static BigInteger fillPortNumberToMac(long portNumber) {
+        return new BigInteger("FFFF", 16).and(BigInteger.valueOf(portNumber));
+    }
+
+    public static String generateMacAddress(long portNo){
+        String unformattedMAC = getDeadBeefBytesForMac().or(fillPortNumberToMac(portNo)).toString(16);
+        return unformattedMAC.replaceAll("(.{2})", "$1"+IfmConstants.MAC_SEPARATOR).
+                substring(0, IfmConstants.MAC_STRING_LENGTH);
+    }
+
+    public static PhysAddress getPhyAddress(long portNo, FlowCapableNodeConnector flowCapableNodeConnector){
+        String southboundMacAddress = flowCapableNodeConnector.getHardwareAddress().getValue();
+        if(IfmConstants.INVALID_MAC.equals(southboundMacAddress)){
+            LOG.debug("Invalid MAC Address received for {}, generating MAC Address", flowCapableNodeConnector.getName());
+            southboundMacAddress = generateMacAddress(portNo);
+        }
+        return new PhysAddress(southboundMacAddress);
+    }
+
+    public static void updateInterfaceParentRef(WriteTransaction t, String interfaceName, String parentInterface) {
+        InstanceIdentifier<ParentRefs> parentRefIdentifier = InstanceIdentifier.builder(Interfaces.class)
+                .child(Interface.class, new InterfaceKey(interfaceName)).augmentation(ParentRefs.class).build();
+        ParentRefs parentRefs = new ParentRefsBuilder().setParentInterface(parentInterface).build();
+        t.merge(LogicalDatastoreType.CONFIGURATION, parentRefIdentifier, parentRefs);
+        LOG.debug("Updating parentRefInterface for interfaceName {}. interfaceKey {}, with parentRef augmentation pointing to {}",
+                interfaceName, new InterfaceKey(interfaceName), parentInterface);
+    }
+
+    public static InstanceIdentifier<BoundServices> buildBoundServicesIId(short servicePriority, String interfaceName,
+                                                                          Class<? extends ServiceModeBase> serviceMode) {
+        return InstanceIdentifier.builder(ServiceBindings.class)
+                                 .child(ServicesInfo.class, new ServicesInfoKey(interfaceName, serviceMode))
+                                 .child(BoundServices.class, new BoundServicesKey(servicePriority))
+                                 .build();
+    }
+
+    public static void bindService(WriteTransaction t, String interfaceName, BoundServices serviceInfo,
+                                   Class<? extends ServiceModeBase> serviceMode) {
+        LOG.info("Binding Service {} for : {}", serviceInfo.getServiceName(), interfaceName);
+        InstanceIdentifier<BoundServices> boundServicesInstanceIdentifier =
+            buildBoundServicesIId(serviceInfo.getServicePriority(), interfaceName, serviceMode);
+        t.put(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier, serviceInfo, true);
+    }
+
+    public static void unbindService(DataBroker dataBroker, String interfaceName, InstanceIdentifier<BoundServices>
+            boundServicesInstanceIdentifier){
+        LOG.info("Unbinding Service from : {}", interfaceName);
+        DataStoreJobCoordinator dataStoreJobCoordinator = DataStoreJobCoordinator.getInstance();
+        dataStoreJobCoordinator.enqueueJob(interfaceName,
+                () -> {
+                    WriteTransaction t = dataBroker.newWriteOnlyTransaction();
+                    t.delete(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier);
+                    List<ListenableFuture<Void>> futures = new ArrayList<>();
+                    futures.add(t.submit());
+                    return futures;
+                }
+        );
+    }
 }