commit cea18d3cd6ad5210679285ee9f1b5f8bde30b64f
author Shashikanth VH <shashikanth.vh@huawei.com> Fri Dec 04 15:45:14 2015 +0530
committer Gerrit Code Review <gerrit@onlab.us> Fri Dec 04 17:24:34 2015 +0000
tree ff9110d9a39a204d555c34b8dd2c862de971305c
parent 5212541e7373dca7fda33ab418376f5d9506462c

BGP system test issue fix

Change-Id: I36064e33146444531cdef6deab0d55b89efae8a7

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

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 45be255..0c55ead 100755
--- 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
@@ -376,24 +376,10 @@
             throw new IOException("Invalid peer connection.");
         }
 
-        // Connection should establish only if local ip and Autonomous system number is configured.
-        if (bgpconfig.getState() != BgpCfg.State.IP_AS_CONFIGURED) {
-            sendNotification(BgpErrorType.CEASE, BgpErrorType.CONNECTION_REJECTED, null);
-            channel.close();
-            log.info("BGP local AS and router ID not configured");
-            return;
-        }
 
         inetAddress = (InetSocketAddress) address;
         peerAddr = IpAddress.valueOf(inetAddress.getAddress()).toString();
 
-        // if peer is not configured disconnect session
-        if (!bgpconfig.isPeerConfigured(peerAddr)) {
-            log.debug("Peer is not configured {}", peerAddr);
-            sendNotification(BgpErrorType.CEASE, BgpErrorType.CONNECTION_REJECTED, null);
-            channel.close();
-            return;
-        }
 
         // if connection is already established close channel
         if (peerManager.isPeerConnected(BgpId.bgpId(IpAddress.valueOf(peerAddr)))) {
@@ -662,8 +648,10 @@
     private void sendHandshakeOpenMessage() throws IOException, BgpParseException {
         int bgpId;
 
-        bgpId = Ip4Address.valueOf(bgpconfig.getRouterId()).toInt();
-        BgpMessage msg = factory4.openMessageBuilder().setAsNumber((short) bgpconfig.getAsNumber())
+        InetSocketAddress localAddress = (InetSocketAddress) channel.getLocalAddress();
+
+        bgpId = Ip4Address.valueOf(IpAddress.valueOf(localAddress.getAddress()).toString()).toInt();
+        BgpMessage msg = factory4.openMessageBuilder().setAsNumber((short) peerAsNum)
                 .setHoldTime(bgpconfig.getHoldTime()).setBgpId(bgpId).setLsCapabilityTlv(bgpconfig.getLsCapability())
                 .setLargeAsCapabilityTlv(bgpconfig.getLargeASCapability()).build();
         log.debug("Sending open message to {}", channel.getRemoteAddress());
@@ -734,11 +722,6 @@
             throw new BgpParseException(BgpErrorType.OPEN_MESSAGE_ERROR, BgpErrorType.BAD_BGP_IDENTIFIER, null);
         }
 
-        // Validate AS number
-        result = asNumberValidation(h, openMsg);
-        if (!result) {
-            throw new BgpParseException(BgpErrorType.OPEN_MESSAGE_ERROR, BgpErrorType.BAD_PEER_AS, null);
-        }
 
         // Validate hold timer
         if ((openMsg.getHoldTime() != 0) && (openMsg.getHoldTime() < BGP_MIN_HOLDTIME)) {