package org.opendaylight.genius.interfacemanager;
import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import com.google.common.util.concurrent.ListenableFuture;
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.ActionInfo;
+import org.opendaylight.genius.mdsalutil.MDSALUtil;
+import org.opendaylight.genius.mdsalutil.MetaDataUtil;
+import org.opendaylight.genius.mdsalutil.NwConstants;
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.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.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.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;
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.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;
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;
+import static org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.VLAN_INTERFACE;
public class IfmUtil {
private static final Logger LOG = LoggerFactory.getLogger(IfmUtil.class);
private static final int INVALID_ID = 0;
+ private static final ImmutableMap<Class<? extends TunnelTypeBase>, InterfaceInfo.InterfaceType> TUNNEL_TYPE_MAP =
+ new ImmutableMap.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)
+ .put(TunnelTypeVxlanGpe.class, InterfaceInfo.InterfaceType.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;
}
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface ifState =
InterfaceManagerCommonUtils.getInterfaceStateFromOperDS(ifaceName, broker);
+ if(ifState == null){
+ throw new NullPointerException("Interface information not present in oper DS for " +ifaceName);
+ }
String lowerLayerIf = ifState.getLowerLayerIf().get(0);
NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf);
String portNo = IfmUtil.getPortNoFromNodeConnectorId(nodeConnectorId);
public static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface> buildStateInterfaceId(String interfaceName) {
InstanceIdentifierBuilder<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface> idBuilder =
InstanceIdentifier.builder(InterfacesState.class)
- .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.class,
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey(interfaceName));
+ .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.class,
+ new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey(interfaceName));
InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface> id = idBuilder.build();
return id;
}
public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey getStateInterfaceKeyFromName(
- String name) {
+ String name) {
return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceKey(name);
}
public static InstanceIdentifier<IdPool> getPoolId(String poolName){
InstanceIdentifier.InstanceIdentifierBuilder<IdPool> idBuilder =
- InstanceIdentifier.builder(IdPools.class).child(IdPool.class, new IdPoolKey(poolName));
+ InstanceIdentifier.builder(IdPools.class).child(IdPool.class, new IdPoolKey(poolName));
InstanceIdentifier<IdPool> id = idBuilder.build();
return id;
}
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;
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,
+ DataBroker dataBroker, Boolean isDefaultEgress) {
+ List<ActionInfo> listActionInfo = getEgressActionInfosForInterface(interfaceName, tunnelKey, 0, dataBroker, isDefaultEgress);
List<Action> actionsList = new ArrayList<>();
for (ActionInfo actionInfo : listActionInfo) {
actionsList.add(actionInfo.buildAction());
return actionsList;
}
- public static List<ActionInfo> getEgressActionInfosForInterface(String interfaceName,
+ 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.buildWriteActionsInstruction(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);
}
/**
* @param dataBroker
* @return
*/
- public static List<ActionInfo> getEgressActionInfosForInterface(String interfaceName,
- Long tunnelKey,
+ 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);
- String portNo = IfmUtil.getPortNoFromInterfaceName(interfaceName, dataBroker);
+ if(interfaceInfo == null){
+ throw new NullPointerException("Interface information not present in config DS for " +interfaceName);
+ }
+ 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 ) {
+ 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 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(isDefaultEgress) {
+ 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++));
+ result.add(new ActionInfo(ActionType.set_field_vlan_vid,
+ new String[]{Long.toString(vlanVid)}, actionKeyStart++));
+ }
+ result.add(new ActionInfo(ActionType.output, new String[]{portNo}, actionKeyStart++));
+ }else{
+ long regValue = MetaDataUtil.getReg6ValueForLPortDispatcher(ifIndex, NwConstants.DEFAULT_SERVICE_INDEX);
+ result.add(new ActionInfo(ActionType.nx_load_reg_6,
+ new String[]{Integer.toString(IfmConstants.REG6_START_INDEX), Integer.toString(IfmConstants.REG6_END_INDEX),
+ Long.toString(regValue)}, actionKeyStart++));
+ result.add(new ActionInfo(ActionType.nx_resubmit,
+ new String[]{Short.toString(NwConstants.EGRESS_LPORT_DISPATCHER_TABLE)}, actionKeyStart++));
}
- 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;
case MPLS_OVER_GRE:
case VXLAN_TRUNK_INTERFACE:
case GRE_TRUNK_INTERFACE:
- if(tunnelKey != null) {
+ if (tunnelKey != null) {
result.add(new ActionInfo(ActionType.set_field_tunnel_id,
- new BigInteger[] { BigInteger.valueOf(tunnelKey.longValue()) },
- actionKeyStart) );
- actionKeyStart++;
+ new BigInteger[]{BigInteger.valueOf(tunnelKey.longValue())},
+ actionKeyStart++));
}
- result.add(new ActionInfo(ActionType.output, new String[] { portNo}, actionKeyStart));
- actionKeyStart++;
+ result.add(new ActionInfo(ActionType.output, new String[]{portNo}, 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(":")));
}
public static BigInteger getDpnId(DatapathId datapathId){
if (datapathId != null) {
// Adding logs for a random issue spotted during datapath id conversion
- LOG.info("Received datapathId {}",datapathId.getValue());
String dpIdStr = datapathId.getValue().replace(":", "");
- LOG.info("Received datapathId {}",dpIdStr);
BigInteger dpnId = new BigInteger(dpIdStr, 16);
- LOG.info("After conversion datapathId {}",dpnId);
return dpnId;
}
return null;
}
- public static NodeConnectorId getNodeConnectorIdFromInterface(Interface iface, DataBroker dataBroker) {
- return FlowBasedServicesUtils.getNodeConnectorIdFromInterface(iface, dataBroker);
+ public static NodeConnectorId getNodeConnectorIdFromInterface(String interfaceName, DataBroker dataBroker) {
+ return FlowBasedServicesUtils.getNodeConnectorIdFromInterface(interfaceName, dataBroker);
}
public static String getPortName(DataBroker dataBroker, NodeConnectorId ncId){
}
public static InterfaceInfo.InterfaceType getInterfaceType(Interface iface) {
- InterfaceInfo.InterfaceType interfaceType =
- org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.UNKNOWN_INTERFACE;
- Class<? extends 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();
- 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;
- }
+ Class<? extends org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase> tunnelType = ifTunnel
+ .getTunnelInterfaceType();
+ interfaceType = TUNNEL_TYPE_MAP.get(tunnelType);
}
- // TODO: Check if the below condition is still needed/valid
- //else if (ifType.isAssignableFrom(InterfaceGroup.class)) {
- // interfaceType = org.opendaylight.genius.interfacemanager.globals.InterfaceInfo.InterfaceType.LOGICAL_GROUP_INTERFACE;
- //}
return interfaceType;
}
- public static VlanInterfaceInfo getVlanInterfaceInfo(String interfaceName, Interface iface, BigInteger dpId){
- IfL2vlan vlanIface = iface.getAugmentation(IfL2vlan.class);
+ public static VlanInterfaceInfo getVlanInterfaceInfo(String interfaceName, Interface iface, BigInteger dpId) {
short vlanId = 0;
- //FIXME :Use this below thing properly
- VlanInterfaceInfo vlanInterfaceInfo = new VlanInterfaceInfo(dpId, "someString", vlanId);
+ String portName = null;
+ IfL2vlan vlanIface = iface.getAugmentation(IfL2vlan.class);
+ ParentRefs parentRefs = iface.getAugmentation(ParentRefs.class);
+ if (parentRefs != null && parentRefs.getParentInterface() != null) {
+ portName = parentRefs.getParentInterface();
+ }else {
+ LOG.warn("Portname set to null since parentRef is Null");
+ }
+ VlanInterfaceInfo vlanInterfaceInfo = new VlanInterfaceInfo(dpId, portName, vlanId);
if (vlanIface != null) {
vlanId = vlanIface.getVlanId() == null ? 0 : vlanIface.getVlanId().getValue().shortValue();
}
return vlanInterfaceInfo;
}
+
+ 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 = InstanceIdentifier.builder(ServiceBindings.class)
+ .child(ServicesInfo.class, new ServicesInfoKey(interfaceName, serviceMode))
+ .child(BoundServices.class, new BoundServicesKey(serviceInfo.getServicePriority())).build();
+ t.put(LogicalDatastoreType.CONFIGURATION, boundServicesInstanceIdentifier, serviceInfo, true);
+ }
+
+ public static void unbindService(DataBroker dataBroker, String interfaceName, InstanceIdentifier<BoundServices>
+ boundServicesInstanceIdentifier, Class<? extends ServiceModeBase> serviceMode){
+ 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;
+ }
+ );
+ }
}