Bgp and Pcep maintaiability
Change-Id: I2c14cc29d4900ef2f0fbffd4761b0d78e282910f
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java
index 92236a4..1f6e5bc 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpChannelHandler.java
@@ -499,6 +499,7 @@
if (e.getCause() instanceof ReadTimeoutException) {
// device timeout
+ bgpController.closedSessionExceptionAdd(peerAddr, e.getCause().toString());
log.error("Disconnecting device {} due to read timeout", getPeerInfoString());
sendNotification(BgpErrorType.HOLD_TIMER_EXPIRED, (byte) 0, null);
state = ChannelState.IDLE;
@@ -506,9 +507,11 @@
ctx.getChannel().close();
return;
} else if (e.getCause() instanceof ClosedChannelException) {
+ bgpController.activeSessionExceptionAdd(peerAddr, e.getCause().toString());
log.debug("Channel for bgp {} already closed", getPeerInfoString());
} else if (e.getCause() instanceof IOException) {
log.error("Disconnecting peer {} due to IO Error: {}", getPeerInfoString(), e.getCause().getMessage());
+ bgpController.closedSessionExceptionAdd(peerAddr, e.getCause().toString());
if (log.isDebugEnabled()) {
// still print stack trace if debug is enabled
log.debug("StackTrace for previous Exception: ", e.getCause());
@@ -520,6 +523,7 @@
BgpParseException errMsg = (BgpParseException) e.getCause();
byte errorCode = errMsg.getErrorCode();
byte errorSubCode = errMsg.getErrorSubCode();
+ bgpController.activeSessionExceptionAdd(peerAddr, e.getCause().toString());
ChannelBuffer tempCb = errMsg.getData();
if (tempCb != null) {
int dataLength = tempCb.readableBytes();
@@ -529,9 +533,11 @@
sendNotification(errorCode, errorSubCode, data);
} else if (e.getCause() instanceof RejectedExecutionException) {
log.warn("Could not process message: queue full");
+ bgpController.activeSessionExceptionAdd(peerAddr, e.getCause().toString());
} else {
stopKeepAliveTimer();
log.error("Error while processing message from peer " + getPeerInfoString() + "state " + this.state);
+ bgpController.closedSessionExceptionAdd(peerAddr, e.getCause().toString());
ctx.getChannel().close();
}
}
@@ -733,7 +739,7 @@
* @throws IOException while processing error message
*/
public void processUnknownMsg(byte errorCode, byte errorSubCode, byte data) throws BgpParseException, IOException {
- log.debug("UNKNOWN message received");
+ log.debug("Unknown message received");
byte[] byteArray = new byte[1];
byteArray[0] = data;
sendNotification(errorCode, errorSubCode, byteArray);
@@ -782,7 +788,7 @@
* @throws BgpParseException
*/
private boolean capabilityValidation(BgpChannelHandler h, BgpOpenMsg openmsg) throws BgpParseException {
- log.debug("capabilityValidation");
+ log.debug("capability validation");
boolean isFourOctetCapabilityExits = false;
boolean isRpdCapabilityExits = false;
@@ -916,7 +922,7 @@
* @return true or false
*/
private boolean asNumberValidation(BgpChannelHandler h, BgpOpenMsg openMsg) {
- log.debug("AS Num validation");
+ log.debug("AS number validation");
int capAsNum = 0;
boolean isFourOctetCapabilityExits = false;
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
index a0bac3e..867f6a6 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java
@@ -19,6 +19,8 @@
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
+import java.util.List;
+import java.util.ArrayList;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.IpAddress;
@@ -42,7 +44,7 @@
private static final short DEFAULT_HOLD_TIMER = 120;
private static final short DEFAULT_CONN_RETRY_TIME = 120;
private static final short DEFAULT_CONN_RETRY_COUNT = 5;
-
+ private List<BgpConnectPeerImpl> peerList = new ArrayList();
private State state = State.INIT;
private int localAs;
private int maxSession;
@@ -189,10 +191,10 @@
}
this.bgpPeerTree.put(routerid, lspeer);
- log.debug("added successfully");
+ log.debug("Added successfully");
return true;
} else {
- log.debug("already exists");
+ log.debug("Already exists");
return false;
}
}
@@ -208,6 +210,8 @@
connectPeer = new BgpConnectPeerImpl(bgpController, routerid, Controller.BGP_PORT_NUM);
lspeer.setConnectPeer(connectPeer);
connectPeer.connectPeer();
+ peerList.add((BgpConnectPeerImpl) connectPeer);
+
}
return true;
}
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java
index 494718b..a53bf23 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConnectPeerImpl.java
@@ -42,6 +42,38 @@
private int connectRetryTime;
private ChannelPipelineFactory pfact;
private ClientBootstrap peerBootstrap;
+ public String getPeerHost() {
+ return peerHost;
+ }
+ public static int getRetryInterval() {
+ return RETRY_INTERVAL;
+ }
+
+ @Override
+ public int getPeerPort() {
+ return peerPort;
+ }
+ @Override
+ public int getConnectRetryCounter() {
+ return connectRetryCounter;
+ }
+
+ public void setConnectRetryCounter(int connectRetryCounter) {
+ this.connectRetryCounter = connectRetryCounter;
+ }
+
+ public void setConnectRetryTime(int connectRetryTime) {
+ this.connectRetryTime = connectRetryTime;
+ }
+
+ public BgpCfg getBgpconfig() {
+ return bgpconfig;
+ }
+
+ public void setBgpconfig(BgpCfg bgpconfig) {
+ this.bgpconfig = bgpconfig;
+ }
+
private BgpCfg bgpconfig;
/**
@@ -118,14 +150,14 @@
} else {
connectRetryCounter++;
- log.info("Connected to remote host {}, Connect Counter {}", peerHost, connectRetryCounter);
+ log.debug("Connected to remote host {}, Connect Counter {}", peerHost, connectRetryCounter);
disconnectPeer();
return;
}
}
});
} catch (Exception e) {
- log.info("Connect peer exception : " + e.toString());
+ log.debug("Connect peer exception : " + e.toString());
disconnectPeer();
}
}
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java
index 83c0648..15a5b58 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpControllerImpl.java
@@ -38,6 +38,9 @@
import org.slf4j.LoggerFactory;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.TreeMap;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -50,7 +53,7 @@
public class BgpControllerImpl implements BgpController {
private static final Logger log = LoggerFactory.getLogger(BgpControllerImpl.class);
-
+ final Controller ctrl = new Controller(this);
protected ConcurrentHashMap<BgpId, BgpPeer> connectedPeers = new ConcurrentHashMap<BgpId, BgpPeer>();
protected BgpPeerManagerImpl peerManager = new BgpPeerManagerImpl();
@@ -60,10 +63,53 @@
protected Set<BgpNodeListener> bgpNodeListener = new CopyOnWriteArraySet<>();
protected Set<BgpLinkListener> bgpLinkListener = new CopyOnWriteArraySet<>();
-
- final Controller ctrl = new Controller(this);
-
+ protected BgpController bgpController;
private BgpConfig bgpconfig = new BgpConfig(this);
+ private List<String> activeExceptionList = new LinkedList();
+ private LinkedList<String> closedExceptionList = new LinkedList<String>();
+ private Map<String, List<String>> activeSessionExceptionMap = new TreeMap<>();
+ private Map<String, List<String>> closedSessionExceptionMap = new TreeMap<>();
+
+ @Override
+ public void activeSessionExceptionAdd(String peerId, String exception) {
+ if (peerId != null) {
+ activeExceptionList.add(exception);
+ activeSessionExceptionMap.put(peerId, activeExceptionList);
+ } else {
+ log.debug("Peer Id is null");
+ }
+ if (activeExceptionList.size() > 10) {
+ activeExceptionList.clear();
+ activeExceptionList.add(exception);
+ activeSessionExceptionMap.put(peerId, activeExceptionList);
+ }
+ }
+
+
+ @Override
+ public void closedSessionExceptionAdd(String peerId, String exception) {
+ if (peerId != null) {
+ closedExceptionList.add(exception);
+ closedSessionExceptionMap.put(peerId, closedExceptionList);
+ } else {
+ log.debug("Peer Id is null");
+ }
+ if (closedExceptionList.size() > 10) {
+ closedExceptionList.clear();
+ closedExceptionList.add(exception);
+ closedSessionExceptionMap.put(peerId, closedExceptionList);
+ }
+ }
+
+ @Override
+ public Map<String, List<String>> activeSessionMap() {
+ return activeSessionExceptionMap;
+ }
+
+ @Override
+ public Map<String, List<String>> closedSessionMap() {
+ return closedSessionExceptionMap;
+ }
@Activate
public void activate() {
@@ -73,6 +119,8 @@
@Deactivate
public void deactivate() {
+ activeSessionExceptionMap.clear();
+ closedSessionExceptionMap.clear();
// Close all connected peers
closeConnectedPeers();
this.ctrl.stop();
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java
index aef8055..9bf2ee3 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpLocalRibImpl.java
@@ -69,6 +69,7 @@
*
* @return node tree
*/
+ @Override
public Map<BgpNodeLSIdentifier, PathAttrNlriDetailsLocalRib> nodeTree() {
return nodeTree;
}
@@ -78,6 +79,7 @@
*
* @return link tree
*/
+ @Override
public Map<BgpLinkLSIdentifier, PathAttrNlriDetailsLocalRib> linkTree() {
return linkTree;
}
@@ -87,6 +89,7 @@
*
* @return prefix tree
*/
+ @Override
public Map<BgpPrefixLSIdentifier, PathAttrNlriDetailsLocalRib> prefixTree() {
return prefixTree;
}
@@ -96,6 +99,7 @@
*
* @return vpn node NLRI tree
*/
+ @Override
public Map<RouteDistinguisher, Map<BgpNodeLSIdentifier, PathAttrNlriDetailsLocalRib>> vpnNodeTree() {
return vpnNodeTree;
}
@@ -105,6 +109,7 @@
*
* @return vpn link NLRI Tree
*/
+ @Override
public Map<RouteDistinguisher, Map<BgpLinkLSIdentifier, PathAttrNlriDetailsLocalRib>> vpnLinkTree() {
return vpnLinkTree;
}
@@ -114,6 +119,7 @@
*
* @return vpn prefix NLRI Tree
*/
+ @Override
public Map<RouteDistinguisher, Map<BgpPrefixLSIdentifier, PathAttrNlriDetailsLocalRib>> vpnPrefixTree() {
return vpnPrefixTree;
}
@@ -421,7 +427,7 @@
decisionResult = selectionAlgo.compare(prefixTree.get(prefixIdentifier), detailsLocRib);
if (decisionResult < 0) {
prefixTree.replace(prefixIdentifier, detailsLocRib);
- log.debug("local RIB prefix updated: {}", detailsLocRib.toString());
+ log.debug("Local RIB prefix updated: {}", detailsLocRib.toString());
}
} else {
if (!isVpnRib) {
diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
index 02a4321..40048bc 100644
--- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
+++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpPeerImpl.java
@@ -142,16 +142,20 @@
if (tlv.getType() == MultiProtocolExtnCapabilityTlv.TYPE) {
MultiProtocolExtnCapabilityTlv temp = (MultiProtocolExtnCapabilityTlv) tlv;
if ((temp.getAfi() == afi) && (temp.getSafi() == sAfi)) {
+ log.debug("Multi prorotcol extension capabality TLV is true");
return true;
+
}
} else if (tlv.getType() == RpdCapabilityTlv.TYPE) {
RpdCapabilityTlv temp = (RpdCapabilityTlv) tlv;
if ((temp.getAfi() == afi) && (temp.getSafi() == sAfi)) {
+ log.debug("RPD capabality TLV is true");
return true;
}
}
}
}
+ log.debug("IS capabality is not supported ");
return false;
}
@@ -236,7 +240,7 @@
BgpMessage msg = Controller.getBgpMessageFactory4().updateMessageBuilder()
.setBgpPathAttributes(attributesList).build();
- log.debug("Sending Flow spec Update message to {}", channel.getRemoteAddress());
+ log.debug("Sending flow spec update message to {}", channel.getRemoteAddress());
channel.write(Collections.singletonList(msg));
}