X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=fibmanager%2Ffibmanager-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Ffibmanager%2FFibManager.java;h=e38c84deeec6a11e59bab4d32b18506aa5dfc933;hb=f488b0d2307f0a46e5ad3cd138351309606e1d00;hp=70a6d209ee2551cafafeb67a0b76b5655598f7b7;hpb=45e1b2b244147a0d46ac281317108fd465cf2eff;p=vpnservice.git diff --git a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java index 70a6d209..e38c84de 100644 --- a/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java +++ b/fibmanager/fibmanager-impl/src/main/java/org/opendaylight/vpnservice/fibmanager/FibManager.java @@ -7,15 +7,26 @@ */ package org.opendaylight.vpnservice.fibmanager; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import java.math.BigInteger; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; +import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import com.google.common.util.concurrent.FutureCallback; - +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.vpnmanager.api.IVpnManager; import org.opendaylight.vpnservice.AbstractDataChangeListener; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; import org.opendaylight.vpnservice.mdsalutil.ActionInfo; import org.opendaylight.vpnservice.mdsalutil.ActionType; import org.opendaylight.vpnservice.mdsalutil.FlowEntity; @@ -30,35 +41,22 @@ import org.opendaylight.vpnservice.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.VpnInstances; import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.instances.VpnInstance; import org.opendaylight.yang.gen.v1.urn.opendaylight.l3vpn.rev130911.VpnInstance1; +import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.FibEntries; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.fibentries.VrfTables; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.fibentries.VrfTablesKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.vrfentries.VrfEntry; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.l3nexthop.rev150409.GetEgressPointerInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.l3nexthop.rev150409.GetEgressPointerOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.l3nexthop.rev150409.L3nexthopService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.l3nexthop.rev150409.RemoveLocalNextHopInputBuilder; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder; -import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; -import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.FibEntries; import org.opendaylight.yangtools.yang.binding.RpcService; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - -import java.math.BigInteger; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; public class FibManager extends AbstractDataChangeListener implements AutoCloseable{ private static final Logger LOG = LoggerFactory.getLogger(FibManager.class); @@ -69,8 +67,8 @@ public class FibManager extends AbstractDataChangeListener implements private IMdsalApiManager mdsalManager; private IVpnManager vpnmanager; - private static final short L3_FIB_TABLE = 20; - private static final short L3_LFIB_TABLE = 21; + private static final short L3_FIB_TABLE = 21; + private static final short L3_LFIB_TABLE = 20; private static final BigInteger COOKIE_VM_LFIB_TABLE = new BigInteger("8000002", 16); private static final BigInteger COOKIE_VM_FIB_TABLE = new BigInteger("8000003", 16); private static final int DEFAULT_FIB_FLOW_PRIORITY = 10; @@ -118,7 +116,7 @@ public class FibManager extends AbstractDataChangeListener implements private void registerListener(final DataBroker db) { try { - listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, + listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, getWildCardPath(), FibManager.this, DataChangeScope.SUBTREE); } catch (final Exception e) { LOG.error("FibManager DataChange listener registration fail!", e); @@ -178,13 +176,13 @@ public class FibManager extends AbstractDataChangeListener implements Long vpnId = getVpnId(vrfTableKey.getRouteDistinguisher()); Preconditions.checkNotNull(vpnId, "Vpn Instance not available!"); - Collection dpns = vpnmanager.getDpnsForVpn(vpnId); - for (Long dpId : dpns) { + Collection dpns = vpnmanager.getDpnsForVpn(vpnId); + for (BigInteger dpId : dpns) { addRouteInternal(dpId, vpnId, vrfTableKey, vrfEntry); } } - private void addRouteInternal(final long dpId, final long vpnId, final VrfTablesKey vrfTableKey, + private void addRouteInternal(final BigInteger dpId, final long vpnId, final VrfTablesKey vrfTableKey, final VrfEntry vrfEntry) { String rd = vrfTableKey.getRouteDistinguisher(); LOG.debug("adding route " + vrfEntry.getDestPrefix() + " " + rd); @@ -222,13 +220,13 @@ public class FibManager extends AbstractDataChangeListener implements Long vpnId = getVpnId(vrfTableKey.getRouteDistinguisher()); Preconditions.checkNotNull(vpnId, "Vpn Instance not available!"); - Collection dpns = vpnmanager.getDpnsForVpn(vpnId); - for (Long dpId : dpns) { + Collection dpns = vpnmanager.getDpnsForVpn(vpnId); + for (BigInteger dpId : dpns) { deleteRoute(dpId, vpnId, vrfTableKey, vrfEntry); } } - public void deleteRoute(final long dpId, final long vpnId, final VrfTablesKey vrfTableKey, + public void deleteRoute(final BigInteger dpId, final long vpnId, final VrfTablesKey vrfTableKey, final VrfEntry vrfEntry) { LOG.debug("deleting route "+ vrfEntry.getDestPrefix() + " "+vpnId); String rd = vrfTableKey.getRouteDistinguisher(); @@ -251,6 +249,7 @@ public class FibManager extends AbstractDataChangeListener implements if (isLocalRoute) { makeLFibTableEntry(dpId, vrfEntry.getLabel(), groupId, vrfEntry.getNextHopAddress(), NwConstants.DEL_FLOW); + deleteLocalAdjacency(dpId, vpnId, vrfEntry); } LOG.debug("Successfully delete fib entry for "+ vrfEntry.getDestPrefix() + " vpnId "+vpnId); @@ -261,7 +260,7 @@ public class FibManager extends AbstractDataChangeListener implements + ((rawIpAddress[2] & 0xFF) << (1 * 8)) + (rawIpAddress[3] & 0xFF)) & 0xffffffffL; } - private void makeConnectedRoute(long dpId, long vpnId, VrfEntry vrfEntry, String rd, + private void makeConnectedRoute(BigInteger dpId, long vpnId, VrfEntry vrfEntry, String rd, long groupId, int addOrRemove) { LOG.trace("makeConnectedRoute: vrfEntry {}",vrfEntry); String values[] = vrfEntry.getDestPrefix().split("/"); @@ -272,7 +271,7 @@ public class FibManager extends AbstractDataChangeListener implements try { destPrefix = InetAddress.getByName(ipAddress); } catch (UnknownHostException e) { - LOG.error("UnknowHostException in addRoute. Failed to add Route for ipPrefix {}", vrfEntry.getDestPrefix()); + LOG.error("UnknowHostException in addRoute. Failed to add Route for ipPrefix {}", vrfEntry.getDestPrefix()); return; } @@ -293,9 +292,9 @@ public class FibManager extends AbstractDataChangeListener implements List actionsInfos = new ArrayList(); if(addOrRemove == NwConstants.ADD_FLOW) { - actionsInfos.add(new ActionInfo(ActionType.group, new String[] { String.valueOf(groupId)})); actionsInfos.add(new ActionInfo(ActionType.push_mpls, new String[] { null })); actionsInfos.add(new ActionInfo(ActionType.set_field_mpls_label, new String[] { Long.toString(vrfEntry.getLabel())})); + actionsInfos.add(new ActionInfo(ActionType.group, new String[] { String.valueOf(groupId)})); instructions.add(new InstructionInfo(InstructionType.write_actions, actionsInfos)); } @@ -315,7 +314,7 @@ public class FibManager extends AbstractDataChangeListener implements } } - private void makeLFibTableEntry(long dpId, long label, long groupId, + private void makeLFibTableEntry(BigInteger dpId, long label, long groupId, String nextHop, int addOrRemove) { List matches = new ArrayList(); matches.add(new MatchInfo(MatchFieldType.eth_type, @@ -343,21 +342,70 @@ public class FibManager extends AbstractDataChangeListener implements LOG.debug("LFIB Entry for dpID {} : label : {} group {} modified successfully {}",dpId, label, groupId ); } - private String getFlowRef(long dpnId, short tableId, long label, String nextHop) { + private void deleteLocalAdjacency(final BigInteger dpId, final long vpnId, final VrfEntry vrfEntry) { + LOG.trace("deleteLocalAdjacency called with dpid {}, vpnId{}, VrfEntry {}",dpId, vpnId, vrfEntry);; + try { + Future> result = + l3nexthopService.removeLocalNextHop(new RemoveLocalNextHopInputBuilder().setDpnId(dpId) + .setIpPrefix(vrfEntry.getDestPrefix()) + .setNexthopIp(vrfEntry.getNextHopAddress()) + .setVpnId(vpnId) + .build()); + RpcResult rpcResult = result.get(); + if (rpcResult.isSuccessful()) { + LOG.debug("Local Next hop for {} on dpn {} successfully deleted", vrfEntry.getDestPrefix(), dpId); + } else { + LOG.error("Local Next hop for {} on dpn {} not deleted", vrfEntry.getDestPrefix(), dpId); + } + } catch (NullPointerException | InterruptedException | ExecutionException e) { + LOG.trace("", e); + } + } + + public void populateFibOnNewDpn(BigInteger dpnId, long vpnId, String rd) { + LOG.trace("New dpn {} for vpn {} : populateFibOnNewDpn", dpnId, rd); + InstanceIdentifier id = buildVrfId(rd); + Optional vrfTable = read(LogicalDatastoreType.OPERATIONAL, id); + if(vrfTable.isPresent()) { + for(VrfEntry vrfEntry : vrfTable.get().getVrfEntry()) { + addRouteInternal(dpnId, vpnId, vrfTable.get().getKey(), vrfEntry); + } + } + } + + public void cleanUpDpnForVpn(BigInteger dpnId, long vpnId, String rd) { + LOG.trace("Remove dpn {} for vpn {} : cleanUpDpnForVpn", dpnId, rd); + InstanceIdentifier id = buildVrfId(rd); + Optional vrfTable = read(LogicalDatastoreType.OPERATIONAL, id); + if(vrfTable.isPresent()) { + for(VrfEntry vrfEntry : vrfTable.get().getVrfEntry()) { + deleteRoute(dpnId, vpnId, vrfTable.get().getKey(), vrfEntry); + } + } + } + + public static InstanceIdentifier buildVrfId(String rd) { + InstanceIdentifierBuilder idBuilder = + InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)); + InstanceIdentifier id = idBuilder.build(); + return id; + } + + private String getFlowRef(BigInteger dpnId, short tableId, long label, String nextHop) { return new StringBuilder(64).append(FLOWID_PREFIX).append(dpnId).append(NwConstants.FLOWID_SEPARATOR) .append(tableId).append(NwConstants.FLOWID_SEPARATOR) .append(label).append(NwConstants.FLOWID_SEPARATOR) .append(nextHop).toString(); } - private String getFlowRef(long dpnId, short tableId, String rd, InetAddress destPrefix) { + private String getFlowRef(BigInteger dpnId, short tableId, String rd, InetAddress destPrefix) { return new StringBuilder(64).append(FLOWID_PREFIX).append(dpnId).append(NwConstants.FLOWID_SEPARATOR) .append(tableId).append(NwConstants.FLOWID_SEPARATOR) .append(rd).append(NwConstants.FLOWID_SEPARATOR) .append(destPrefix.getHostAddress()).toString(); } - private GetEgressPointerOutput resolveAdjacency(final long dpId, final long vpnId, + protected GetEgressPointerOutput resolveAdjacency(final BigInteger dpId, final long vpnId, final VrfEntry vrfEntry) { GetEgressPointerOutput adjacency = null; LOG.trace("resolveAdjacency called with dpid {}, vpnId{}, VrfEntry {}",dpId, vpnId, vrfEntry);; @@ -380,7 +428,7 @@ public class FibManager extends AbstractDataChangeListener implements return adjacency; } - private Long getVpnId(String rd) { + protected Long getVpnId(String rd) { Long vpnId = null; InstanceIdentifier id = InstanceIdentifier.create(VpnInstances.class); Optional vpnInstances = read(LogicalDatastoreType.OPERATIONAL, id); @@ -399,12 +447,12 @@ public class FibManager extends AbstractDataChangeListener implements return vpnId; } - public void processNodeAdd(long dpnId) { + public void processNodeAdd(BigInteger dpnId) { LOG.debug("Received notification to install TableMiss entries for dpn {} ", dpnId); makeTableMissFlow(dpnId, NwConstants.ADD_FLOW); } - private void makeTableMissFlow(long dpnId, int addOrRemove) { + private void makeTableMissFlow(BigInteger dpnId, int addOrRemove) { final BigInteger COOKIE_TABLE_MISS = new BigInteger("1030000", 16); // Instruction to punt to controller List instructions = new ArrayList(); @@ -431,7 +479,7 @@ public class FibManager extends AbstractDataChangeListener implements } } - private String getFlowRef(long dpnId, short tableId, int tableMiss) { + private String getFlowRef(BigInteger dpnId, short tableId, int tableMiss) { return new StringBuffer().append(FLOWID_PREFIX).append(dpnId).append(NwConstants.FLOWID_SEPARATOR) .append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(tableMiss) .append(FLOWID_PREFIX).toString();