BFD logging

Peer Up and Peer Down events are added to the history command

JIRA: NETVIRT-1632

Change-Id: I32fdf55185ee96ba1fb0484aa09c384c2779a3da
Signed-off-by: Loshmitha <loshmitha@ericsson.com>

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
index 678baa8c37d24784f175b9d231f3ecd975d248b3..a1cc34fd88a3a64a6bf35da9e938c1c12c83db04 100755 (executable)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java
@@ -2096,6 +2096,8 @@ public class BgpConfigurationManager {
     }
 
     public void peerDown(String ipAddress, long asNumber) {
+        PeerDownEvent peerDownEvent = new PeerDownEvent(ipAddress,asNumber);
+        bgpUpdatesHistory.addToHistory(TransactionType.ADD, peerDownEvent);
         List<String> tepIpList = bgpUtil.getDcgwTepConfig(ipAddress);
         if (tepIpList == null) {
             LOG.error("No Tep IP configured for DCGW {} on a peerDown", ipAddress);
@@ -2107,6 +2109,8 @@ public class BgpConfigurationManager {
     }
 
     public void peerUp(String ipAddress, long asNumber) {
+        PeerUpEvent peerUpEvent = new PeerUpEvent(ipAddress,asNumber);
+        bgpUpdatesHistory.addToHistory(TransactionType.ADD, peerUpEvent);
         List<String> tepIpList = bgpUtil.getDcgwTepConfig(ipAddress);
         if (tepIpList == null) {
             LOG.error("No Tep IP configured for DCGW {} on a peerUp", ipAddress);

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
index 9472aa7d3c19986e00807c270551d4197a957077..81028d850450e539edd2363bc631cc16da202dd5 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
@@ -119,6 +119,7 @@ public class ConfigureBgpCli extends OsgiCommandSupport {
             session.getConsole().println(
                     "exec configure-bgp -op [start-bgp-server | stop-bgp-server | add-neighbor | delete-neighbor|"
                             + " add-route | delete-route | graceful-restart| enable-log ]");
+            return null;
         }
         switch (op) {
             case "start-bgp-server":

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/PeerDownEvent.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/PeerDownEvent.java
new file mode 100644 (file)
index 0000000..e72411e
--- /dev/null
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/PeerDownEvent.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2015, 2017 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.netvirt.bgpmanager;
+
+public class PeerDownEvent {
+    private String ipAddress;
+    private Long asNumber;
+
+    public PeerDownEvent(String ipAddress,Long asNumber) {
+        this.ipAddress = ipAddress;
+        this.asNumber = asNumber;
+    }
+
+    @Override
+    public String toString() {
+        return "PeerDownEvent{"
+                + "ipAddress='" + ipAddress + '\''
+                + ", asNumber=" + asNumber
+                + '}';
+    }
+}

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/PeerUpEvent.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/PeerUpEvent.java
new file mode 100644 (file)
index 0000000..bcf86a8
--- /dev/null
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/PeerUpEvent.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2015, 2017 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.netvirt.bgpmanager;
+
+public class PeerUpEvent {
+    private String ipAddress;
+    private Long asNumber;
+
+    public PeerUpEvent(String ipAddress,Long asNumber) {
+        this.ipAddress = ipAddress;
+        this.asNumber = asNumber;
+    }
+
+    @Override
+    public String toString() {
+        return "PeerUpEvent{"
+                + "ipAddress='" + ipAddress + '\''
+                + ", asNumber=" + asNumber
+                + '}';
+    }
+}

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java
index 7025886e3438d01b4b80c8081a7ee0f9d55738ec..3777776e8f86b4c5efcbaf3b18c31f42e112c4e4 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java
@@ -47,6 +47,10 @@ public class VtyshCli extends OsgiCommandSupport {
         "display routing ip bgp vpnv4 rd <rd>  tags",
         "display routing ip bgp vpnv4 rd <rd>  <ip>",
         "display routing ip bgp vpnv4 rd <rd>  <ip/mask>",
+        "display routing ip bgp vpnv6 all",
+        "display routing ip bgp vpnv6 rd <rd>",
+        "display routing ip bgp vpnv6 all summary",
+        "display routing ip bgp vpnv6 all tags",
         "display routing ip bgp neighbors",
         "display routing ip bgp summary",
         "display routing ip bgp ipv4 unicast",

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java
index 75defb2d95f32315b4732f6b04d0456e3f0b9b15..ad6141b01f149d678812d29b03ddcbebd7c8769d 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Cache.java
@@ -149,7 +149,7 @@ public class Cache extends OsgiCommandSupport {
             }
             AsId asId = config.getAsId();
             if (asId != null) {
-                long asNum = asId.getLocalAs().longValue();
+                Long asNum = asId.getLocalAs().longValue();
                 IpAddress routerId = asId.getRouterId();
                 Long spt = asId.getStalepathTime().toJava();
                 Boolean afb = asId.isAnnounceFbit();
@@ -163,9 +163,9 @@ public class Cache extends OsgiCommandSupport {
                     spt = gracefulRestart.getStalepathTime().toJava();
                 }
                 ps.printf("%nBGP Router%n");
-                ps.printf("\t%-15s  %d%n\t%-15s  %s%n\t%-15s  %s%n\t%-15s  %s%n",
-                        ASSTR, asNum, RISTR, rid, SPSTR, spt == null || spt == 0 ? "default" : spt.toString(), FBSTR,
-                        bit);
+                ps.printf("\t%-15s  %s%n\t%-15s  %s%n\t%-15s  %s%n\t%-15s  %s%n",
+                        ASSTR, asNum.toString(), RISTR, rid, SPSTR,
+                        spt == null || spt == 0 ? "default" : spt.toString(), FBSTR, bit);
             }
 
             Logging logging = config.getLogging();

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
index 36fde58d44e46139c3f94f728f82f151c8ddc23b..8f758f980afb28d0bf5fcd3b9ca64a85bc820583 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpCounters.java
@@ -165,11 +165,11 @@ public class BgpCounters implements Runnable, AutoCloseable {
             // Store in the file
             toFile.write(sb.toString().trim());
         } catch (UnknownHostException e) {
-            LOG.error("Unknown host {}", bgpSdncMip, e);
+            LOG.info("Unknown host exception occured while socket creation {} ", bgpSdncMip);
         } catch (SocketTimeoutException e) {
-            LOG.error("Socket timeout", e);
+            LOG.info("Socket timeout Exception occured while socket creation");
         } catch (IOException e) {
-            LOG.error("I/O error", e);
+            LOG.info("I/O exception occured while socket creation");
         }
     }