Bug 9188 Removing the ODL thrift IP check 04/65704/2
authorLoshmitha <loshmitha@ericsson.com>
Mon, 20 Nov 2017 09:34:00 +0000 (15:04 +0530)
committerSam Hague <shague@redhat.com>
Tue, 21 Nov 2017 20:32:24 +0000 (20:32 +0000)
In RHEL,ODL MIP will not be hosted in the BGP EOS owner and it will be
in HA proxy.So removing the availability and check for this IP in the
code.Check was not required as QBGP has replay mechanism whenever the IP
comes up

Change-Id: I79a6cfddb36dd9c7b2322615bf3871a9bfdc7e44
Signed-off-by: Loshmitha <loshmitha@ericsson.com>
vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java

index 780f44a54fc142b1ad9e63f07c9464471fe82f28..f71f2ab0ca64b19d37dc2b530411bafea2a0fc10 100755 (executable)
@@ -505,21 +505,7 @@ public class BgpConfigurationManager {
                             BgpRouterException.BGP_ERR_NOT_INITED, ADD_WARN);
                     return;
                 }
-                if (isIpAvailable(odlThriftIp)) {
-                    bgpRestarted();
-                } else {
-                    IP_ACTIVATION_CHECK_TIMER.scheduleAtFixedRate(new TimerTask() {
-                        @Override
-                        public void run() {
-                            if (isIpAvailable(odlThriftIp)) {
-                                bgpRestarted();
-                                IP_ACTIVATION_CHECK_TIMER.cancel();
-                            } else {
-                                LOG.trace("waiting for odlThriftIP: {} to be present", odlThriftIp);
-                            }
-                        }
-                    }, 10000L, 10000L);
-                }
+                bgpRestarted();
 
                 startBgpCountersTask();
                 startBgpAlarmsTask();