Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 8810 : BGP Manager / support for EVPN on OAM submodule missing
[netvirt.git]
/
vpnservice
/
bgpmanager
/
bgpmanager-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
bgpmanager
/
oam
/
BgpAlarms.java
diff --git
a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java
b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java
index bd930faf1675b1941698647eb7a01bd3d675ae8b..764ecca821b2491608cb713344a597371f1e342c 100644
(file)
--- a/
vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java
+++ b/
vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarms.java
@@
-24,7
+24,7
@@
public class BgpAlarms extends TimerTask {
private static Map<String, String> neighborStatusMap = new HashMap<>();
private BgpConfigurationManager bgpMgr;
private static Map<String, String> neighborStatusMap = new HashMap<>();
private BgpConfigurationManager bgpMgr;
- p
rivate
static Map<String, BgpAlarmStatus> neighborsRaisedAlarmStatusMap = new HashMap<>();
+ p
ublic
static Map<String, BgpAlarmStatus> neighborsRaisedAlarmStatusMap = new HashMap<>();
private static final String ALARM_TEXT = "Bgp Neighbor TCP connection is down";
@Override
private static final String ALARM_TEXT = "Bgp Neighbor TCP connection is down";
@Override
@@
-34,6
+34,7
@@
public class BgpAlarms extends TimerTask {
LOG.debug("Fetching neighbor status' from BGP");
BgpCounters.resetFile(BgpCounters.BGP_VPNV4_SUMMARY_FILE);
BgpCounters.resetFile(BgpCounters.BGP_VPNV6_SUMMARY_FILE);
LOG.debug("Fetching neighbor status' from BGP");
BgpCounters.resetFile(BgpCounters.BGP_VPNV4_SUMMARY_FILE);
BgpCounters.resetFile(BgpCounters.BGP_VPNV6_SUMMARY_FILE);
+ BgpCounters.resetFile(BgpCounters.BGP_EVPN_SUMMARY_FILE);
neighborStatusMap.clear();
if (bgpMgr != null && bgpMgr.getBgpCounters() != null) {
neighborStatusMap.clear();
if (bgpMgr != null && bgpMgr.getBgpCounters() != null) {
@@
-48,6
+49,12
@@
public class BgpAlarms extends TimerTask {
"show ip bgp vpnv6 all summary");
BgpCounters.parseIpBgpVpnv6AllSummary(neighborStatusMap);
"show ip bgp vpnv6 all summary");
BgpCounters.parseIpBgpVpnv6AllSummary(neighborStatusMap);
+
+ bgpMgr.getBgpCounters().fetchCmdOutputs(BgpCounters.BGP_EVPN_SUMMARY_FILE,
+ "show bgp l2vpn evpn all summary");
+
+ BgpCounters.parseBgpL2vpnEvpnAllSummary(neighborStatusMap);
+
processNeighborStatusMap(neighborStatusMap, nbrList, neighborsRaisedAlarmStatusMap);
}
LOG.debug("Finished getting the status of BGP neighbors");
processNeighborStatusMap(neighborStatusMap, nbrList, neighborsRaisedAlarmStatusMap);
}
LOG.debug("Finished getting the status of BGP neighbors");