홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Shashikanth VH
Committed by Gerrit Code Review
3fe3798e 1 parent 7ba6b4c1

[ONOS-2606] Bgp local RIB implementation. 

Change-Id: I39eadec95fa1e1328c73efabb2a50bb438075809
Expand all
Inline Side-by-side
Showing 7 changed files with 152 additions and 8 deletions
......@@ -95,6 +95,20 @@ public interface BgpController {
int connectedPeerCount();
/**
* Return BGP local RIB instance with VPN.
*
* @return BGPLocalRibImpl local RIB with VPN
*/
BgpLocalRib bgpLocalRibVpn();
/**
* Return BGP local RIB instance.
*
* @return BGPLocalRibImpl local RIB
*/
BgpLocalRib bgpLocalRib();
/**
* Return BGP peer manager.
*
* @return BGPPeerManager peer manager instance
......
......@@ -440,7 +440,9 @@ class BgpChannelHandler extends IdleStateAwareChannelHandler {
// which we obviously don't want.
log.debug("{}:removal called", getPeerInfoString());
if (bgpPeer != null) {
BgpPeerImpl peer = (BgpPeerImpl) bgpPeer;
peerManager.removeConnectedPeer(thisbgpId);
peer.updateLocalRIBOnPeerDisconnect();
}
// Retry connection if connection is lost to bgp speaker/peer
......
......@@ -21,8 +21,14 @@ import java.util.Set;
import java.util.TreeMap;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.IpAddress;
import org.onosproject.bgp.controller.BgpCfg;
import org.onosproject.bgp.controller.BgpConnectPeer;
import org.onosproject.bgp.controller.BgpController;
import org.onosproject.bgp.controller.BgpId;
import org.onosproject.bgp.controller.BgpPeer;
import org.onosproject.bgp.controller.BgpPeerCfg;
import org.onosproject.bgp.controller.impl.BgpControllerImpl.BgpPeerManagerImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -48,12 +54,16 @@ public class BgpConfig implements BgpCfg {
private Ip4Address routerId = null;
private TreeMap<String, BgpPeerCfg> bgpPeerTree = new TreeMap<>();
private BgpConnectPeer connectPeer;
private BgpPeerManagerImpl peerManager;
private BgpController bgpController;
/**
/*
* Constructor to initialize the values.
*/
public BgpConfig() {
public BgpConfig(BgpController bgpController) {
this.bgpController = bgpController;
this.peerManager = (BgpPeerManagerImpl) bgpController.peerManager();
this.holdTime = DEFAULT_HOLD_TIMER;
this.maxConnRetryTime = DEFAULT_CONN_RETRY_TIME;
this.maxConnRetryCount = DEFAULT_CONN_RETRY_COUNT;
......@@ -172,7 +182,12 @@ public class BgpConfig implements BgpCfg {
if (lspeer != null) {
lspeer.setSelfInnitConnection(true);
// TODO: initiate peer connection
if (lspeer.connectPeer() == null) {
connectPeer = new BgpConnectPeerImpl(bgpController, routerid, Controller.getBgpPortNum());
lspeer.setConnectPeer(connectPeer);
connectPeer.connectPeer();
}
return true;
}
......@@ -185,7 +200,6 @@ public class BgpConfig implements BgpCfg {
if (lspeer != null) {
//TODO DISCONNECT PEER
disconnectPeer(routerid);
lspeer.setSelfInnitConnection(false);
lspeer = this.bgpPeerTree.remove(routerid);
......@@ -204,7 +218,12 @@ public class BgpConfig implements BgpCfg {
if (lspeer != null) {
//TODO DISCONNECT PEER
BgpPeer disconnPeer = peerManager.getPeer(BgpId.bgpId(IpAddress.valueOf(routerid)));
if (disconnPeer != null) {
// TODO: send notification peer deconfigured
disconnPeer.disconnectPeer();
}
lspeer.connectPeer().disconnectPeer();
lspeer.setState(BgpPeerCfg.State.IDLE);
lspeer.setSelfInnitConnection(false);
log.debug("Disconnected : " + routerid + " successfully");
......
......@@ -16,6 +16,8 @@
package org.onosproject.bgp.controller.impl;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
......@@ -29,11 +31,16 @@ import org.apache.felix.scr.annotations.Service;
import org.onosproject.bgp.controller.BgpCfg;
import org.onosproject.bgp.controller.BgpController;
import org.onosproject.bgp.controller.BgpId;
import org.onosproject.bgp.controller.BgpLocalRib;
import org.onosproject.bgp.controller.BgpPeer;
import org.onosproject.bgp.controller.BgpNodeListener;
import org.onosproject.bgp.controller.BgpPeerManager;
import org.onosproject.bgpio.exceptions.BgpParseException;
import org.onosproject.bgpio.protocol.BgpMessage;
import org.onosproject.bgpio.protocol.BgpUpdateMsg;
import org.onosproject.bgpio.types.BgpValueType;
import org.onosproject.bgpio.types.MpReachNlri;
import org.onosproject.bgpio.types.MpUnReachNlri;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -47,11 +54,14 @@ public class BgpControllerImpl implements BgpController {
protected BgpPeerManagerImpl peerManager = new BgpPeerManagerImpl();
private BgpLocalRib bgplocalRIB = new BgpLocalRibImpl(this);
private BgpLocalRib bgplocalRIBVpn = new BgpLocalRibImpl(this);
protected Set<BgpNodeListener> bgpNodeListener = new CopyOnWriteArraySet<>();
final Controller ctrl = new Controller(this);
private BgpConfig bgpconfig = new BgpConfig();
private BgpConfig bgpconfig = new BgpConfig(this);
@Activate
public void activate() {
......@@ -100,6 +110,8 @@ public class BgpControllerImpl implements BgpController {
@Override
public void processBGPPacket(BgpId bgpId, BgpMessage msg) throws BgpParseException {
BgpPeer peer = getPeer(bgpId);
switch (msg.getType()) {
case OPEN:
// TODO: Process Open message
......@@ -111,7 +123,23 @@ public class BgpControllerImpl implements BgpController {
// TODO: Process notificatoin message
break;
case UPDATE:
// TODO: Process update message
BgpUpdateMsg updateMsg = (BgpUpdateMsg) msg;
List<BgpValueType> pathAttr = updateMsg.bgpPathAttributes().pathAttributes();
if (pathAttr == null) {
log.debug("llPathAttr is null, cannot process update message");
break;
}
Iterator<BgpValueType> listIterator = pathAttr.iterator();
boolean isLinkstate = false;
while (listIterator.hasNext()) {
BgpValueType attr = listIterator.next();
if ((attr instanceof MpReachNlri) || (attr instanceof MpUnReachNlri)) {
isLinkstate = true;
}
}
if (isLinkstate) {
peer.buildAdjRibIn(pathAttr);
}
break;
default:
// TODO: Process other message
......@@ -215,4 +243,24 @@ public class BgpControllerImpl implements BgpController {
public int connectedPeerCount() {
return connectedPeers.size();
}
/**
* Gets the BGP local RIB.
*
* @return bgplocalRIB BGP local RIB.
*/
@Override
public BgpLocalRib bgpLocalRib() {
return bgplocalRIB;
}
/**
* Gets the BGP local RIB with VPN.
*
* @return bgplocalRIBVpn BGP VPN local RIB .
*/
@Override
public BgpLocalRib bgpLocalRibVpn() {
return bgplocalRIBVpn;
}
}
......
......@@ -28,6 +28,7 @@ import org.onlab.packet.IpAddress;
import org.onosproject.bgp.controller.BgpController;
import org.onosproject.bgp.controller.BgpPeer;
import org.onosproject.bgp.controller.BgpSessionInfo;
import org.onosproject.bgp.controller.BgpLocalRib;
import org.onosproject.bgpio.exceptions.BgpParseException;
import org.onosproject.bgpio.protocol.BgpFactories;
import org.onosproject.bgpio.protocol.BgpFactory;
......@@ -61,9 +62,28 @@ public class BgpPeerImpl implements BgpPeer {
protected boolean isHandShakeComplete = false;
private BgpSessionInfo sessionInfo;
private BgpPacketStatsImpl pktStats;
private BgpLocalRib bgplocalRIB;
private BgpLocalRib bgplocalRIBVpn;
private AdjRibIn adjRib;
private VpnAdjRibIn vpnAdjRib;
/**
* Return the adjacency RIB-IN.
*
* @return adjRib the adjacency RIB-IN
*/
public AdjRibIn adjacencyRib() {
return adjRib;
}
/**
* Return the adjacency RIB-IN with VPN.
*
* @return vpnAdjRib the adjacency RIB-IN with VPN
*/
public VpnAdjRibIn vpnAdjacencyRib() {
return vpnAdjRib;
}
@Override
public BgpSessionInfo sessionInfo() {
......@@ -81,6 +101,8 @@ public class BgpPeerImpl implements BgpPeer {
this.bgpController = bgpController;
this.sessionInfo = sessionInfo;
this.pktStats = pktStats;
this.bgplocalRIB = bgpController.bgpLocalRib();
this.bgplocalRIBVpn = bgpController.bgpLocalRibVpn();
this.adjRib = new AdjRibIn();
this.vpnAdjRib = new VpnAdjRibIn();
}
......@@ -119,22 +141,31 @@ public class BgpPeerImpl implements BgpPeer {
PathAttrNlriDetails details = setPathAttrDetails(nlriInfo, pathAttr);
if (!((BgpNodeLSNlriVer4) nlriInfo).isVpnPresent()) {
adjRib.add(nlriInfo, details);
bgplocalRIB.add(sessionInfo(), nlriInfo, details);
} else {
vpnAdjRib.addVpn(nlriInfo, details, ((BgpNodeLSNlriVer4) nlriInfo).getRouteDistinguisher());
bgplocalRIBVpn.add(sessionInfo(), nlriInfo, details,
((BgpNodeLSNlriVer4) nlriInfo).getRouteDistinguisher());
}
} else if (nlriInfo instanceof BgpLinkLsNlriVer4) {
PathAttrNlriDetails details = setPathAttrDetails(nlriInfo, pathAttr);
if (!((BgpLinkLsNlriVer4) nlriInfo).isVpnPresent()) {
adjRib.add(nlriInfo, details);
bgplocalRIB.add(sessionInfo(), nlriInfo, details);
} else {
vpnAdjRib.addVpn(nlriInfo, details, ((BgpLinkLsNlriVer4) nlriInfo).getRouteDistinguisher());
bgplocalRIBVpn.add(sessionInfo(), nlriInfo, details,
((BgpLinkLsNlriVer4) nlriInfo).getRouteDistinguisher());
}
} else if (nlriInfo instanceof BgpPrefixIPv4LSNlriVer4) {
PathAttrNlriDetails details = setPathAttrDetails(nlriInfo, pathAttr);
if (!((BgpPrefixIPv4LSNlriVer4) nlriInfo).isVpnPresent()) {
adjRib.add(nlriInfo, details);
bgplocalRIB.add(sessionInfo(), nlriInfo, details);
} else {
vpnAdjRib.addVpn(nlriInfo, details, ((BgpPrefixIPv4LSNlriVer4) nlriInfo).getRouteDistinguisher());
bgplocalRIBVpn.add(sessionInfo(), nlriInfo, details,
((BgpPrefixIPv4LSNlriVer4) nlriInfo).getRouteDistinguisher());
}
}
}
......@@ -170,20 +201,26 @@ public class BgpPeerImpl implements BgpPeer {
if (nlriInfo instanceof BgpNodeLSNlriVer4) {
if (!((BgpNodeLSNlriVer4) nlriInfo).isVpnPresent()) {
adjRib.remove(nlriInfo);
bgplocalRIB.delete(nlriInfo);
} else {
vpnAdjRib.removeVpn(nlriInfo, ((BgpNodeLSNlriVer4) nlriInfo).getRouteDistinguisher());
bgplocalRIBVpn.delete(nlriInfo, ((BgpNodeLSNlriVer4) nlriInfo).getRouteDistinguisher());
}
} else if (nlriInfo instanceof BgpLinkLsNlriVer4) {
if (!((BgpLinkLsNlriVer4) nlriInfo).isVpnPresent()) {
adjRib.remove(nlriInfo);
bgplocalRIB.delete(nlriInfo);
} else {
vpnAdjRib.removeVpn(nlriInfo, ((BgpLinkLsNlriVer4) nlriInfo).getRouteDistinguisher());
bgplocalRIBVpn.delete(nlriInfo, ((BgpLinkLsNlriVer4) nlriInfo).getRouteDistinguisher());
}
} else if (nlriInfo instanceof BgpPrefixIPv4LSNlriVer4) {
if (!((BgpPrefixIPv4LSNlriVer4) nlriInfo).isVpnPresent()) {
adjRib.remove(nlriInfo);
bgplocalRIB.delete(nlriInfo);
} else {
vpnAdjRib.removeVpn(nlriInfo, ((BgpPrefixIPv4LSNlriVer4) nlriInfo).getRouteDistinguisher());
bgplocalRIBVpn.delete(nlriInfo, ((BgpPrefixIPv4LSNlriVer4) nlriInfo).getRouteDistinguisher());
}
}
}
......@@ -207,6 +244,18 @@ public class BgpPeerImpl implements BgpPeer {
return vpnAdjRib;
}
/**
* Update localRIB on peer disconnect.
*
*/
public void updateLocalRIBOnPeerDisconnect() {
BgpLocalRibImpl localRib = (BgpLocalRibImpl) bgplocalRIB;
BgpLocalRibImpl localRibVpn = (BgpLocalRibImpl) bgplocalRIBVpn;
localRib.localRIBUpdate(adjacencyRib());
localRibVpn.localRIBUpdate(vpnAdjacencyRib());
}
// ************************
// Channel related
// ************************
......
......@@ -31,6 +31,7 @@ import org.onosproject.bgp.controller.BgpCfg;
import org.onosproject.bgp.controller.BgpController;
import org.onosproject.bgp.controller.BgpId;
import org.onosproject.bgp.controller.BgpPeer;
import org.onosproject.bgp.controller.BgpLocalRib;
import org.onosproject.bgp.controller.BgpNodeListener;
import org.onosproject.bgp.controller.BgpPeerManager;
import org.onosproject.bgpio.exceptions.BgpParseException;
......@@ -208,6 +209,17 @@ public class BgpTopologyProviderTest {
return 0;
}
@Override
public BgpLocalRib bgpLocalRibVpn() {
// TODO Auto-generated method stub
return null;
}
@Override
public BgpLocalRib bgpLocalRib() {
// TODO Auto-generated method stub
return null;
}
@Override
public BgpPeerManager peerManager() {
......