X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vpnservice%2Felanmanager%2Felanmanager-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Felan%2Futils%2FElanUtils.java;h=e68fd672620c732dbba7113b50b755dbd141cf6c;hb=b8ba9da4c453cd69b6c4474cdefd084939ec3218;hp=1b98d1b1ebf598d8a1dc5eda2e03fd05ffd2664e;hpb=fb91a8481b6abe85dcdd895e4c160e32a576e357;p=netvirt.git diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java index 1b98d1b1eb..e68fd67262 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java @@ -11,6 +11,8 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -18,12 +20,13 @@ import org.apache.commons.lang3.StringUtils; 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.clustering.EntityOwnershipService; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.netvirt.elan.internal.ElanInstanceManager; import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo; import org.opendaylight.genius.interfacemanager.globals.InterfaceServiceUtil; +import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; import org.opendaylight.genius.itm.globals.ITMConstants; import org.opendaylight.genius.mdsalutil.FlowEntity; import org.opendaylight.genius.mdsalutil.InstructionInfo; @@ -35,8 +38,13 @@ import org.opendaylight.genius.mdsalutil.MatchInfo; import org.opendaylight.genius.mdsalutil.MetaDataUtil; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; -import org.opendaylight.netvirt.elan.internal.ElanServiceProvider; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeIngress; +import org.opendaylight.genius.utils.ServiceIndex; +import org.opendaylight.netvirt.elan.internal.ElanInstanceManager; +import org.opendaylight.netvirt.elan.internal.ElanInterfaceManager; +import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayMulticastUtils; +import org.opendaylight.netvirt.elan.l2gw.utils.ElanL2GatewayUtils; +import org.opendaylight.netvirt.elan.l2gw.utils.L2GatewayConnectionUtils; +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.state.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.AdminStatus; @@ -47,41 +55,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.*; -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.netvirt.elan.rev150602.ElanDpnInterfaces; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanForwardingTables; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInstances; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInterfaceForwardingEntries; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInterfaces; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanState; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanTagNameMap; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeVxlan; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan._interface.forwarding.entries.ElanInterfaceMac; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan._interface.forwarding.entries.ElanInterfaceMacKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.ElanDpnInterfacesList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.ElanDpnInterfacesListKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.elan.dpn.interfaces.list.DpnInterfaces; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.elan.dpn.interfaces.list.DpnInterfacesKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.forwarding.tables.MacTable; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.forwarding.tables.MacTableBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.forwarding.tables.MacTableKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstanceBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstanceKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterface; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterfaceKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.state.Elan; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.state.ElanBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.state.ElanKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagName; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagNameBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagNameKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntryKey; 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; @@ -91,6 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406. import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406.IfIndexesInterfaceMap; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._if.indexes._interface.map.IfIndexInterface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.meta.rev160406._if.indexes._interface.map.IfIndexInterfaceKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfExternal; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.TunnelTypeVxlan; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetDpidFromInterfaceInputBuilder; @@ -98,6 +72,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpc import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressActionsForInterfaceInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressActionsForInterfaceInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetEgressActionsForInterfaceOutput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService; +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.ServiceModeIngress; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceTypeFlowBased; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.StypeOpenflowBuilder; 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; @@ -118,6 +98,50 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.G import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.ItmRpcService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.RemoveTerminatingServiceActionsInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.RemoveTerminatingServiceActionsInputBuilder; +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.netvirt.elan.etree.rev160614.EtreeInstance; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInstanceBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeInterface.EtreeInterfaceType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeLeafTag; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeLeafTagName; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev160614.EtreeLeafTagNameBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanDpnInterfaces; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanForwardingTables; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInstances; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInterfaceForwardingEntries; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInterfaces; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanState; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanTagNameMap; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeFlat; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeVlan; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeVxlan; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan._interface.forwarding.entries.ElanInterfaceMac; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan._interface.forwarding.entries.ElanInterfaceMacKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.ElanDpnInterfacesList; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.ElanDpnInterfacesListKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.elan.dpn.interfaces.list.DpnInterfaces; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.dpn.interfaces.elan.dpn.interfaces.list.DpnInterfacesKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.forwarding.tables.MacTable; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.forwarding.tables.MacTableBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.forwarding.tables.MacTableKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstance; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstanceBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.instances.ElanInstanceKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterface; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.interfaces.ElanInterfaceKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.state.Elan; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.state.ElanBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.state.ElanKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagName; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagNameBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.elan.tag.name.map.ElanTagNameKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntry; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntryBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.forwarding.entries.MacEntryKey; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder; @@ -133,28 +157,86 @@ import com.google.common.util.concurrent.ListenableFuture; public class ElanUtils { - private static ElanServiceProvider elanServiceProvider ; - private static final Logger logger = LoggerFactory.getLogger(ElanUtils.class); + private static final Logger LOG = LoggerFactory.getLogger(ElanUtils.class); - public static void setElanServiceProvider(ElanServiceProvider serviceProvider) { - elanServiceProvider = serviceProvider; - } - public static ElanServiceProvider getElanServiceProvider() { - return elanServiceProvider; - } + private static Map elanInstanceLocalCache = new ConcurrentHashMap<>(); + private static Map elanInterfaceLocalCache = new ConcurrentHashMap<>(); + + private final DataBroker broker; + private final IMdsalApiManager mdsalManager; + private final ElanInstanceManager elanInstanceManager; + private final OdlInterfaceRpcService interfaceManagerRpcService; + private final ItmRpcService itmRpcService; + private ElanL2GatewayUtils elanL2GatewayUtils; + private ElanL2GatewayMulticastUtils elanL2GatewayMulticastUtils; + private L2GatewayConnectionUtils l2GatewayConnectionUtils; public static final FutureCallback DEFAULT_CALLBACK = new FutureCallback() { @Override public void onSuccess(Void result) { - logger.debug("Success in Datastore operation"); + LOG.debug("Success in Datastore operation"); } @Override public void onFailure(Throwable error) { - logger.error("Error in Datastore operation", error); + LOG.error("Error in Datastore operation", error); } }; + public ElanUtils(DataBroker dataBroker, IMdsalApiManager mdsalManager, ElanInstanceManager elanInstanceManager, + OdlInterfaceRpcService interfaceManagerRpcService, ItmRpcService itmRpcService, + ElanInterfaceManager elanInterfaceManager, + EntityOwnershipService entityOwnershipService) { + this.broker = dataBroker; + this.mdsalManager = mdsalManager; + this.elanInstanceManager = elanInstanceManager; + this.interfaceManagerRpcService = interfaceManagerRpcService; + this.itmRpcService = itmRpcService; + + elanL2GatewayMulticastUtils = + new ElanL2GatewayMulticastUtils(broker, elanInstanceManager, elanInterfaceManager, this); + elanL2GatewayUtils = new ElanL2GatewayUtils(broker, itmRpcService, this, + entityOwnershipService, elanL2GatewayMulticastUtils); + l2GatewayConnectionUtils = new L2GatewayConnectionUtils(broker, + elanInstanceManager, entityOwnershipService, this); + } + + public ElanL2GatewayUtils getElanL2GatewayUtils() { + return elanL2GatewayUtils; + } + + public ElanL2GatewayMulticastUtils getElanL2GatewayMulticastUtils() { + return elanL2GatewayMulticastUtils; + } + + public L2GatewayConnectionUtils getL2GatewayConnectionUtils() { + return l2GatewayConnectionUtils; + } + + public static void addElanInstanceIntoCache(String elanInstanceName, ElanInstance elanInstance) { + elanInstanceLocalCache.put(elanInstanceName, elanInstance); + } + + public static void removeElanInstanceFromCache(String elanInstanceName) { + elanInstanceLocalCache.remove(elanInstanceName); + } + + public static ElanInstance getElanInstanceFromCache(String elanInstanceName) { + return elanInstanceLocalCache.get(elanInstanceName); + } + + public static void addElanInterfaceIntoCache(String interfaceName, ElanInterface elanInterface) { + elanInterfaceLocalCache.put(interfaceName, elanInterface); + } + + public static void removeElanInterfaceFromCache(String interfaceName) { + elanInterfaceLocalCache.remove(interfaceName); + } + + public static ElanInterface getElanInterfaceFromCache(String interfaceName) { + return elanInterfaceLocalCache.get(interfaceName); + } + /** * Uses the IdManager to retrieve a brand new ElanTag. * @@ -167,7 +249,7 @@ public class ElanUtils { public static Long retrieveNewElanTag(IdManagerService idManager, String idKey) { AllocateIdInput getIdInput = new AllocateIdInputBuilder().setPoolName(ElanConstants.ELAN_ID_POOL_NAME) - .setIdKey(idKey).build(); + .setIdKey(idKey).build(); try { Future> result = idManager.allocateId(getIdInput); @@ -175,23 +257,23 @@ public class ElanUtils { if (rpcResult.isSuccessful()) { return rpcResult.getResult().getIdValue().longValue(); } else { - logger.warn("RPC Call to Allocate Id returned with Errors {}", rpcResult.getErrors()); + LOG.warn("RPC Call to Allocate Id returned with Errors {}", rpcResult.getErrors()); } } catch (InterruptedException | ExecutionException e) { - logger.warn("Exception when Allocating Id",e); + LOG.warn("Exception when Allocating Id", e); } return 0L; } - public static void releaseId(IdManagerService idManager, String poolName, String idKey) { ReleaseIdInput releaseIdInput = new ReleaseIdInputBuilder().setPoolName(poolName).setIdKey(idKey).build(); Future> result = idManager.releaseId(releaseIdInput); } - public static Optional read(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path) { - ReadOnlyTransaction tx = (broker != null ) ? broker.newReadOnlyTransaction() : elanServiceProvider.getBroker().newReadOnlyTransaction(); + public Optional read(DataBroker broker, LogicalDatastoreType datastoreType, + InstanceIdentifier path) { + ReadOnlyTransaction tx = broker != null ? broker.newReadOnlyTransaction() + : this.broker.newReadOnlyTransaction(); Optional result = Optional.absent(); try { CheckedFuture, ReadFailedException> checkedFuture = tx.read(datastoreType, path); @@ -203,22 +285,33 @@ public class ElanUtils { return result; } - - public static void delete(DataBroker broker, LogicalDatastoreType datastoreType, InstanceIdentifier path) { + public static void delete(DataBroker broker, LogicalDatastoreType datastoreType, + InstanceIdentifier path) { WriteTransaction tx = broker.newWriteOnlyTransaction(); tx.delete(datastoreType, path); Futures.addCallback(tx.submit(), DEFAULT_CALLBACK); } + public static void delete(DataBroker broker, LogicalDatastoreType datastoreType, + InstanceIdentifier path, FutureCallback callback) { + WriteTransaction tx = broker.newWriteOnlyTransaction(); + tx.delete(datastoreType, path); + Futures.addCallback(tx.submit(), callback); + } public static InstanceIdentifier getElanInstanceIdentifier() { return InstanceIdentifier.builder(ElanInstances.class).child(ElanInstance.class).build(); } - //elan-instances config container - public static ElanInstance getElanInstanceByName(String elanInstanceName) { + // elan-instances config container + public static ElanInstance getElanInstanceByName(DataBroker broker, String elanInstanceName) { + ElanInstance elanObj = getElanInstanceFromCache(elanInstanceName); + if (elanObj != null) { + return elanObj; + } InstanceIdentifier elanIdentifierId = getElanInstanceConfigurationDataPath(elanInstanceName); - Optional elanInstance = read(elanServiceProvider.getBroker(), LogicalDatastoreType.CONFIGURATION, elanIdentifierId); + Optional elanInstance = MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, + elanIdentifierId); if (elanInstance.isPresent()) { return elanInstance.get(); } @@ -226,28 +319,40 @@ public class ElanUtils { } public static InstanceIdentifier getElanInstanceConfigurationDataPath(String elanInstanceName) { - return InstanceIdentifier.builder(ElanInstances.class).child(ElanInstance.class, new ElanInstanceKey(elanInstanceName)).build(); + return InstanceIdentifier.builder(ElanInstances.class) + .child(ElanInstance.class, new ElanInstanceKey(elanInstanceName)).build(); } - //elan-interfaces Config Container - public static ElanInterface getElanInterfaceByElanInterfaceName(String elanInterfaceName) { + // elan-interfaces Config Container + public static ElanInterface getElanInterfaceByElanInterfaceName(DataBroker broker, String elanInterfaceName) { + ElanInterface elanInterfaceObj = getElanInterfaceFromCache(elanInterfaceName); + if (elanInterfaceObj != null) { + return elanInterfaceObj; + } InstanceIdentifier elanInterfaceId = getElanInterfaceConfigurationDataPathId(elanInterfaceName); - Optional existingElanInterface = read(elanServiceProvider.getBroker(), LogicalDatastoreType.CONFIGURATION, elanInterfaceId); + Optional existingElanInterface = MDSALUtil.read(broker, + LogicalDatastoreType.CONFIGURATION, elanInterfaceId); if (existingElanInterface.isPresent()) { return existingElanInterface.get(); } return null; } + public static EtreeInterface getEtreeInterfaceByElanInterfaceName(DataBroker broker, String elanInterfaceName) { + ElanInterface elanInterface = getElanInterfaceByElanInterfaceName(broker, elanInterfaceName); + return elanInterface.getAugmentation(EtreeInterface.class); + } + public static InstanceIdentifier getElanInterfaceConfigurationDataPathId(String interfaceName) { - return InstanceIdentifier.builder(ElanInterfaces.class).child(ElanInterface.class, - new ElanInterfaceKey(interfaceName)).build(); + return InstanceIdentifier.builder(ElanInterfaces.class) + .child(ElanInterface.class, new ElanInterfaceKey(interfaceName)).build(); } - //elan-state Operational container - public static Elan getElanByName(String elanInstanceName) { + // elan-state Operational container + public static Elan getElanByName(DataBroker broker, String elanInstanceName) { InstanceIdentifier elanIdentifier = getElanInstanceOperationalDataPath(elanInstanceName); - Optional elanInstance = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanIdentifier); + Optional elanInstance = MDSALUtil.read(broker, LogicalDatastoreType.OPERATIONAL, + elanIdentifier); if (elanInstance.isPresent()) { return elanInstance.get(); } @@ -259,62 +364,71 @@ public class ElanUtils { } // grouping of forwarding-entries - public static MacEntry getInterfaceMacEntriesOperationalDataPath(String interfaceName, PhysAddress physAddress) { - InstanceIdentifier existingMacEntryId = getInterfaceMacEntriesIdentifierOperationalDataPath(interfaceName, physAddress); - Optional existingInterfaceMacEntry = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, existingMacEntryId); + public MacEntry getInterfaceMacEntriesOperationalDataPath(String interfaceName, PhysAddress physAddress) { + InstanceIdentifier existingMacEntryId = getInterfaceMacEntriesIdentifierOperationalDataPath( + interfaceName, physAddress); + Optional existingInterfaceMacEntry = read(broker, + LogicalDatastoreType.OPERATIONAL, existingMacEntryId); if (existingInterfaceMacEntry.isPresent()) { return existingInterfaceMacEntry.get(); } return null; } - public static MacEntry getInterfaceMacEntriesOperationalDataPathFromId(InstanceIdentifier identifier) { - Optional existingInterfaceMacEntry = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, identifier); + public MacEntry getInterfaceMacEntriesOperationalDataPathFromId(InstanceIdentifier identifier) { + Optional existingInterfaceMacEntry = read(broker, + LogicalDatastoreType.OPERATIONAL, identifier); if (existingInterfaceMacEntry.isPresent()) { return existingInterfaceMacEntry.get(); } return null; } - public static InstanceIdentifier getInterfaceMacEntriesIdentifierOperationalDataPath(String interfaceName, PhysAddress physAddress) { - return InstanceIdentifier.builder(ElanInterfaceForwardingEntries.class).child(ElanInterfaceMac.class, - new ElanInterfaceMacKey(interfaceName)).child(MacEntry.class, new MacEntryKey(physAddress)).build(); + public static InstanceIdentifier getInterfaceMacEntriesIdentifierOperationalDataPath(String interfaceName, + PhysAddress physAddress) { + return InstanceIdentifier.builder(ElanInterfaceForwardingEntries.class) + .child(ElanInterfaceMac.class, new ElanInterfaceMacKey(interfaceName)) + .child(MacEntry.class, new MacEntryKey(physAddress)).build(); } - //elan-forwarding-tables Operational container - public static MacEntry getMacTableByElanName(String elanName, PhysAddress physAddress) { - InstanceIdentifier macId = getMacEntryOperationalDataPath(elanName, physAddress); - Optional existingElanMacEntry = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, macId); + // elan-forwarding-tables Operational container + public MacEntry getMacTableByElanName(String elanName, PhysAddress physAddress) { + InstanceIdentifier macId = getMacEntryOperationalDataPath(elanName, physAddress); + Optional existingElanMacEntry = read(broker, + LogicalDatastoreType.OPERATIONAL, macId); if (existingElanMacEntry.isPresent()) { return existingElanMacEntry.get(); } return null; } - - public static MacEntry getMacEntryFromElanMacId(InstanceIdentifier identifier) { - Optional existingInterfaceMacEntry = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, identifier); + public MacEntry getMacEntryFromElanMacId(InstanceIdentifier identifier) { + Optional existingInterfaceMacEntry = read(broker, + LogicalDatastoreType.OPERATIONAL, identifier); if (existingInterfaceMacEntry.isPresent()) { return existingInterfaceMacEntry.get(); } return null; } - public static InstanceIdentifier getMacEntryOperationalDataPath(String elanName, PhysAddress physAddress) { - return InstanceIdentifier.builder(ElanForwardingTables.class).child(MacTable.class, - new MacTableKey(elanName)).child(MacEntry.class, new MacEntryKey(physAddress)).build(); + public static InstanceIdentifier getMacEntryOperationalDataPath(String elanName, + PhysAddress physAddress) { + return InstanceIdentifier.builder(ElanForwardingTables.class).child(MacTable.class, new MacTableKey(elanName)) + .child(MacEntry.class, new MacEntryKey(physAddress)).build(); } public static InstanceIdentifier getElanMacTableOperationalDataPath(String elanName) { - return InstanceIdentifier.builder(ElanForwardingTables.class).child(MacTable.class, - new MacTableKey(elanName)).build(); + return InstanceIdentifier.builder(ElanForwardingTables.class).child(MacTable.class, new MacTableKey(elanName)) + .build(); } - //elan-interface-forwarding-entries Operational container - public static ElanInterfaceMac getElanInterfaceMacByInterfaceName(String interfaceName) { - InstanceIdentifier elanInterfaceId = getElanInterfaceMacEntriesOperationalDataPath(interfaceName); - Optional existingElanInterface = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanInterfaceId); + // elan-interface-forwarding-entries Operational container + public ElanInterfaceMac getElanInterfaceMacByInterfaceName(String interfaceName) { + InstanceIdentifier elanInterfaceId = getElanInterfaceMacEntriesOperationalDataPath( + interfaceName); + Optional existingElanInterface = read(broker, + LogicalDatastoreType.OPERATIONAL, elanInterfaceId); if (existingElanInterface.isPresent()) { return existingElanInterface.get(); } @@ -328,9 +442,9 @@ public class ElanUtils { * the interface name * @return the elan interface mac addresses */ - public static List getElanInterfaceMacAddresses(String interfaceName) { - List macAddresses = new ArrayList(); - ElanInterfaceMac elanInterfaceMac = ElanUtils.getElanInterfaceMacByInterfaceName(interfaceName); + public List getElanInterfaceMacAddresses(String interfaceName) { + List macAddresses = new ArrayList<>(); + ElanInterfaceMac elanInterfaceMac = getElanInterfaceMacByInterfaceName(interfaceName); if (elanInterfaceMac != null && elanInterfaceMac.getMacEntry() != null) { List macEntries = elanInterfaceMac.getMacEntry(); for (MacEntry macEntry : macEntries) { @@ -340,9 +454,10 @@ public class ElanUtils { return macAddresses; } - public static InstanceIdentifier getElanInterfaceMacEntriesOperationalDataPath(String interfaceName) { - return InstanceIdentifier.builder(ElanInterfaceForwardingEntries.class).child(ElanInterfaceMac.class, - new ElanInterfaceMacKey(interfaceName)).build(); + public static InstanceIdentifier getElanInterfaceMacEntriesOperationalDataPath( + String interfaceName) { + return InstanceIdentifier.builder(ElanInterfaceForwardingEntries.class) + .child(ElanInterfaceMac.class, new ElanInterfaceMacKey(interfaceName)).build(); } /** @@ -350,76 +465,99 @@ public class ElanUtils { * Data retrieved from Elan's operational DS: elan-dpn-interfaces container * * @param elanInstanceName - * name of the Elan to which the interfaces must belong to + * name of the Elan to which the interfaces must belong to * @param dpId - * Id of the DPN where the interfaces are located + * Id of the DPN where the interfaces are located * @return the elan interface Info */ - public static DpnInterfaces getElanInterfaceInfoByElanDpn(String elanInstanceName, BigInteger dpId) { - InstanceIdentifier elanDpnInterfacesId = - getElanDpnInterfaceOperationalDataPath(elanInstanceName, dpId); - Optional elanDpnInterfaces = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanDpnInterfacesId); - if ( elanDpnInterfaces.isPresent() ) { + public DpnInterfaces getElanInterfaceInfoByElanDpn(String elanInstanceName, BigInteger dpId) { + InstanceIdentifier elanDpnInterfacesId = getElanDpnInterfaceOperationalDataPath(elanInstanceName, + dpId); + Optional elanDpnInterfaces = read(broker, + LogicalDatastoreType.OPERATIONAL, elanDpnInterfacesId); + if (elanDpnInterfaces.isPresent()) { return elanDpnInterfaces.get(); } return null; } /** - * Returns the InstanceIdentifier that points to the Interfaces of an Elan in a - * given DPN in the Operational DS. - * Data retrieved from Elans's operational DS: dpn-interfaces list + * Returns the InstanceIdentifier that points to the Interfaces of an Elan + * in a given DPN in the Operational DS. Data retrieved from Elans's + * operational DS: dpn-interfaces list * * @param elanInstanceName - * name of the Elan to which the interfaces must belong to + * name of the Elan to which the interfaces must belong to * @param dpId - * Id of the DPN where the interfaces are located + * Id of the DPN where the interfaces are located * @return the elan dpn interface */ public static InstanceIdentifier getElanDpnInterfaceOperationalDataPath(String elanInstanceName, - BigInteger dpId) { + BigInteger dpId) { return InstanceIdentifier.builder(ElanDpnInterfaces.class) - .child(ElanDpnInterfacesList.class, new ElanDpnInterfacesListKey(elanInstanceName)) - .child(DpnInterfaces.class, new DpnInterfacesKey(dpId)).build(); + .child(ElanDpnInterfacesList.class, new ElanDpnInterfacesListKey(elanInstanceName)) + .child(DpnInterfaces.class, new DpnInterfacesKey(dpId)).build(); } - //elan-tag-name-map Operational Container - public static ElanTagName getElanInfoByElanTag(long elanTag) { + // elan-tag-name-map Operational Container + public ElanTagName getElanInfoByElanTag(long elanTag) { InstanceIdentifier elanId = getElanInfoEntriesOperationalDataPath(elanTag); - Optional existingElanInfo = ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanId); + Optional existingElanInfo = read(broker, + LogicalDatastoreType.OPERATIONAL, elanId); if (existingElanInfo.isPresent()) { return existingElanInfo.get(); } return null; } + public EtreeLeafTagName getEtreeLeafTagByElanTag(long elanTag) { + InstanceIdentifier elanId = getElanInfoEntriesOperationalDataPath(elanTag); + Optional existingElanInfo = read(broker, + LogicalDatastoreType.OPERATIONAL, elanId); + if (existingElanInfo.isPresent()) { + ElanTagName elanTagName = existingElanInfo.get(); + EtreeLeafTagName etreeAugmentation = elanTagName.getAugmentation(EtreeLeafTagName.class); + return etreeAugmentation; + } + return null; + } + public static InstanceIdentifier getElanInfoEntriesOperationalDataPath(long elanTag) { - return InstanceIdentifier.builder(ElanTagNameMap.class).child(ElanTagName.class, - new ElanTagNameKey(elanTag)).build(); + return InstanceIdentifier.builder(ElanTagNameMap.class).child(ElanTagName.class, new ElanTagNameKey(elanTag)) + .build(); } // interface-index-tag operational container - public static Optional getInterfaceInfoByInterfaceTag(long interfaceTag) { + public Optional getInterfaceInfoByInterfaceTag(long interfaceTag) { InstanceIdentifier interfaceId = getInterfaceInfoEntriesOperationalDataPath(interfaceTag); - return ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, interfaceId); + return read(broker, LogicalDatastoreType.OPERATIONAL, interfaceId); } public static InstanceIdentifier getInterfaceInfoEntriesOperationalDataPath(long interfaceTag) { - return InstanceIdentifier.builder(IfIndexesInterfaceMap.class).child(IfIndexInterface.class, - new IfIndexInterfaceKey((int) interfaceTag)).build(); + return InstanceIdentifier.builder(IfIndexesInterfaceMap.class) + .child(IfIndexInterface.class, new IfIndexInterfaceKey((int) interfaceTag)).build(); } - - public static InstanceIdentifier getElanDpnOperationDataPath(String elanInstanceName) { - return InstanceIdentifier.builder(ElanDpnInterfaces.class).child(ElanDpnInterfacesList.class, - new ElanDpnInterfacesListKey(elanInstanceName)).build(); + return InstanceIdentifier.builder(ElanDpnInterfaces.class) + .child(ElanDpnInterfacesList.class, new ElanDpnInterfacesListKey(elanInstanceName)).build(); } - public static ElanDpnInterfacesList getElanDpnInterfacesList(String elanName) { + public ElanDpnInterfacesList getElanDpnInterfacesList(String elanName) { InstanceIdentifier elanDpnInterfaceId = getElanDpnOperationDataPath(elanName); - Optional existingElanDpnInterfaces = - ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); + Optional existingElanDpnInterfaces = read(broker, + LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); + if (existingElanDpnInterfaces.isPresent()) { + return existingElanDpnInterfaces.get(); + } + return null; + } + + public ElanDpnInterfaces getElanDpnInterfacesList() { + InstanceIdentifier elanDpnInterfaceId = InstanceIdentifier.builder(ElanDpnInterfaces.class) + .build(); + Optional existingElanDpnInterfaces = read(broker, + LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); if (existingElanDpnInterfaces.isPresent()) { return existingElanDpnInterfaces.get(); } @@ -435,16 +573,16 @@ public class ElanUtils { * the elan instance name * @return list of dpIds */ - public static List getParticipatingDPNsInElanInstance(String elanInstanceName) { - List dpIds = new ArrayList(); + public List getParticipatingDPNsInElanInstance(String elanInstanceName) { + List dpIds = new ArrayList<>(); InstanceIdentifier elanDpnInterfaceId = getElanDpnOperationDataPath(elanInstanceName); - Optional existingElanDpnInterfaces = - ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); + Optional existingElanDpnInterfaces = read(broker, + LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); if (!existingElanDpnInterfaces.isPresent()) { return dpIds; } List dpnInterfaces = existingElanDpnInterfaces.get().getDpnInterfaces(); - for (DpnInterfaces dpnInterface: dpnInterfaces) { + for (DpnInterfaces dpnInterface : dpnInterfaces) { dpIds.add(dpnInterface.getDpId()); } return dpIds; @@ -461,16 +599,16 @@ public class ElanUtils { * the elan instance name * @return true if dpId is already present, otherwise return false */ - public static boolean isDpnAlreadyPresentInElanInstance(BigInteger dpId, String elanInstanceName) { + public boolean isDpnAlreadyPresentInElanInstance(BigInteger dpId, String elanInstanceName) { boolean isDpIdPresent = false; InstanceIdentifier elanDpnInterfaceId = getElanDpnOperationDataPath(elanInstanceName); - Optional existingElanDpnInterfaces = - ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); + Optional existingElanDpnInterfaces = read(broker, + LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); if (!existingElanDpnInterfaces.isPresent()) { return isDpIdPresent; } List dpnInterfaces = existingElanDpnInterfaces.get().getDpnInterfaces(); - for (DpnInterfaces dpnInterface: dpnInterfaces) { + for (DpnInterfaces dpnInterface : dpnInterfaces) { if (dpnInterface.getDpId().equals(dpId)) { isDpIdPresent = true; break; @@ -479,22 +617,11 @@ public class ElanUtils { return isDpIdPresent; } - public static ElanDpnInterfaces getElanDpnInterfacesList() { - InstanceIdentifier elanDpnInterfaceId = - InstanceIdentifier.builder(ElanDpnInterfaces.class).build(); - Optional existingElanDpnInterfaces = - ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId); - if (existingElanDpnInterfaces.isPresent()) { - return existingElanDpnInterfaces.get(); - } - return null; - } - - public static ElanForwardingTables getElanForwardingList() { - InstanceIdentifier elanForwardingTableId = - InstanceIdentifier.builder(ElanForwardingTables.class).build(); - Optional existingElanForwardingList = - ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanForwardingTableId); + public ElanForwardingTables getElanForwardingList() { + InstanceIdentifier elanForwardingTableId = InstanceIdentifier + .builder(ElanForwardingTables.class).build(); + Optional existingElanForwardingList = read(broker, + LogicalDatastoreType.OPERATIONAL, elanForwardingTableId); if (existingElanForwardingList.isPresent()) { return existingElanForwardingList.get(); } @@ -508,31 +635,39 @@ public class ElanUtils { * the elan name * @return the elan mac table */ - public static MacTable getElanMacTable(String elanName) { + public MacTable getElanMacTable(String elanName) { InstanceIdentifier elanMacTableId = getElanMacTableOperationalDataPath(elanName); - Optional existingElanMacTable = - ElanUtils.read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, elanMacTableId); + Optional existingElanMacTable = read(broker, + LogicalDatastoreType.OPERATIONAL, elanMacTableId); if (existingElanMacTable.isPresent()) { return existingElanMacTable.get(); } return null; } - public static long getElanLocalBCGID(long elanTag) { - return ElanConstants.ELAN_GID_MIN + (((elanTag % ElanConstants.ELAN_GID_MIN) *2) - 1); + public static long getElanLocalBCGId(long elanTag) { + return ElanConstants.ELAN_GID_MIN + (elanTag % ElanConstants.ELAN_GID_MIN * 2 - 1); } - public static long getElanRemoteBCGID(long elanTag) { - return ElanConstants.ELAN_GID_MIN + (((elanTag % ElanConstants.ELAN_GID_MIN) *2)); + public static long getElanRemoteBCGId(long elanTag) { + return ElanConstants.ELAN_GID_MIN + elanTag % ElanConstants.ELAN_GID_MIN * 2; + } + + public static long getEtreeLeafLocalBCGId(long etreeLeafTag) { + return ElanConstants.ELAN_GID_MIN + (etreeLeafTag % ElanConstants.ELAN_GID_MIN * 2 - 1); + } + + public static long getEtreeLeafRemoteBCGId(long etreeLeafTag) { + return ElanConstants.ELAN_GID_MIN + etreeLeafTag % ElanConstants.ELAN_GID_MIN * 2; } public static BigInteger getElanMetadataLabel(long elanTag) { - return (BigInteger.valueOf(elanTag)).shiftLeft(24); + return BigInteger.valueOf(elanTag).shiftLeft(24); } - public static BigInteger getElanMetadataLabel(long elanTag, boolean isSHFlagSet ) { - int shBit = (isSHFlagSet) ? 1 : 0; - return (BigInteger.valueOf(elanTag)).shiftLeft(24).or(BigInteger.valueOf(shBit)); + public static BigInteger getElanMetadataLabel(long elanTag, boolean isSHFlagSet) { + int shBit = isSHFlagSet ? 1 : 0; + return BigInteger.valueOf(elanTag).shiftLeft(24).or(BigInteger.valueOf(shBit)); } public static BigInteger getElanMetadataLabel(long elanTag, int lportTag) { @@ -558,68 +693,85 @@ public class ElanUtils { * @param writeFlowGroupTx * the flow group tx */ - public static void setupMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, long macTimeout, - String macAddress, WriteTransaction writeFlowGroupTx) { + public void setupMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, long macTimeout, + String macAddress, WriteTransaction writeFlowGroupTx) { synchronized (macAddress) { - logger.info("Acquired lock for mac : " + macAddress + ". Proceeding with install operation."); - setupKnownSmacFlow(elanInfo, interfaceInfo, macTimeout, macAddress, elanServiceProvider.getMdsalManager(), writeFlowGroupTx); - setupOrigDmacFlows(elanInfo, interfaceInfo, macAddress, elanServiceProvider.getMdsalManager(), elanServiceProvider.getBroker(), writeFlowGroupTx); + LOG.debug("Acquired lock for mac : " + macAddress + ". Proceeding with install operation."); + setupKnownSmacFlow(elanInfo, interfaceInfo, macTimeout, macAddress, mdsalManager, + writeFlowGroupTx); + setupOrigDmacFlows(elanInfo, interfaceInfo, macAddress, mdsalManager, + broker, writeFlowGroupTx); } } - public static void setupDMacFlowonRemoteDpn(ElanInstance elanInfo, InterfaceInfo interfaceInfo, BigInteger dstDpId, - String macAddress, WriteTransaction writeFlowTx) { + public void setupDMacFlowonRemoteDpn(ElanInstance elanInfo, InterfaceInfo interfaceInfo, BigInteger dstDpId, + String macAddress, WriteTransaction writeFlowTx) { synchronized (macAddress) { - logger.info("Acquired lock for mac : " + macAddress + "Proceeding with install operation."); + LOG.debug("Acquired lock for mac : " + macAddress + ". Proceeding with install operation."); setupOrigDmacFlowsonRemoteDpn(elanInfo, interfaceInfo, dstDpId, macAddress, writeFlowTx); } } - /** - * Inserts a Flow in SMAC table to state that the MAC has already been learnt. - * - * @param elanInfo - * @param interfaceInfo - * @param macTimeout - * @param macAddress - * @param mdsalApiManager + * Inserts a Flow in SMAC table to state that the MAC has already been + * learnt. */ - private static void setupKnownSmacFlow(ElanInstance elanInfo, InterfaceInfo interfaceInfo, long macTimeout, - String macAddress, IMdsalApiManager mdsalApiManager, WriteTransaction writeFlowGroupTx) { + private void setupKnownSmacFlow(ElanInstance elanInfo, InterfaceInfo interfaceInfo, long macTimeout, + String macAddress, IMdsalApiManager mdsalApiManager, WriteTransaction writeFlowGroupTx) { FlowEntity flowEntity = buildKnownSmacFlow(elanInfo, interfaceInfo, macTimeout, macAddress); mdsalApiManager.addFlowToTx(flowEntity, writeFlowGroupTx); - if (logger.isDebugEnabled()) { - logger.debug("Known Smac flow entry created for elan Name:{}, logical Interface port:{} and mac address:{}", - elanInfo.getElanInstanceName(), elanInfo.getDescription(), macAddress); + if (LOG.isDebugEnabled()) { + LOG.debug("Known Smac flow entry created for elan Name:{}, logical Interface port:{} and mac address:{}", + elanInfo.getElanInstanceName(), elanInfo.getDescription(), macAddress); } } - public static FlowEntity buildKnownSmacFlow(ElanInstance elanInfo, InterfaceInfo interfaceInfo, long macTimeout, String macAddress) { - BigInteger dpId = interfaceInfo.getDpId(); + public FlowEntity buildKnownSmacFlow(ElanInstance elanInfo, InterfaceInfo interfaceInfo, long macTimeout, + String macAddress) { int lportTag = interfaceInfo.getInterfaceTag(); - long elanTag = elanInfo.getElanTag(); // Matching metadata and eth_src fields - List mkMatches = new ArrayList(); + List mkMatches = new ArrayList<>(); mkMatches.add(new MatchInfo(MatchFieldType.metadata, new BigInteger[] { - ElanUtils.getElanMetadataLabel(elanInfo.getElanTag(), lportTag), - ElanUtils.getElanMetadataMask() })); + getElanMetadataLabel(elanInfo.getElanTag(), lportTag), getElanMetadataMask() })); mkMatches.add(new MatchInfo(MatchFieldType.eth_src, new String[] { macAddress })); - List mkInstructions = new ArrayList(); - mkInstructions.add(new InstructionInfo(InstructionType.goto_table, new long[] { ElanConstants.ELAN_DMAC_TABLE })); + List mkInstructions = new ArrayList<>(); + mkInstructions.add(new InstructionInfo(InstructionType.goto_table, new long[] { NwConstants.ELAN_DMAC_TABLE })); - FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, ElanConstants.ELAN_SMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_SMAC_TABLE, dpId, lportTag, macAddress, elanTag), - 20, elanInfo.getDescription(), (int)macTimeout, 0, ElanConstants.COOKIE_ELAN_KNOWN_SMAC.add(BigInteger.valueOf(elanTag)), - mkMatches, mkInstructions); + BigInteger dpId = interfaceInfo.getDpId(); + long elanTag = getElanTag(broker, elanInfo, interfaceInfo); + FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.ELAN_SMAC_TABLE, + getKnownDynamicmacFlowRef(NwConstants.ELAN_SMAC_TABLE, dpId, lportTag, macAddress, elanTag), 20, + elanInfo.getDescription(), (int) macTimeout, 0, + ElanConstants.COOKIE_ELAN_KNOWN_SMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); flowEntity.setStrictFlag(true); - flowEntity.setSendFlowRemFlag(macTimeout != 0); //If Mac timeout is 0, the flow wont be deleted automatically, so no need to get notified + flowEntity.setSendFlowRemFlag(macTimeout != 0); // If Mac timeout is 0, + // the flow wont be + // deleted + // automatically, so no + // need to get notified return flowEntity; } + private static Long getElanTag(DataBroker broker, ElanInstance elanInfo, InterfaceInfo interfaceInfo) { + EtreeInterface etreeInterface = getEtreeInterfaceByElanInterfaceName(broker, interfaceInfo.getInterfaceName()); + if (etreeInterface == null || etreeInterface.getEtreeInterfaceType() == EtreeInterfaceType.Root) { + return elanInfo.getElanTag(); + } else { // Leaf + EtreeInstance etreeInstance = elanInfo.getAugmentation(EtreeInstance.class); + if (etreeInstance == null) { + LOG.warn("EtreeInterface " + interfaceInfo.getInterfaceName() + " is connected to a non-Etree network: " + + elanInfo.getElanInstanceName()); + return elanInfo.getElanTag(); + } else { + return etreeInstance.getEtreeLeafTagVal().getValue(); + } + } + } + /** - * Installs a Flow in INTERNAL_TUNNEL_TABLE of the affected DPN that sends the packet through the specified - * interface if the tunnel_id matches the interface's lportTag + * Installs a Flow in INTERNAL_TUNNEL_TABLE of the affected DPN that sends + * the packet through the specified interface if the tunnel_id matches the + * interface's lportTag. * * @param interfaceInfo * the interface info @@ -628,19 +780,20 @@ public class ElanUtils { * @param writeFlowGroupTx * the writeFLowGroup tx */ - public static void setupTermDmacFlows(InterfaceInfo interfaceInfo, IMdsalApiManager mdsalApiManager, WriteTransaction writeFlowGroupTx) { + public void setupTermDmacFlows(InterfaceInfo interfaceInfo, IMdsalApiManager mdsalApiManager, + WriteTransaction writeFlowGroupTx) { BigInteger dpId = interfaceInfo.getDpId(); int lportTag = interfaceInfo.getInterfaceTag(); Flow flow = MDSALUtil.buildFlowNew(NwConstants.INTERNAL_TUNNEL_TABLE, - getIntTunnelTableFlowRef(NwConstants.INTERNAL_TUNNEL_TABLE, lportTag), 5, - String.format("%s:%d","ITM Flow Entry ",lportTag), 0, 0, - ITMConstants.COOKIE_ITM.add(BigInteger.valueOf(lportTag)), - getTunnelIdMatchForFilterEqualsLPortTag(lportTag), - getInstructionsInPortForOutGroup(interfaceInfo.getInterfaceName())); + getIntTunnelTableFlowRef(NwConstants.INTERNAL_TUNNEL_TABLE, lportTag), 5, + String.format("%s:%d", "ITM Flow Entry ", lportTag), 0, 0, + ITMConstants.COOKIE_ITM.add(BigInteger.valueOf(lportTag)), + getTunnelIdMatchForFilterEqualsLPortTag(lportTag), + getInstructionsInPortForOutGroup(interfaceInfo.getInterfaceName())); mdsalApiManager.addFlowToTx(dpId, flow, writeFlowGroupTx); - if (logger.isDebugEnabled()) { - logger.debug("Terminating service table flow entry created on dpn:{} for logical Interface port:{}", - dpId, interfaceInfo.getPortName()); + if (LOG.isDebugEnabled()) { + LOG.debug("Terminating service table flow entry created on dpn:{} for logical Interface port:{}", dpId, + interfaceInfo.getPortName()); } } @@ -660,37 +813,36 @@ public class ElanUtils { /** * Constructs the Matches that checks that the tunnel_id field contains a - * specific lportTag + * specific lportTag. * * @param lportTag * lportTag that must be checked against the tunnel_id field * @return the list of match Info */ public static List getTunnelIdMatchForFilterEqualsLPortTag(int lportTag) { - List mkMatches = new ArrayList(); + List mkMatches = new ArrayList<>(); // Matching metadata - mkMatches.add(new MatchInfo(MatchFieldType.tunnel_id, new BigInteger[] { - BigInteger.valueOf(lportTag)})); + mkMatches.add(new MatchInfo(MatchFieldType.tunnel_id, new BigInteger[] { BigInteger.valueOf(lportTag) })); return mkMatches; } /** - * Constructs the Instructions that take the packet over a given interface + * Constructs the Instructions that take the packet over a given interface. * * @param ifName - * Name of the interface where the packet must be sent over. It can - * be a local interface or a tunnel interface (internal or external) + * Name of the interface where the packet must be sent over. It + * can be a local interface or a tunnel interface (internal or + * external) * @return the Instruction */ - public static List getInstructionsInPortForOutGroup(String ifName) { - List mkInstructions = new ArrayList(); - List actions = ElanUtils.getEgressActionsForInterface(ifName, /*tunnelKey*/ null ); + public List getInstructionsInPortForOutGroup(String ifName) { + List mkInstructions = new ArrayList<>(); + List actions = getEgressActionsForInterface(ifName, /* tunnelKey */ null); mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); return mkInstructions; } - /** * Returns the list of Actions to be taken when sending the packet through * an Elan interface. Note that this interface can refer to an ElanInterface @@ -705,165 +857,219 @@ public class ElanUtils { * the tunnel key * @return the egress actions for interface */ - public static List getEgressActionsForInterface(String ifName, Long tunnelKey) { - List listAction = new ArrayList(); + public List getEgressActionsForInterface(String ifName, Long tunnelKey) { + List listAction = new ArrayList<>(); try { - GetEgressActionsForInterfaceInput getEgressActionInput = - new GetEgressActionsForInterfaceInputBuilder().setIntfName(ifName).setTunnelKey(tunnelKey).build(); - Future> result = - elanServiceProvider.getInterfaceManagerRpcService().getEgressActionsForInterface(getEgressActionInput); + GetEgressActionsForInterfaceInput getEgressActionInput = new GetEgressActionsForInterfaceInputBuilder() + .setIntfName(ifName).setTunnelKey(tunnelKey).build(); + Future> result = interfaceManagerRpcService + .getEgressActionsForInterface(getEgressActionInput); RpcResult rpcResult = result.get(); if (!rpcResult.isSuccessful()) { - logger.warn("RPC Call to Get egress actions for interface {} returned with Errors {}", - ifName, rpcResult.getErrors()); + LOG.warn("RPC Call to Get egress actions for interface {} returned with Errors {}", ifName, + rpcResult.getErrors()); } else { - List actions = - rpcResult.getResult().getAction(); + List actions = rpcResult.getResult().getAction(); listAction = actions; } } catch (InterruptedException | ExecutionException e) { - logger.warn("Exception when egress actions for interface {}", ifName, e); + LOG.warn("Exception when egress actions for interface {}", ifName, e); } return listAction; } - private static void setupOrigDmacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, - IMdsalApiManager mdsalApiManager, DataBroker broker, WriteTransaction writeFlowGroupTx) { + private void setupOrigDmacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, + IMdsalApiManager mdsalApiManager, DataBroker broker, WriteTransaction writeFlowGroupTx) { BigInteger dpId = interfaceInfo.getDpId(); String ifName = interfaceInfo.getInterfaceName(); long ifTag = interfaceInfo.getInterfaceTag(); String elanInstanceName = elanInfo.getElanInstanceName(); List elanDpns = getInvolvedDpnsInElan(elanInstanceName); if (elanDpns != null) { - Long elanTag = elanInfo.getElanTag(); + // TODO might be bug and should call here just elanInfo.getElanTag() + Long elanTag = getElanTag(broker, elanInfo, interfaceInfo); for (DpnInterfaces elanDpn : elanDpns) { if (elanDpn.getDpId().equals(dpId)) { // On the local DPN set up a direct output flow - setupLocalDmacFlow(elanTag, dpId, ifName, macAddress, elanInstanceName, mdsalApiManager, ifTag, writeFlowGroupTx); - logger.debug("Dmac flow entry created for elan Name:{}, logical port Name:{} and mac address:{} on dpn:{}", - elanInstanceName, interfaceInfo.getPortName(), macAddress, dpId); + setupLocalDmacFlow(elanTag, dpId, ifName, macAddress, elanInstanceName, mdsalApiManager, ifTag, + writeFlowGroupTx); + LOG.debug("Dmac flow entry created for elan Name:{}, logical port Name:{} mand mac address:{} " + + "on dpn:{}", elanInstanceName, interfaceInfo.getPortName(), macAddress, dpId); } else { // Check for the Remote DPN present in Inventory Manager if (isDpnPresent(elanDpn.getDpId())) { - // For remote DPNs a flow is needed to indicate that packets of this ELAN going to this MAC - // need to be forwarded through the appropiated ITM tunnel - setupRemoteDmacFlow(elanDpn.getDpId(), // srcDpn (the remote DPN in this case) - dpId, // dstDpn (the local DPN) - interfaceInfo.getInterfaceTag(), // lportTag of the local interface - elanTag, // identifier of the Elan - macAddress, // MAC to be programmed in remote DPN - elanInstanceName, writeFlowGroupTx); - logger.debug("Dmac flow entry created for elan Name:{}, logical port Name:{} and mac address:{} on dpn:{}", - elanInstanceName, interfaceInfo.getPortName(), macAddress, elanDpn.getDpId()); + // For remote DPNs a flow is needed to indicate that + // packets of this ELAN going to this MAC + // need to be forwarded through the appropiated ITM + // tunnel + setupRemoteDmacFlow(elanDpn.getDpId(), // srcDpn (the + // remote DPN in + // this case) + dpId, // dstDpn (the local DPN) + interfaceInfo.getInterfaceTag(), // lportTag of + // the local + // interface + elanTag, // identifier of the Elan + macAddress, // MAC to be programmed in remote + // DPN + elanInstanceName, writeFlowGroupTx, ifName); + LOG.debug("Dmac flow entry created for elan Name:{}, logical port Name:{} and mac address:{} on" + + " dpn:{}", elanInstanceName, interfaceInfo.getPortName(), macAddress, + elanDpn.getDpId()); } } } - // TODO: Make sure that the same is performed against the ElanDevices. + // TODO: Make sure that the same is performed against the + // ElanDevices. } } - private static void setupOrigDmacFlowsonRemoteDpn(ElanInstance elanInfo, InterfaceInfo interfaceInfo, BigInteger dstDpId, String macAddress, WriteTransaction writeFlowTx) { + private void setupOrigDmacFlowsonRemoteDpn(ElanInstance elanInfo, InterfaceInfo interfaceInfo, + BigInteger dstDpId, String macAddress, WriteTransaction writeFlowTx) { BigInteger dpId = interfaceInfo.getDpId(); String elanInstanceName = elanInfo.getElanInstanceName(); List remoteFEs = getInvolvedDpnsInElan(elanInstanceName); - for(DpnInterfaces remoteFE: remoteFEs) { + for (DpnInterfaces remoteFE : remoteFEs) { Long elanTag = elanInfo.getElanTag(); if (remoteFE.getDpId().equals(dstDpId)) { // Check for the Remote DPN present in Inventory Manager - setupRemoteDmacFlow(dstDpId, dpId, interfaceInfo.getInterfaceTag(), elanTag, macAddress, elanInstanceName, writeFlowTx); - if (logger.isDebugEnabled()) { - logger.debug("Dmac flow entry created for elan Name:{}, logical port Name:{} and mac address {} on dpn:{}", elanInstanceName, interfaceInfo.getPortName(), macAddress, remoteFE.getDpId()); + setupRemoteDmacFlow(dstDpId, dpId, interfaceInfo.getInterfaceTag(), elanTag, macAddress, + elanInstanceName, writeFlowTx, interfaceInfo.getInterfaceName()); + if (LOG.isDebugEnabled()) { + LOG.debug("Dmac flow entry created for elan Name:{}, logical port Name:{} and mac address {} on" + + " dpn:{}", elanInstanceName, interfaceInfo.getPortName(), macAddress, remoteFE.getDpId()); } break; } } } - @SuppressWarnings("unchecked") - public static List getInvolvedDpnsInElan(String elanName) { - List dpns = ElanInstanceManager.getElanInstanceManager(elanServiceProvider).getElanDPNByName(elanName); + public List getInvolvedDpnsInElan(String elanName) { + List dpns = elanInstanceManager.getElanDPNByName(elanName); if (dpns == null) { return Collections.emptyList(); } return dpns; } - private static void setupLocalDmacFlow(long elanTag, BigInteger dpId, String ifName, String macAddress, - String displayName, IMdsalApiManager mdsalApiManager, long ifTag, WriteTransaction writeFlowGroupTx) { + private void setupLocalDmacFlow(long elanTag, BigInteger dpId, String ifName, String macAddress, + String displayName, IMdsalApiManager mdsalApiManager, long ifTag, WriteTransaction writeFlowGroupTx) { Flow flowEntity = buildLocalDmacFlowEntry(elanTag, dpId, ifName, macAddress, displayName, ifTag); mdsalApiManager.addFlowToTx(dpId, flowEntity, writeFlowGroupTx); - + installEtreeLocalDmacFlow(elanTag, dpId, ifName, macAddress, displayName, mdsalApiManager, ifTag, + writeFlowGroupTx); + } + + private void installEtreeLocalDmacFlow(long elanTag, BigInteger dpId, String ifName, String macAddress, + String displayName, IMdsalApiManager mdsalApiManager, long ifTag, WriteTransaction writeFlowGroupTx) { + EtreeInterface etreeInterface = getEtreeInterfaceByElanInterfaceName(broker, ifName); + if (etreeInterface != null) { + if (etreeInterface.getEtreeInterfaceType() == EtreeInterfaceType.Root) { + EtreeLeafTagName etreeTagName = getEtreeLeafTagByElanTag(elanTag); + if (etreeTagName == null) { + LOG.warn("Interface " + ifName + " seems like it belongs to Etree but etreeTagName from elanTag " + + elanTag + " is null."); + } else { + Flow flowEntity = buildLocalDmacFlowEntry(etreeTagName.getEtreeLeafTag().getValue(), dpId, ifName, + macAddress, displayName, ifTag); + mdsalApiManager.addFlowToTx(dpId, flowEntity, writeFlowGroupTx); + } + } + } } - public static String getKnownDynamicmacFlowRef(short tableId, BigInteger dpId, long lporTag, String macAddress, long elanTag) { - return new StringBuffer().append(tableId).append(elanTag).append(dpId).append(lporTag).append(macAddress).toString(); + public static String getKnownDynamicmacFlowRef(short tableId, BigInteger dpId, long lporTag, String macAddress, + long elanTag) { + return new StringBuffer().append(tableId).append(elanTag).append(dpId).append(lporTag).append(macAddress) + .toString(); } - public static String getKnownDynamicmacFlowRef(short tableId, BigInteger dpId, BigInteger remoteDpId, String macAddress, long elanTag) { - return new StringBuffer().append(tableId).append(elanTag).append(dpId).append(remoteDpId).append(macAddress).toString(); + public static String getKnownDynamicmacFlowRef(short tableId, BigInteger dpId, BigInteger remoteDpId, + String macAddress, long elanTag) { + return new StringBuffer().append(tableId).append(elanTag).append(dpId).append(remoteDpId).append(macAddress) + .toString(); } private static String getKnownDynamicmacFlowRef(short elanDmacTable, BigInteger dpId, String extDeviceNodeId, - String dstMacAddress, long elanTag, boolean shFlag) { - return new StringBuffer().append(elanDmacTable).append(elanTag).append(dpId) - .append(extDeviceNodeId).append(dstMacAddress).append(shFlag) - .toString(); + String dstMacAddress, long elanTag, boolean shFlag) { + return new StringBuffer().append(elanDmacTable).append(elanTag).append(dpId).append(extDeviceNodeId) + .append(dstMacAddress).append(shFlag).toString(); } /** - * Builds the flow to be programmed in the DMAC table of the local DPN (that is, where the MAC is attached to). - * This flow consists in: + * Builds the flow to be programmed in the DMAC table of the local DPN (that + * is, where the MAC is attached to). This flow consists in: * - * Match: - * + elanTag in metadata - * + packet goes to a MAC locally attached - * Actions: - * + optionally, pop-vlan + set-vlan-id - * + output to ifName's portNumber + *

Match: + elanTag in metadata + packet goes to a MAC locally attached + * Actions: + optionally, pop-vlan + set-vlan-id + output to ifName's + * portNumber * - * @param elanTag the elan tag - * @param dpId the dp id - * @param ifName the if name - * @param macAddress the mac address - * @param displayName the display name - * @param ifTag the if tag + * @param elanTag + * the elan tag + * @param dpId + * the dp id + * @param ifName + * the if name + * @param macAddress + * the mac address + * @param displayName + * the display name + * @param ifTag + * the if tag * @return the flow */ - public static Flow buildLocalDmacFlowEntry(long elanTag, BigInteger dpId, String ifName, String macAddress, - String displayName, long ifTag) { - List mkMatches = new ArrayList(); + public Flow buildLocalDmacFlowEntry(long elanTag, BigInteger dpId, String ifName, String macAddress, + String displayName, long ifTag) { + List mkMatches = new ArrayList<>(); mkMatches.add(new MatchInfo(MatchFieldType.metadata, - new BigInteger[] { ElanUtils.getElanMetadataLabel(elanTag), MetaDataUtil.METADATA_MASK_SERVICE })); + new BigInteger[] { getElanMetadataLabel(elanTag), MetaDataUtil.METADATA_MASK_SERVICE })); mkMatches.add(new MatchInfo(MatchFieldType.eth_dst, new String[] { macAddress })); - List mkInstructions = new ArrayList(); + List mkInstructions = new ArrayList<>(); List actions = getEgressActionsForInterface(ifName, /* tunnelKey */ null); mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); - Flow flow = MDSALUtil.buildFlowNew(ElanConstants.ELAN_DMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, dpId, ifTag, macAddress, elanTag), 20, - displayName, 0, 0, ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, - mkInstructions); + Flow flow = MDSALUtil.buildFlowNew(NwConstants.ELAN_DMAC_TABLE, + getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, dpId, ifTag, macAddress, elanTag), 20, + displayName, 0, 0, ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, + mkInstructions); return flow; } - public static void setupRemoteDmacFlow(BigInteger srcDpId, BigInteger destDpId, int lportTag, long elanTag, String macAddress, - String displayName, WriteTransaction writeFlowGroupTx) { + public void setupRemoteDmacFlow(BigInteger srcDpId, BigInteger destDpId, int lportTag, long elanTag, + String macAddress, String displayName, WriteTransaction writeFlowGroupTx, String interfaceName) { Flow flowEntity = buildRemoteDmacFlowEntry(srcDpId, destDpId, lportTag, elanTag, macAddress, displayName); - elanServiceProvider.getMdsalManager().addFlowToTx(srcDpId, flowEntity, writeFlowGroupTx); + mdsalManager.addFlowToTx(srcDpId, flowEntity, writeFlowGroupTx); + setupEtreeRemoteDmacFlow(srcDpId, destDpId, lportTag, elanTag, macAddress, displayName, interfaceName, + writeFlowGroupTx); + } + + private void setupEtreeRemoteDmacFlow(BigInteger srcDpId, BigInteger destDpId, int lportTag, long elanTag, + String macAddress, String displayName, String interfaceName, WriteTransaction writeFlowGroupTx) { + Flow flowEntity; + EtreeInterface etreeInterface = getEtreeInterfaceByElanInterfaceName(broker, interfaceName); + if (etreeInterface != null) { + if (etreeInterface.getEtreeInterfaceType() == EtreeInterfaceType.Root) { + EtreeLeafTagName etreeTagName = getEtreeLeafTagByElanTag(elanTag); + if (etreeTagName == null) { + LOG.warn("Interface " + interfaceName + + " seems like it belongs to Etree but etreeTagName from elanTag " + elanTag + " is null."); + } else { + flowEntity = buildRemoteDmacFlowEntry(srcDpId, destDpId, lportTag, + etreeTagName.getEtreeLeafTag().getValue(), macAddress, displayName); + mdsalManager.addFlowToTx(srcDpId, flowEntity, writeFlowGroupTx); + } + } + } } /** - * Builds a Flow to be programmed in a remote DPN's DMAC table. - * This flow consists in: - * Match: - * + elanTag in packet's metadata - * + packet going to a MAC known to be located in another DPN - * Actions: - * + set_tunnel_id(lportTag) - * + output ITM internal tunnel interface with the other DPN + * Builds a Flow to be programmed in a remote DPN's DMAC table. This flow + * consists in: Match: + elanTag in packet's metadata + packet going to a + * MAC known to be located in another DPN Actions: + set_tunnel_id(lportTag) + * + output ITM internal tunnel interface with the other DPN * * @param srcDpId * the src Dpn Id @@ -879,85 +1085,118 @@ public class ElanUtils { * display Name * @return the flow remote Dmac */ - public static Flow buildRemoteDmacFlowEntry(BigInteger srcDpId, BigInteger destDpId, int lportTag, long elanTag, - String macAddress, String displayName) { - List mkMatches = new ArrayList(); + public Flow buildRemoteDmacFlowEntry(BigInteger srcDpId, BigInteger destDpId, int lportTag, long elanTag, + String macAddress, String displayName) { + List mkMatches = new ArrayList<>(); mkMatches.add(new MatchInfo(MatchFieldType.metadata, - new BigInteger[]{ ElanUtils.getElanMetadataLabel(elanTag), - MetaDataUtil.METADATA_MASK_SERVICE })); + new BigInteger[] { getElanMetadataLabel(elanTag), MetaDataUtil.METADATA_MASK_SERVICE })); mkMatches.add(new MatchInfo(MatchFieldType.eth_dst, new String[] { macAddress })); - List mkInstructions = new ArrayList(); + List mkInstructions = new ArrayList<>(); - //List of Action for the provided Source and Destination DPIDs + // List of Action for the provided Source and Destination DPIDs try { - List actions = getInternalItmEgressAction(srcDpId, destDpId, lportTag); + List actions = getInternalTunnelItmEgressAction(srcDpId, destDpId, lportTag); mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); } catch (Exception e) { - logger.error("Interface Not Found exception"); + LOG.error("Interface Not Found exception"); } - - Flow flow = MDSALUtil.buildFlowNew(ElanConstants.ELAN_DMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, srcDpId, destDpId, macAddress, elanTag), - 20, /* prio */ - displayName, 0, /* idleTimeout */ - 0, /* hardTimeout */ - ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); + Flow flow = MDSALUtil.buildFlowNew(NwConstants.ELAN_DMAC_TABLE, + getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, srcDpId, destDpId, macAddress, elanTag), + 20, /* prio */ + displayName, 0, /* idleTimeout */ + 0, /* hardTimeout */ + ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); return flow; } - public static void deleteMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, MacEntry macEntry, WriteTransaction deleteFlowGroupTx) { + public void deleteMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, MacEntry macEntry, + WriteTransaction deleteFlowGroupTx) { if (elanInfo == null || interfaceInfo == null) { return; } String macAddress = macEntry.getMacAddress().getValue(); synchronized (macAddress) { - logger.info("Acquired lock for mac : " + macAddress + "Proceeding with remove operation."); - deleteMacFlows(elanInfo, interfaceInfo, macAddress, /* alsoDeleteSMAC */ true, deleteFlowGroupTx); + LOG.debug("Acquired lock for mac : " + macAddress + ". Proceeding with remove operation."); + deleteMacFlows(elanInfo, interfaceInfo, macAddress, /* alsoDeleteSMAC */ true, deleteFlowGroupTx); } } - public static void deleteMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, boolean deleteSmac, WriteTransaction deleteFlowGroupTx) { + public void deleteMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, + boolean deleteSmac, WriteTransaction deleteFlowGroupTx) { String elanInstanceName = elanInfo.getElanInstanceName(); List remoteFEs = getInvolvedDpnsInElan(elanInstanceName); BigInteger srcdpId = interfaceInfo.getDpId(); boolean isFlowsRemovedInSrcDpn = false; - for (DpnInterfaces dpnInterface: remoteFEs) { + for (DpnInterfaces dpnInterface : remoteFEs) { Long elanTag = elanInfo.getElanTag(); BigInteger dstDpId = dpnInterface.getDpId(); - if (dstDpId.equals(srcdpId)) { + if (executeDeleteMacFlows(elanInfo, interfaceInfo, macAddress, deleteSmac, elanInstanceName, srcdpId, + elanTag, dstDpId, deleteFlowGroupTx)) { isFlowsRemovedInSrcDpn = true; - deleteSmacAndDmacFlows(elanInfo, interfaceInfo, macAddress, deleteSmac, deleteFlowGroupTx); - } else if (isDpnPresent(dstDpId)) { - elanServiceProvider.getMdsalManager().removeFlowToTx(dstDpId, MDSALUtil.buildFlow(ElanConstants.ELAN_DMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, dstDpId, srcdpId, macAddress, elanTag)), deleteFlowGroupTx); - if (logger.isDebugEnabled()) { - logger.debug("Dmac flow entry deleted for elan:{}, logical interface port:{} and mac address:{} on dpn:{}", elanInstanceName, interfaceInfo.getPortName(), macAddress, dstDpId); - } } + executeEtreeDeleteMacFlows(elanInfo, interfaceInfo, macAddress, deleteSmac, elanInstanceName, srcdpId, + elanTag, dstDpId, deleteFlowGroupTx); } if (!isFlowsRemovedInSrcDpn) { deleteSmacAndDmacFlows(elanInfo, interfaceInfo, macAddress, deleteSmac, deleteFlowGroupTx); } } - private static void deleteSmacAndDmacFlows(ElanInstance elanInfo,InterfaceInfo interfaceInfo, String macAddress, - boolean deleteSmac, WriteTransaction deleteFlowGroupTx) { + private void executeEtreeDeleteMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, + boolean deleteSmac, String elanInstanceName, BigInteger srcdpId, Long elanTag, BigInteger dstDpId, + WriteTransaction deleteFlowGroupTx) { + EtreeLeafTagName etreeLeafTag = getEtreeLeafTagByElanTag(elanTag); + if (etreeLeafTag != null) { + executeDeleteMacFlows(elanInfo, interfaceInfo, macAddress, deleteSmac, elanInstanceName, srcdpId, + etreeLeafTag.getEtreeLeafTag().getValue(), dstDpId, deleteFlowGroupTx); + } + } + + private boolean executeDeleteMacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, + boolean deleteSmac, String elanInstanceName, BigInteger srcdpId, Long elanTag, BigInteger dstDpId, + WriteTransaction deleteFlowGroupTx) { + boolean isFlowsRemovedInSrcDpn = false; + if (dstDpId.equals(srcdpId)) { + isFlowsRemovedInSrcDpn = true; + deleteSmacAndDmacFlows(elanInfo, interfaceInfo, macAddress, deleteSmac, deleteFlowGroupTx); + } else if (isDpnPresent(dstDpId)) { + mdsalManager + .removeFlowToTx(dstDpId, + MDSALUtil.buildFlow(NwConstants.ELAN_DMAC_TABLE, getKnownDynamicmacFlowRef( + NwConstants.ELAN_DMAC_TABLE, dstDpId, srcdpId, macAddress, elanTag)), + deleteFlowGroupTx); + if (LOG.isDebugEnabled()) { + LOG.debug("Dmac flow entry deleted for elan:{}, logical interface port:{} and mac address:{} on dpn:{}", + elanInstanceName, interfaceInfo.getPortName(), macAddress, dstDpId); + } + } + return isFlowsRemovedInSrcDpn; + } + + private void deleteSmacAndDmacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, + boolean deleteSmac, WriteTransaction deleteFlowGroupTx) { String elanInstanceName = elanInfo.getElanInstanceName(); long ifTag = interfaceInfo.getInterfaceTag(); BigInteger srcdpId = interfaceInfo.getDpId(); Long elanTag = elanInfo.getElanTag(); if (deleteSmac) { - elanServiceProvider.getMdsalManager().removeFlowToTx(srcdpId, MDSALUtil.buildFlow(ElanConstants.ELAN_SMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_SMAC_TABLE, srcdpId, ifTag, macAddress, elanTag)), deleteFlowGroupTx); + mdsalManager + .removeFlowToTx(srcdpId, + MDSALUtil.buildFlow(NwConstants.ELAN_SMAC_TABLE, getKnownDynamicmacFlowRef( + NwConstants.ELAN_SMAC_TABLE, srcdpId, ifTag, macAddress, elanTag)), + deleteFlowGroupTx); } - elanServiceProvider.getMdsalManager().removeFlowToTx(srcdpId, MDSALUtil.buildFlow(ElanConstants.ELAN_DMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, srcdpId, ifTag, macAddress, elanTag)), deleteFlowGroupTx); - if (logger.isDebugEnabled()) { - logger.debug("All the required flows deleted for elan:{}, logical Interface port:{} and mac address:{} on dpn:{}", elanInstanceName, interfaceInfo.getPortName(), macAddress, srcdpId); + mdsalManager.removeFlowToTx(srcdpId, + MDSALUtil.buildFlow(NwConstants.ELAN_DMAC_TABLE, + getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, srcdpId, ifTag, macAddress, elanTag)), + deleteFlowGroupTx); + if (LOG.isDebugEnabled()) { + LOG.debug("All the required flows deleted for elan:{}, logical Interface port:{} and MAC address:{} " + + "on dpn:{}", elanInstanceName, interfaceInfo.getPortName(), macAddress, srcdpId); } } @@ -971,94 +1210,127 @@ public class ElanUtils { * the id manager * @param elanInstanceAdded * the elan instance added + * @param elanInterfaces + * the elan interfaces * @param tx * transaction */ public static void updateOperationalDataStore(DataBroker broker, IdManagerService idManager, - ElanInstance elanInstanceAdded, List elanInterfaces, WriteTransaction tx) { + ElanInstance elanInstanceAdded, List elanInterfaces, WriteTransaction tx) { String elanInstanceName = elanInstanceAdded.getElanInstanceName(); Long elanTag = elanInstanceAdded.getElanTag(); if (elanTag == null || elanTag == 0L) { - elanTag = ElanUtils.retrieveNewElanTag(idManager, elanInstanceName); + elanTag = retrieveNewElanTag(idManager, elanInstanceName); } - Elan elanInfo = new ElanBuilder().setName(elanInstanceName).setElanInterfaces(elanInterfaces).setKey(new ElanKey(elanInstanceName)).build(); + Elan elanInfo = new ElanBuilder().setName(elanInstanceName).setElanInterfaces(elanInterfaces) + .setKey(new ElanKey(elanInstanceName)).build(); - //Add the ElanState in the elan-state operational data-store - tx.put(LogicalDatastoreType.OPERATIONAL, ElanUtils.getElanInstanceOperationalDataPath(elanInstanceName), elanInfo, true); + // Add the ElanState in the elan-state operational data-store + tx.put(LogicalDatastoreType.OPERATIONAL, getElanInstanceOperationalDataPath(elanInstanceName), + elanInfo, true); - //Add the ElanMacTable in the elan-mac-table operational data-store + // Add the ElanMacTable in the elan-mac-table operational data-store MacTable elanMacTable = new MacTableBuilder().setKey(new MacTableKey(elanInstanceName)).build(); - tx.put(LogicalDatastoreType.OPERATIONAL, ElanUtils.getElanMacTableOperationalDataPath(elanInstanceName), elanMacTable, true); - - ElanTagName elanTagName = new ElanTagNameBuilder().setElanTag(elanTag).setKey(new ElanTagNameKey(elanTag)) - .setName(elanInstanceName).build(); + tx.put(LogicalDatastoreType.OPERATIONAL, getElanMacTableOperationalDataPath(elanInstanceName), + elanMacTable, true); + + ElanTagNameBuilder elanTagNameBuilder = new ElanTagNameBuilder().setElanTag(elanTag) + .setKey(new ElanTagNameKey(elanTag)).setName(elanInstanceName); + long etreeLeafTag = -1; + if (isEtreeInstance(elanInstanceAdded)) { + etreeLeafTag = retrieveNewElanTag(idManager, elanInstanceName + ElanConstants.LEAVES_POSTFIX); + EtreeLeafTagName etreeLeafTagName = new EtreeLeafTagNameBuilder() + .setEtreeLeafTag(new EtreeLeafTag(etreeLeafTag)).build(); + elanTagNameBuilder.addAugmentation(EtreeLeafTagName.class, etreeLeafTagName); + addTheLeafTagAsElanTag(broker, elanInstanceName, etreeLeafTag, tx); + } + ElanTagName elanTagName = elanTagNameBuilder.build(); + + // Add the ElanTag to ElanName in the elan-tag-name Operational + // data-store + tx.put(LogicalDatastoreType.OPERATIONAL, + getElanInfoEntriesOperationalDataPath(elanTag), elanTagName); + + // Updates the ElanInstance Config DS by setting the just acquired + // elanTag + ElanInstanceBuilder elanInstanceBuilder = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName) + .setDescription(elanInstanceAdded.getDescription()) + .setMacTimeout(elanInstanceAdded.getMacTimeout() == null ? ElanConstants.DEFAULT_MAC_TIME_OUT + : elanInstanceAdded.getMacTimeout()) + .setKey(elanInstanceAdded.getKey()).setElanTag(elanTag); + if (isEtreeInstance(elanInstanceAdded)) { + EtreeInstance etreeInstance = new EtreeInstanceBuilder().setEtreeLeafTagVal(new EtreeLeafTag(etreeLeafTag)) + .build(); + elanInstanceBuilder.addAugmentation(EtreeInstance.class, etreeInstance); + } + ElanInstance elanInstanceWithTag = elanInstanceBuilder.build(); + tx.merge(LogicalDatastoreType.CONFIGURATION, getElanInstanceConfigurationDataPath(elanInstanceName), + elanInstanceWithTag, true); + } - //Add the ElanTag to ElanName in the elan-tag-name Operational data-store - tx.put(LogicalDatastoreType.OPERATIONAL, ElanUtils.getElanInfoEntriesOperationalDataPath(elanTag), elanTagName, true); + private static void addTheLeafTagAsElanTag(DataBroker broker, String elanInstanceName, long etreeLeafTag, + WriteTransaction tx) { + ElanTagName etreeTagAsElanTag = new ElanTagNameBuilder().setElanTag(etreeLeafTag) + .setKey(new ElanTagNameKey(etreeLeafTag)).setName(elanInstanceName).build(); + tx.put(LogicalDatastoreType.OPERATIONAL, + getElanInfoEntriesOperationalDataPath(etreeLeafTag), etreeTagAsElanTag); + } - // Updates the ElanInstance Config DS by setting the just adquired elanTag - ElanInstance elanInstanceWithTag = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName) - .setDescription(elanInstanceAdded.getDescription()) - .setMacTimeout(elanInstanceAdded.getMacTimeout() == null ? ElanConstants.DEFAULT_MAC_TIME_OUT - : elanInstanceAdded.getMacTimeout()) - .setKey(elanInstanceAdded.getKey()).setElanTag(elanTag).build(); - tx.merge(LogicalDatastoreType.CONFIGURATION, getElanInstanceConfigurationDataPath(elanInstanceName), elanInstanceWithTag, true); + private static boolean isEtreeInstance(ElanInstance elanInstanceAdded) { + return elanInstanceAdded.getAugmentation(EtreeInstance.class) != null; } - public static boolean isDpnPresent(BigInteger dpnId) { - String dpn = String.format("%s:%s", "openflow",dpnId); + public boolean isDpnPresent(BigInteger dpnId) { + String dpn = String.format("%s:%s", "openflow", dpnId); NodeId nodeId = new NodeId(dpn); InstanceIdentifier node = InstanceIdentifier.builder(Nodes.class).child(Node.class, new NodeKey(nodeId)) - .build(); - Optional nodePresent = read(elanServiceProvider.getBroker(), LogicalDatastoreType.OPERATIONAL, node); - return (nodePresent.isPresent()); + .build(); + Optional nodePresent = read(broker, LogicalDatastoreType.OPERATIONAL, node); + return nodePresent.isPresent(); } public static ServicesInfo getServiceInfo(String elanInstanceName, long elanTag, String interfaceName) { int priority = ElanConstants.ELAN_SERVICE_PRIORITY; int instructionKey = 0; - List instructions = new ArrayList(); - instructions.add(MDSALUtil.buildAndGetWriteMetadaInstruction(ElanUtils.getElanMetadataLabel(elanTag), MetaDataUtil.METADATA_MASK_SERVICE, ++instructionKey)); - instructions.add(MDSALUtil.buildAndGetGotoTableInstruction(ElanConstants.ELAN_SMAC_TABLE, ++instructionKey)); - - ServicesInfo serviceInfo = InterfaceServiceUtil.buildServiceInfo(String.format("%s.%s", elanInstanceName, interfaceName), ElanConstants.ELAN_SERVICE_INDEX, - priority, ElanConstants.COOKIE_ELAN_INGRESS_TABLE, instructions); + List instructions = new ArrayList<>(); + instructions.add(MDSALUtil.buildAndGetWriteMetadaInstruction(getElanMetadataLabel(elanTag), + MetaDataUtil.METADATA_MASK_SERVICE, ++instructionKey)); + instructions.add(MDSALUtil.buildAndGetGotoTableInstruction(NwConstants.ELAN_SMAC_TABLE, ++instructionKey)); + + short serviceIndex = ServiceIndex.getIndex(NwConstants.ELAN_SERVICE_NAME, NwConstants.ELAN_SERVICE_INDEX); + ServicesInfo serviceInfo = InterfaceServiceUtil.buildServiceInfo( + String.format("%s.%s", elanInstanceName, interfaceName), serviceIndex, priority, + NwConstants.COOKIE_ELAN_INGRESS_TABLE, instructions); return serviceInfo; } - public static void delete(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, FutureCallback callback) { - WriteTransaction tx = broker.newWriteOnlyTransaction(); - tx.delete(datastoreType, path); - Futures.addCallback(tx.submit(), callback); - } - public static void syncWrite(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data) { + InstanceIdentifier path, T data) { WriteTransaction tx = broker.newWriteOnlyTransaction(); tx.put(datastoreType, path, data, true); CheckedFuture futures = tx.submit(); try { futures.get(); } catch (InterruptedException | ExecutionException e) { - logger.error("Error writing to datastore (path, data) : ({}, {})", path, data); + LOG.error("Error writing to datastore (path, data) : ({}, {})", path, data); throw new RuntimeException(e.getMessage()); } } - public static BoundServices getBoundServices(String serviceName, short servicePriority, int flowPriority, - BigInteger cookie, List instructions) { - StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie).setFlowPriority(flowPriority).setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)) - .setServiceName(serviceName).setServicePriority(servicePriority) - .setServiceType(ServiceTypeFlowBased.class).addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); + BigInteger cookie, List instructions) { + StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie).setFlowPriority(flowPriority) + .setInstruction(instructions); + return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName) + .setServicePriority(servicePriority).setServiceType(ServiceTypeFlowBased.class) + .addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); } public static InstanceIdentifier buildServiceId(String vpnInterfaceName, short serviceIndex) { - return InstanceIdentifier.builder(ServiceBindings.class).child(ServicesInfo.class, new ServicesInfoKey(vpnInterfaceName, ServiceModeIngress.class)) - .child(BoundServices.class, new BoundServicesKey(serviceIndex)).build(); + return InstanceIdentifier.builder(ServiceBindings.class) + .child(ServicesInfo.class, new ServicesInfoKey(vpnInterfaceName, ServiceModeIngress.class)) + .child(BoundServices.class, new BoundServicesKey(serviceIndex)).build(); } /** @@ -1072,26 +1344,43 @@ public class ElanUtils { * the tunnel key * @return the list */ - public static List buildItmEgressActions(String tunnelIfaceName, Long tunnelKey) { - List result = Collections.emptyList(); + public List buildTunnelItmEgressActions(String tunnelIfaceName, Long tunnelKey) { if (tunnelIfaceName != null && !tunnelIfaceName.isEmpty()) { - GetEgressActionsForInterfaceInput getEgressActInput = new GetEgressActionsForInterfaceInputBuilder() - .setIntfName(tunnelIfaceName).setTunnelKey(tunnelKey).build(); - - Future> egressActionsOutputFuture = - elanServiceProvider.getInterfaceManagerRpcService().getEgressActionsForInterface(getEgressActInput); - try { - if (egressActionsOutputFuture.get().isSuccessful()) { - GetEgressActionsForInterfaceOutput egressActionsOutput = egressActionsOutputFuture.get().getResult(); - result = egressActionsOutput.getAction(); - } - } catch (InterruptedException | ExecutionException e) { - logger.error("Error in RPC call getEgressActionsForInterface {}", e); + return buildItmEgressActions(tunnelIfaceName, tunnelKey); + } + + return Collections.emptyList(); + } + + /** + * Builds the list of actions to be taken when sending the packet over + * external port such as tunnel, physical port etc. + * + * @param interfaceName + * the interface name + * @param tunnelKey + * can be VNI for VxLAN tunnel interfaces, Gre Key for GRE + * tunnels, etc. + * @return the list + */ + public List buildItmEgressActions(String interfaceName, Long tunnelKey) { + List result = Collections.emptyList(); + GetEgressActionsForInterfaceInput getEgressActInput = new GetEgressActionsForInterfaceInputBuilder() + .setIntfName(interfaceName).setTunnelKey(tunnelKey).build(); + + Future> egressActionsOutputFuture = interfaceManagerRpcService + .getEgressActionsForInterface(getEgressActInput); + try { + if (egressActionsOutputFuture.get().isSuccessful()) { + GetEgressActionsForInterfaceOutput egressActionsOutput = egressActionsOutputFuture.get().getResult(); + result = egressActionsOutput.getAction(); } + } catch (InterruptedException | ExecutionException e) { + LOG.error("Error in RPC call getEgressActionsForInterface {}", e); } - if ( result == null || result.size() == 0 ) { - logger.warn("Could not build Egress actions for interface {} and tunnelId {}", tunnelIfaceName, tunnelKey); + if (result == null || result.size() == 0) { + LOG.warn("Could not build Egress actions for interface {} and tunnelId {}", interfaceName, tunnelKey); } return result; } @@ -1110,25 +1399,27 @@ public class ElanUtils { * Vni to be stamped on the VxLAN Header. * @return the external itm egress action */ - public static List getExternalItmEgressAction(BigInteger srcDpnId, NodeId torNode, long vni ) { + public List getExternalTunnelItmEgressAction(BigInteger srcDpnId, NodeId torNode, long vni) { List result = Collections.emptyList(); GetExternalTunnelInterfaceNameInput input = new GetExternalTunnelInterfaceNameInputBuilder() - .setDestinationNode(torNode.getValue()).setSourceNode(srcDpnId.toString()).setTunnelType(TunnelTypeVxlan.class).build(); - Future> output = - elanServiceProvider.getItmRpcService().getExternalTunnelInterfaceName(input); + .setDestinationNode(torNode.getValue()).setSourceNode(srcDpnId.toString()) + .setTunnelType(TunnelTypeVxlan.class).build(); + Future> output = itmRpcService + .getExternalTunnelInterfaceName(input); try { if (output.get().isSuccessful()) { GetExternalTunnelInterfaceNameOutput tunnelInterfaceNameOutput = output.get().getResult(); String tunnelIfaceName = tunnelInterfaceNameOutput.getInterfaceName(); - if ( logger.isDebugEnabled() ) - logger.debug("Received tunnelInterfaceName from getTunnelInterfaceName RPC {}", tunnelIfaceName); + if (LOG.isDebugEnabled()) { + LOG.debug("Received tunnelInterfaceName from getTunnelInterfaceName RPC {}", tunnelIfaceName); + } - result = buildItmEgressActions(tunnelIfaceName, vni); + result = buildTunnelItmEgressActions(tunnelIfaceName, vni); } } catch (InterruptedException | ExecutionException e) { - logger.error("Error in RPC call getTunnelInterfaceName {}", e); + LOG.error("Error in RPC call getTunnelInterfaceName {}", e); } return result; @@ -1149,65 +1440,83 @@ public class ElanUtils { * serviceId to be sent on the VxLAN header. * @return the internal itm egress action */ - public static List getInternalItmEgressAction(BigInteger sourceDpnId, BigInteger destinationDpnId, - long serviceTag) { + public List getInternalTunnelItmEgressAction(BigInteger sourceDpnId, BigInteger destinationDpnId, + long serviceTag) { List result = Collections.emptyList(); - logger.debug("In getInternalItmEgressAction Action source {}, destination {}, elanTag {}", - sourceDpnId, destinationDpnId, serviceTag); + LOG.debug("In getInternalItmEgressAction Action source {}, destination {}, elanTag {}", sourceDpnId, + destinationDpnId, serviceTag); Class tunType = TunnelTypeVxlan.class; GetTunnelInterfaceNameInput input = new GetTunnelInterfaceNameInputBuilder() - .setDestinationDpid(destinationDpnId).setSourceDpid(sourceDpnId).setTunnelType(tunType).build(); - Future> output = elanServiceProvider.getItmRpcService().getTunnelInterfaceName(input); + .setDestinationDpid(destinationDpnId).setSourceDpid(sourceDpnId).setTunnelType(tunType).build(); + Future> output = itmRpcService + .getTunnelInterfaceName(input); try { if (output.get().isSuccessful()) { GetTunnelInterfaceNameOutput tunnelInterfaceNameOutput = output.get().getResult(); String tunnelIfaceName = tunnelInterfaceNameOutput.getInterfaceName(); - logger.debug("Received tunnelInterfaceName from getTunnelInterfaceName RPC {}", tunnelIfaceName); + LOG.debug("Received tunnelInterfaceName from getTunnelInterfaceName RPC {}", tunnelIfaceName); - result = buildItmEgressActions(tunnelIfaceName, serviceTag); + result = buildTunnelItmEgressActions(tunnelIfaceName, serviceTag); } } catch (InterruptedException | ExecutionException e) { - logger.error("Error in RPC call getTunnelInterfaceName {}", e); + LOG.error("Error in RPC call getTunnelInterfaceName {}", e); } return result; } + /** + * Build the list of actions to be taken when sending the packet to external + * (physical) port. + * + * @param interfaceName + * Interface name + * @return the external port itm egress actions + */ + public List getExternalPortItmEgressAction(String interfaceName) { + return buildItmEgressActions(interfaceName, null); + } + public static List getTunnelMatchesForServiceId(int elanTag) { - List mkMatches = new ArrayList(); + List mkMatches = new ArrayList<>(); // Matching metadata - mkMatches.add(new MatchInfo(MatchFieldType.tunnel_id, new BigInteger[]{BigInteger.valueOf(elanTag)})); + mkMatches.add(new MatchInfo(MatchFieldType.tunnel_id, new BigInteger[] { BigInteger.valueOf(elanTag) })); return mkMatches; } - public static void removeTerminatingServiceAction(BigInteger destDpId, int serviceId) { - RemoveTerminatingServiceActionsInput input = new RemoveTerminatingServiceActionsInputBuilder().setDpnId(destDpId).setServiceId(serviceId).build(); - Future> futureObject = elanServiceProvider.getItmRpcService().removeTerminatingServiceActions(input); + public void removeTerminatingServiceAction(BigInteger destDpId, int serviceId) { + RemoveTerminatingServiceActionsInput input = new RemoveTerminatingServiceActionsInputBuilder() + .setDpnId(destDpId).setServiceId(serviceId).build(); + Future> futureObject = itmRpcService + .removeTerminatingServiceActions(input); try { RpcResult result = futureObject.get(); if (result.isSuccessful()) { - logger.debug("Successfully completed removeTerminatingServiceActions"); + LOG.debug("Successfully completed removeTerminatingServiceActions"); } else { - logger.debug("Failure in removeTerminatingServiceAction RPC call"); + LOG.debug("Failure in removeTerminatingServiceAction RPC call"); } } catch (InterruptedException | ExecutionException e) { - logger.error("Error in RPC call removeTerminatingServiceActions {}", e); + LOG.error("Error in RPC call removeTerminatingServiceActions {}", e); } } - public static void createTerminatingServiceActions(BigInteger destDpId, int serviceId, List actions) { - List mkInstructions = new ArrayList(); + public void createTerminatingServiceActions(BigInteger destDpId, int serviceId, List actions) { + List mkInstructions = new ArrayList<>(); mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); - CreateTerminatingServiceActionsInput input = new CreateTerminatingServiceActionsInputBuilder().setDpnId(destDpId).setServiceId(serviceId).setInstruction(mkInstructions).build(); + CreateTerminatingServiceActionsInput input = new CreateTerminatingServiceActionsInputBuilder() + .setDpnId(destDpId).setServiceId(serviceId).setInstruction(mkInstructions).build(); - elanServiceProvider.getItmRpcService().createTerminatingServiceActions(input); + itmRpcService.createTerminatingServiceActions(input); } public static TunnelList buildInternalTunnel(DataBroker broker) { - InstanceIdentifier tunnelListInstanceIdentifier = InstanceIdentifier.builder(TunnelList.class).build(); - Optional tunnelList = read(broker, LogicalDatastoreType.CONFIGURATION, tunnelListInstanceIdentifier); + InstanceIdentifier tunnelListInstanceIdentifier = InstanceIdentifier.builder(TunnelList.class) + .build(); + Optional tunnelList = MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, + tunnelListInstanceIdentifier); if (tunnelList.isPresent()) { return tunnelList.get(); } @@ -1225,13 +1534,13 @@ public class ElanUtils { * the datastore type * @return the external tunnel */ - public static ExternalTunnel getExternalTunnel(String sourceDevice, String destinationDevice, - LogicalDatastoreType datastoreType) { + public ExternalTunnel getExternalTunnel(String sourceDevice, String destinationDevice, + LogicalDatastoreType datastoreType) { ExternalTunnel externalTunnel = null; - Class tunType = TunnelTypeVxlan.class ; + Class tunType = TunnelTypeVxlan.class; InstanceIdentifier iid = InstanceIdentifier.builder(ExternalTunnelList.class) - .child(ExternalTunnel.class, new ExternalTunnelKey(destinationDevice, sourceDevice, tunType)).build(); - Optional tunnelList = read(elanServiceProvider.getBroker(), datastoreType, iid); + .child(ExternalTunnel.class, new ExternalTunnelKey(destinationDevice, sourceDevice, tunType)).build(); + Optional tunnelList = read(broker, datastoreType, iid); if (tunnelList.isPresent()) { externalTunnel = tunnelList.get(); } @@ -1247,7 +1556,7 @@ public class ElanUtils { * the datastore type * @return the external tunnel */ - public static ExternalTunnel getExternalTunnel(String interfaceName, LogicalDatastoreType datastoreType) { + public ExternalTunnel getExternalTunnel(String interfaceName, LogicalDatastoreType datastoreType) { ExternalTunnel externalTunnel = null; List externalTunnels = getAllExternalTunnels(datastoreType); for (ExternalTunnel tunnel : externalTunnels) { @@ -1263,13 +1572,13 @@ public class ElanUtils { * Gets the all external tunnels. * * @param datastoreType - * the data store type + * the data store type * @return the all external tunnels */ - public static List getAllExternalTunnels(LogicalDatastoreType datastoreType) { + public List getAllExternalTunnels(LogicalDatastoreType datastoreType) { List result = null; InstanceIdentifier iid = InstanceIdentifier.builder(ExternalTunnelList.class).build(); - Optional tunnelList = read(elanServiceProvider.getBroker(), datastoreType, iid); + Optional tunnelList = read(broker, datastoreType, iid); if (tunnelList.isPresent()) { result = tunnelList.get().getExternalTunnel(); } @@ -1298,10 +1607,11 @@ public class ElanUtils { * @param displayName * the display name */ - public static void installDmacFlowsToInternalRemoteMac(BigInteger localDpId, BigInteger remoteDpId, long lportTag, - long elanTag, String macAddress, String displayName) { - Flow flow = buildDmacFlowForInternalRemoteMac(localDpId, remoteDpId, lportTag, elanTag, macAddress, displayName); - elanServiceProvider.getMdsalManager().installFlow(remoteDpId, flow); + public void installDmacFlowsToInternalRemoteMac(BigInteger localDpId, BigInteger remoteDpId, long lportTag, + long elanTag, String macAddress, String displayName) { + Flow flow = buildDmacFlowForInternalRemoteMac(localDpId, remoteDpId, lportTag, elanTag, macAddress, + displayName); + mdsalManager.installFlow(remoteDpId, flow); } /** @@ -1323,139 +1633,198 @@ public class ElanUtils { * the mac address * @param displayName * the display name + * @param interfaceName + * the interface name * * @return the dmac flows */ - public static List> installDmacFlowsToExternalRemoteMac(BigInteger dpnId, - String extDeviceNodeId, Long elanTag, Long vni, String macAddress, String displayName) { + public List> installDmacFlowsToExternalRemoteMac(BigInteger dpnId, + String extDeviceNodeId, Long elanTag, Long vni, String macAddress, String displayName, + String interfaceName) { List> futures = new ArrayList<>(); synchronized (macAddress) { - Flow flow = buildDmacFlowForExternalRemoteMac(dpnId, extDeviceNodeId, elanTag, vni, macAddress, displayName); - futures.add(elanServiceProvider.getMdsalManager().installFlow(dpnId, flow)); + Flow flow = buildDmacFlowForExternalRemoteMac(dpnId, extDeviceNodeId, elanTag, vni, macAddress, + displayName); + futures.add(mdsalManager.installFlow(dpnId, flow)); Flow dropFlow = buildDmacFlowDropIfPacketComingFromTunnel(dpnId, extDeviceNodeId, elanTag, macAddress); - futures.add(elanServiceProvider.getMdsalManager().installFlow(dpnId, dropFlow)); + futures.add(mdsalManager.installFlow(dpnId, dropFlow)); + installEtreeDmacFlowsToExternalRemoteMac(dpnId, extDeviceNodeId, elanTag, vni, macAddress, displayName, + interfaceName, futures); } return futures; } + private void installEtreeDmacFlowsToExternalRemoteMac(BigInteger dpnId, String extDeviceNodeId, Long elanTag, + Long vni, String macAddress, String displayName, String interfaceName, + List> futures) { + EtreeLeafTagName etreeLeafTag = getEtreeLeafTagByElanTag(elanTag); + if (etreeLeafTag != null) { + buildEtreeDmacFlowDropIfPacketComingFromTunnel(dpnId, extDeviceNodeId, elanTag, macAddress, futures, + etreeLeafTag); + buildEtreeDmacFlowForExternalRemoteMac(dpnId, extDeviceNodeId, vni, macAddress, displayName, interfaceName, + futures, etreeLeafTag); + } + } + + private void buildEtreeDmacFlowForExternalRemoteMac(BigInteger dpnId, String extDeviceNodeId, Long vni, + String macAddress, String displayName, String interfaceName, List> futures, + EtreeLeafTagName etreeLeafTag) { + boolean isRoot = false; + if (interfaceName == null) { + isRoot = true; + } else { + EtreeInterface etreeInterface = getEtreeInterfaceByElanInterfaceName(broker, interfaceName); + if (etreeInterface != null) { + if (etreeInterface.getEtreeInterfaceType() == EtreeInterfaceType.Root) { + isRoot = true; + } + } + } + if (isRoot) { + Flow flow = buildDmacFlowForExternalRemoteMac(dpnId, extDeviceNodeId, + etreeLeafTag.getEtreeLeafTag().getValue(), vni, macAddress, displayName); + futures.add(mdsalManager.installFlow(dpnId, flow)); + } + } + + private void buildEtreeDmacFlowDropIfPacketComingFromTunnel(BigInteger dpnId, String extDeviceNodeId, + Long elanTag, String macAddress, List> futures, EtreeLeafTagName etreeLeafTag) { + if (etreeLeafTag != null) { + Flow dropFlow = buildDmacFlowDropIfPacketComingFromTunnel(dpnId, extDeviceNodeId, + etreeLeafTag.getEtreeLeafTag().getValue(), macAddress); + futures.add(mdsalManager.installFlow(dpnId, dropFlow)); + } + } + public static List buildMatchesForElanTagShFlagAndDstMac(long elanTag, boolean shFlag, String macAddr) { - List mkMatches = new ArrayList(); + List mkMatches = new ArrayList<>(); mkMatches.add(new MatchInfo(MatchFieldType.metadata, new BigInteger[] { - ElanUtils.getElanMetadataLabel(elanTag, shFlag), MetaDataUtil.METADATA_MASK_SERVICE_SH_FLAG })); + getElanMetadataLabel(elanTag, shFlag), MetaDataUtil.METADATA_MASK_SERVICE_SH_FLAG })); mkMatches.add(new MatchInfo(MatchFieldType.eth_dst, new String[] { macAddr })); return mkMatches; } /** - * Builds a Flow to be programmed in a DPN's DMAC table. This method must be used when the MAC is located in an - * External Device (TOR). - * The flow matches on the specified MAC and - * 1) sends the packet over the CSS-TOR tunnel if SHFlag is not set, or - * 2) drops it if SHFlag is set (what means the packet came from an external tunnel) + * Builds a Flow to be programmed in a DPN's DMAC table. This method must be + * used when the MAC is located in an External Device (TOR). The flow + * matches on the specified MAC and 1) sends the packet over the CSS-TOR + * tunnel if SHFlag is not set, or 2) drops it if SHFlag is set (what means + * the packet came from an external tunnel) * - * @param dpId DPN whose DMAC table is going to be modified - * @param extDeviceNodeId Hwvtep node where the mac is attached to - * @param elanTag ElanId to which the MAC is being added to - * @param vni the vni - * @param dstMacAddress The mac address to be programmed - * @param displayName the display name + * @param dpId + * DPN whose DMAC table is going to be modified + * @param extDeviceNodeId + * Hwvtep node where the mac is attached to + * @param elanTag + * ElanId to which the MAC is being added to + * @param vni + * the vni + * @param dstMacAddress + * The mac address to be programmed + * @param displayName + * the display name * @return the flow */ - public static Flow buildDmacFlowForExternalRemoteMac(BigInteger dpId, String extDeviceNodeId, long elanTag, - Long vni, String dstMacAddress, String displayName ) { - List mkMatches = buildMatchesForElanTagShFlagAndDstMac(elanTag, /*shFlag*/ false, dstMacAddress); - List mkInstructions = new ArrayList(); + public Flow buildDmacFlowForExternalRemoteMac(BigInteger dpId, String extDeviceNodeId, long elanTag, + Long vni, String dstMacAddress, String displayName) { + List mkMatches = buildMatchesForElanTagShFlagAndDstMac(elanTag, /* shFlag */ false, dstMacAddress); + List mkInstructions = new ArrayList<>(); try { - List actions = getExternalItmEgressAction(dpId, new NodeId(extDeviceNodeId), vni); - mkInstructions.add( MDSALUtil.buildApplyActionsInstruction(actions) ); + List actions = getExternalTunnelItmEgressAction(dpId, new NodeId(extDeviceNodeId), vni); + mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); } catch (Exception e) { - logger.error("Could not get Egress Actions for DpId={} externalNode={}", dpId, extDeviceNodeId ); + LOG.error("Could not get Egress Actions for DpId={} externalNode={}", dpId, extDeviceNodeId); } - Flow flow = MDSALUtil.buildFlowNew(ElanConstants.ELAN_DMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, dpId, extDeviceNodeId, dstMacAddress, elanTag, - false), - 20, /* prio */ - displayName, 0, /* idleTimeout */ - 0, /* hardTimeout */ - ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); + Flow flow = MDSALUtil.buildFlowNew(NwConstants.ELAN_DMAC_TABLE, + getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, dpId, extDeviceNodeId, dstMacAddress, elanTag, + false), + 20, /* prio */ + displayName, 0, /* idleTimeout */ + 0, /* hardTimeout */ + ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); return flow; } /** - * Builds the flow that drops the packet if it came through an external tunnel, that is, if the Split-Horizon - * flag is set. + * Builds the flow that drops the packet if it came through an external + * tunnel, that is, if the Split-Horizon flag is set. * - * @param dpnId DPN whose DMAC table is going to be modified - * @param extDeviceNodeId Hwvtep node where the mac is attached to - * @param elanTag ElanId to which the MAC is being added to - * @param dstMacAddress The mac address to be programmed - * @param displayName - * @return + * @param dpnId + * DPN whose DMAC table is going to be modified + * @param extDeviceNodeId + * Hwvtep node where the mac is attached to + * @param elanTag + * ElanId to which the MAC is being added to + * @param dstMacAddress + * The mac address to be programmed */ private static Flow buildDmacFlowDropIfPacketComingFromTunnel(BigInteger dpnId, String extDeviceNodeId, - Long elanTag, String dstMacAddress) { - List mkMatches = buildMatchesForElanTagShFlagAndDstMac(elanTag, /*shFlag*/ true, dstMacAddress); + Long elanTag, String dstMacAddress) { + List mkMatches = buildMatchesForElanTagShFlagAndDstMac(elanTag, /* shFlag */ true, dstMacAddress); List mkInstructions = MDSALUtil.buildInstructionsDrop(); - String flowId = getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, dpnId, extDeviceNodeId, dstMacAddress, - elanTag, true); - Flow flow = MDSALUtil.buildFlowNew(ElanConstants.ELAN_DMAC_TABLE, flowId, 20, /* prio */ - "Drop", 0, /* idleTimeout */ - 0, /* hardTimeout */ - ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); + String flowId = getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, dpnId, extDeviceNodeId, dstMacAddress, + elanTag, true); + Flow flow = MDSALUtil.buildFlowNew(NwConstants.ELAN_DMAC_TABLE, flowId, 20, /* prio */ + "Drop", 0, /* idleTimeout */ + 0, /* hardTimeout */ + ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); return flow; } private static String getDmacDropFlowId(Long elanTag, String dstMacAddress) { - return new StringBuilder(ElanConstants.ELAN_DMAC_TABLE).append(elanTag).append(dstMacAddress).append("Drop") - .toString(); + return new StringBuilder(NwConstants.ELAN_DMAC_TABLE).append(elanTag).append(dstMacAddress).append("Drop") + .toString(); } /** - * Builds a Flow to be programmed in a remote DPN's DMAC table. This method must be used when the MAC is located - * in another CSS. + * Builds a Flow to be programmed in a remote DPN's DMAC table. This method + * must be used when the MAC is located in another CSS. * - * This flow consists in: - * Match: - * + elanTag in packet's metadata - * + packet going to a MAC known to be located in another DPN - * Actions: - * + set_tunnel_id(lportTag) - * + output on ITM internal tunnel interface with the other DPN + *

This flow consists in: Match: + elanTag in packet's metadata + packet + * going to a MAC known to be located in another DPN Actions: + + * set_tunnel_id(lportTag) + output on ITM internal tunnel interface with + * the other DPN * - * @param localDpId the local dp id - * @param remoteDpId the remote dp id - * @param lportTag the lport tag - * @param elanTag the elan tag - * @param macAddress the mac address - * @param displayName the display name + * @param localDpId + * the local dp id + * @param remoteDpId + * the remote dp id + * @param lportTag + * the lport tag + * @param elanTag + * the elan tag + * @param macAddress + * the mac address + * @param displayName + * the display name * @return the flow */ - public static Flow buildDmacFlowForInternalRemoteMac(BigInteger localDpId, BigInteger remoteDpId, long lportTag, - long elanTag, String macAddress, String displayName) { - List mkMatches = buildMatchesForElanTagShFlagAndDstMac(elanTag, /*shFlag*/ false, macAddress); + public Flow buildDmacFlowForInternalRemoteMac(BigInteger localDpId, BigInteger remoteDpId, long lportTag, + long elanTag, String macAddress, String displayName) { + List mkMatches = buildMatchesForElanTagShFlagAndDstMac(elanTag, /* shFlag */ false, macAddress); - List mkInstructions = new ArrayList(); + List mkInstructions = new ArrayList<>(); try { - //List of Action for the provided Source and Destination DPIDs - List actions = getInternalItmEgressAction(localDpId, remoteDpId, lportTag); - mkInstructions.add( MDSALUtil.buildApplyActionsInstruction(actions) ); + // List of Action for the provided Source and Destination DPIDs + List actions = getInternalTunnelItmEgressAction(localDpId, remoteDpId, lportTag); + mkInstructions.add(MDSALUtil.buildApplyActionsInstruction(actions)); } catch (Exception e) { - logger.error("Could not get Egress Actions for localDpId={} remoteDpId={} lportTag={}", - localDpId, remoteDpId, lportTag); + LOG.error("Could not get Egress Actions for localDpId={} remoteDpId={} lportTag={}", localDpId, + remoteDpId, lportTag); } - Flow flow = MDSALUtil.buildFlowNew(ElanConstants.ELAN_DMAC_TABLE, - getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, localDpId, remoteDpId, macAddress, elanTag), - 20, /* prio */ - displayName, 0, /* idleTimeout */ - 0, /* hardTimeout */ - ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); + Flow flow = MDSALUtil.buildFlowNew(NwConstants.ELAN_DMAC_TABLE, + getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, localDpId, remoteDpId, macAddress, elanTag), + 20, /* prio */ + displayName, 0, /* idleTimeout */ + 0, /* hardTimeout */ + ElanConstants.COOKIE_ELAN_KNOWN_DMAC.add(BigInteger.valueOf(elanTag)), mkMatches, mkInstructions); return flow; @@ -1480,14 +1849,17 @@ public class ElanUtils { * the elan instance name * @param addOrRemove * Indicates if flows must be installed or removed. + * @param interfaceName + * the interface name * @see org.opendaylight.genius.mdsalutil.MDSALUtil.MdsalOp */ - public static void setupDmacFlowsToExternalRemoteMac(BigInteger dpId, String extNodeId, Long elanTag, Long vni, - String macAddress, String elanInstanceName, MdsalOp addOrRemove) { - if ( addOrRemove == MdsalOp.CREATION_OP ) { - ElanUtils.installDmacFlowsToExternalRemoteMac(dpId, extNodeId, elanTag, vni, macAddress, elanInstanceName); - } else if ( addOrRemove == MdsalOp.REMOVAL_OP ) { - ElanUtils.deleteDmacFlowsToExternalMac(elanTag, dpId, extNodeId, macAddress ); + public void setupDmacFlowsToExternalRemoteMac(BigInteger dpId, String extNodeId, Long elanTag, Long vni, + String macAddress, String elanInstanceName, MdsalOp addOrRemove, String interfaceName) { + if (addOrRemove == MdsalOp.CREATION_OP) { + installDmacFlowsToExternalRemoteMac(dpId, extNodeId, elanTag, vni, macAddress, elanInstanceName, + interfaceName); + } else if (addOrRemove == MdsalOp.REMOVAL_OP) { + deleteDmacFlowsToExternalMac(elanTag, dpId, extNodeId, macAddress); } } @@ -1504,27 +1876,47 @@ public class ElanUtils { * the mac to remove * @return dmac flow */ - public static List> deleteDmacFlowsToExternalMac(long elanTag, BigInteger dpId, - String extDeviceNodeId, String macToRemove ) { + public List> deleteDmacFlowsToExternalMac(long elanTag, BigInteger dpId, + String extDeviceNodeId, String macToRemove) { List> futures = new ArrayList<>(); synchronized (macToRemove) { // Removing the flows that sends the packet on an external tunnel - String flowId = getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, dpId, extDeviceNodeId, - macToRemove, elanTag, false); - Flow flowToRemove = new FlowBuilder().setId(new FlowId(flowId)).setTableId(ElanConstants.ELAN_DMAC_TABLE) - .build(); - futures.add(elanServiceProvider.getMdsalManager().removeFlow(dpId, flowToRemove)); + removeFlowThatSendsThePacketOnAnExternalTunnel(elanTag, dpId, extDeviceNodeId, macToRemove, futures); // And now removing the drop flow - flowId = getKnownDynamicmacFlowRef(ElanConstants.ELAN_DMAC_TABLE, dpId, extDeviceNodeId, macToRemove, - elanTag, true); - flowToRemove = new FlowBuilder().setId(new FlowId(flowId)).setTableId(ElanConstants.ELAN_DMAC_TABLE) - .build(); - futures.add(elanServiceProvider.getMdsalManager().removeFlow(dpId, flowToRemove)); + removeTheDropFlow(elanTag, dpId, extDeviceNodeId, macToRemove, futures); + + deleteEtreeDmacFlowsToExternalMac(elanTag, dpId, extDeviceNodeId, macToRemove, futures); } return futures; } + private void deleteEtreeDmacFlowsToExternalMac(long elanTag, BigInteger dpId, String extDeviceNodeId, + String macToRemove, List> futures) { + EtreeLeafTagName etreeLeafTag = getEtreeLeafTagByElanTag(elanTag); + if (etreeLeafTag != null) { + removeFlowThatSendsThePacketOnAnExternalTunnel(etreeLeafTag.getEtreeLeafTag().getValue(), dpId, + extDeviceNodeId, macToRemove, futures); + removeTheDropFlow(etreeLeafTag.getEtreeLeafTag().getValue(), dpId, extDeviceNodeId, macToRemove, futures); + } + } + + private void removeTheDropFlow(long elanTag, BigInteger dpId, String extDeviceNodeId, String macToRemove, + List> futures) { + String flowId = getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, dpId, extDeviceNodeId, macToRemove, + elanTag, true); + Flow flowToRemove = new FlowBuilder().setId(new FlowId(flowId)).setTableId(NwConstants.ELAN_DMAC_TABLE).build(); + futures.add(mdsalManager.removeFlow(dpId, flowToRemove)); + } + + private void removeFlowThatSendsThePacketOnAnExternalTunnel(long elanTag, BigInteger dpId, + String extDeviceNodeId, String macToRemove, List> futures) { + String flowId = getKnownDynamicmacFlowRef(NwConstants.ELAN_DMAC_TABLE, dpId, extDeviceNodeId, macToRemove, + elanTag, false); + Flow flowToRemove = new FlowBuilder().setId(new FlowId(flowId)).setTableId(NwConstants.ELAN_DMAC_TABLE).build(); + futures.add(mdsalManager.removeFlow(dpId, flowToRemove)); + } + /** * Gets the dpid from interface. * @@ -1532,17 +1924,17 @@ public class ElanUtils { * the interface name * @return the dpid from interface */ - public static BigInteger getDpidFromInterface(String interfaceName) { + public BigInteger getDpidFromInterface(String interfaceName) { BigInteger dpId = null; - Future> output = elanServiceProvider.getInterfaceManagerRpcService() - .getDpidFromInterface(new GetDpidFromInterfaceInputBuilder().setIntfName(interfaceName).build()); + Future> output = interfaceManagerRpcService + .getDpidFromInterface(new GetDpidFromInterfaceInputBuilder().setIntfName(interfaceName).build()); try { RpcResult rpcResult = output.get(); if (rpcResult.isSuccessful()) { dpId = rpcResult.getResult().getDpid(); } } catch (NullPointerException | InterruptedException | ExecutionException e) { - logger.error("Failed to get the DPN ID: {} for interface {}: {} ", dpId, interfaceName, e); + LOG.error("Failed to get the DPN ID: {} for interface {}: {} ", dpId, interfaceName, e); } return dpId; } @@ -1564,7 +1956,7 @@ public class ElanUtils { if (ifState == null) { return false; } - return ((ifState.getOperStatus() == OperStatus.Up) && (ifState.getAdminStatus() == AdminStatus.Up)); + return ifState.getOperStatus() == OperStatus.Up && ifState.getAdminStatus() == AdminStatus.Up; } /** @@ -1576,18 +1968,44 @@ public class ElanUtils { * the data broker * @return the interface state from oper ds */ - public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface getInterfaceStateFromOperDS( - String interfaceName, DataBroker dataBroker) { - InstanceIdentifier ifStateId = createInterfaceStateInstanceIdentifier( - interfaceName); - Optional ifStateOptional = MDSALUtil - .read(dataBroker, LogicalDatastoreType.OPERATIONAL, ifStateId); + public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang + .ietf.interfaces.rev140508.interfaces.state.Interface getInterfaceStateFromOperDS( + String interfaceName, DataBroker dataBroker) { + InstanceIdentifier ifStateId = createInterfaceStateInstanceIdentifier( + interfaceName); + Optional ifStateOptional = MDSALUtil + .read(dataBroker, LogicalDatastoreType.OPERATIONAL, ifStateId); if (ifStateOptional.isPresent()) { return ifStateOptional.get(); } return null; } + /** + * Gets the interface from config ds. + * + * @param interfaceName + * the interface name + * @param dataBroker + * the data broker + * @return the interface from config ds + */ + public static org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang + .ietf.interfaces.rev140508.interfaces.Interface getInterfaceFromConfigDS( + String interfaceName, DataBroker dataBroker) { + InstanceIdentifier ifaceId = createInterfaceInstanceIdentifier(interfaceName); + Optional iface = MDSALUtil + .read(dataBroker, LogicalDatastoreType.CONFIGURATION, ifaceId); + if (iface.isPresent()) { + return iface.get(); + } + return null; + } + /** * Creates the interface state instance identifier. * @@ -1595,23 +2013,50 @@ public class ElanUtils { * the interface name * @return the instance identifier */ - public static InstanceIdentifier createInterfaceStateInstanceIdentifier( - String interfaceName) { - InstanceIdentifierBuilder 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)); + public static InstanceIdentifier createInterfaceStateInstanceIdentifier( + String interfaceName) { + InstanceIdentifierBuilder 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)); + return idBuilder.build(); + } + + /** + * Creates the interface instance identifier. + * + * @param interfaceName + * the interface name + * @return the instance identifier + */ + public static InstanceIdentifier createInterfaceInstanceIdentifier( + String interfaceName) { + InstanceIdentifierBuilder idBuilder = InstanceIdentifier + .builder(Interfaces.class) + .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang + .ietf.interfaces.rev140508.interfaces.Interface.class, + new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang + .ietf.interfaces.rev140508.interfaces.InterfaceKey( + interfaceName)); return idBuilder.build(); } - public static void waitForTransactionToComplete(WriteTransaction tx) { + public static CheckedFuture waitForTransactionToComplete( + WriteTransaction tx) { CheckedFuture futures = tx.submit(); try { futures.get(); } catch (InterruptedException | ExecutionException e) { - logger.error("Error writing to datastore {}", e); + LOG.error("Error writing to datastore {}", e); } + return futures; } public static boolean isVxlan(ElanInstance elanInstance) { @@ -1619,5 +2064,74 @@ public class ElanUtils { && elanInstance.getSegmentType().isAssignableFrom(SegmentTypeVxlan.class) && elanInstance.getSegmentationId() != null && elanInstance.getSegmentationId().longValue() != 0; } -} + public static boolean isVlan(ElanInstance elanInstance) { + return elanInstance != null && elanInstance.getSegmentType() != null + && elanInstance.getSegmentType().isAssignableFrom(SegmentTypeVlan.class) + && elanInstance.getSegmentationId() != null && elanInstance.getSegmentationId().longValue() != 0; + } + + public static boolean isFlat(ElanInstance elanInstance) { + return elanInstance != null && elanInstance.getSegmentType() != null + && elanInstance.getSegmentType().isAssignableFrom(SegmentTypeFlat.class); + } + + public boolean isExternal(String interfaceName) { + return isExternal(getInterfaceFromConfigDS(interfaceName, broker)); + } + + public static boolean isExternal( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang + .ietf.interfaces.rev140508.interfaces.Interface iface) { + if (iface == null) { + return false; + } + + IfExternal ifExternal = iface.getAugmentation(IfExternal.class); + return ifExternal != null && Boolean.TRUE.equals(ifExternal.isExternal()); + } + + public static boolean isEtreeRootInterfaceByInterfaceName(DataBroker broker, String interfaceName) { + EtreeInterface etreeInterface = getEtreeInterfaceByElanInterfaceName(broker, interfaceName); + if (etreeInterface != null && etreeInterface.getEtreeInterfaceType() == EtreeInterfaceType.Root) { + return true; + } + return false; + } + + /** + * Add Mac Address to ElanInterfaceForwardingEntries and ElanForwardingTables + * Install SMAC and DMAC flows + */ + public void addMacEntryToDsAndSetupFlows(IInterfaceManager interfaceManager, String interfaceName, String macAddress, String elanName, WriteTransaction tx, WriteTransaction flowWritetx, int macTimeOut) { + LOG.trace("Adding mac address {} and interface name {} to ElanInterfaceForwardingEntries and ElanForwardingTables DS", macAddress, interfaceName); + BigInteger timeStamp = new BigInteger(String.valueOf((long)System.currentTimeMillis())); + PhysAddress physAddress = new PhysAddress(macAddress); + MacEntry macEntry = new MacEntryBuilder().setInterface(interfaceName).setMacAddress(physAddress).setKey(new MacEntryKey(physAddress)).setControllerLearnedForwardingEntryTimestamp(timeStamp).setIsStaticAddress(false).build(); + InstanceIdentifier macEntryId = ElanUtils.getInterfaceMacEntriesIdentifierOperationalDataPath(interfaceName, physAddress); + tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, macEntry); + InstanceIdentifier elanMacEntryId = ElanUtils.getMacEntryOperationalDataPath(elanName, physAddress); + tx.put(LogicalDatastoreType.OPERATIONAL, elanMacEntryId, macEntry); + ElanInstance elanInstance = ElanUtils.getElanInstanceByName(broker, elanName); + setupMacFlows(elanInstance, interfaceManager.getInterfaceInfo(interfaceName), macTimeOut, macAddress, flowWritetx); + } + + /** + * Remove Mac Address from ElanInterfaceForwardingEntries and ElanForwardingTables + * Remove SMAC and DMAC flows + */ + public void deleteMacEntryFromDsAndRemoveFlows(IInterfaceManager interfaceManager, String interfaceName, String macAddress, String elanName, WriteTransaction tx, WriteTransaction deleteFlowTx) { + LOG.trace("Deleting mac address {} and interface name {} from ElanInterfaceForwardingEntries and ElanForwardingTables DS", macAddress, interfaceName); + PhysAddress physAddress = new PhysAddress(macAddress); + MacEntry macEntry = getInterfaceMacEntriesOperationalDataPath(interfaceName, physAddress); + InterfaceInfo interfaceInfo = interfaceManager.getInterfaceInfo(interfaceName); + if(macEntry != null && interfaceInfo != null) { + deleteMacFlows(ElanUtils.getElanInstanceByName(broker, elanName), interfaceInfo, macEntry, deleteFlowTx); + } + InstanceIdentifier macEntryIdForElanInterface = ElanUtils.getInterfaceMacEntriesIdentifierOperationalDataPath(interfaceName, physAddress); + InstanceIdentifier macEntryIdForElanInstance = ElanUtils.getMacEntryOperationalDataPath(elanName, physAddress); + tx.delete(LogicalDatastoreType.OPERATIONAL, macEntryIdForElanInterface); + tx.delete(LogicalDatastoreType.OPERATIONAL, macEntryIdForElanInstance); + } + +}