commit 97e571e9e883e249f2a3d6c326cb40416fa9a0a5
author Shashikanth VH <shashikanth.vh@huawei.com> Tue Jan 05 12:15:14 2016 +0530
committer Gerrit Code Review <gerrit@onlab.us> Wed Jan 06 02:46:56 2016 +0000
tree 6a923cb112b7135a737988ba5a5f7cb14985b7fa
parent 55204f82ac5ff7e3460b82a61d76f6e6a7baa197

BGP peer connection validation based on peer configuration.

Change-Id: I67251b94973aad3e0ecf3d118ea534de1b015427

protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpConfig.java

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 95a07ad..1c846eb 100755
--- 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
@@ -67,7 +67,6 @@
         this.holdTime = DEFAULT_HOLD_TIMER;
         this.maxConnRetryTime = DEFAULT_CONN_RETRY_TIME;
         this.maxConnRetryCount = DEFAULT_CONN_RETRY_COUNT;
-        this.lsCapability = true;
     }
 
     @Override
@@ -223,8 +222,9 @@
             if (disconnPeer != null) {
                 // TODO: send notification peer deconfigured
                 disconnPeer.disconnectPeer();
+            } else {
+                lspeer.connectPeer().disconnectPeer();
             }
-            lspeer.connectPeer().disconnectPeer();
             lspeer.setState(BgpPeerCfg.State.IDLE);
             lspeer.setSelfInnitConnection(false);
             log.debug("Disconnected : " + routerid + " successfully");