BgpManager: Log categorization, log formatting and

moving BgpManager Test to correct package.

Change-Id: I1f73db6c8eca97d6c5120a71931570c5b6c5ba09
Signed-off-by: Manisha Malla <manisha.malla@ericsson.com>

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpConfigurationManager.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpConfigurationManager.java
index 21e4cb0139216f283118526d923b6a74a49d9bcc..ebd49642ceaf58c54f6657bfeb57fb1108b27a35 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpConfigurationManager.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpConfigurationManager.java
@@ -82,7 +82,7 @@ public class BgpConfigurationManager {
         protected void remove(InstanceIdentifier<BgpRouter> identifier,
                               BgpRouter del) {
 
-            LOG.info("Bgp Router deleted in DS - " + "key: " + identifier + ", value=" + del);
+            LOG.debug("Bgp Router deleted in DS - key: {} value={} ", identifier, del);
 
             removeBgpRouter(del);
 
@@ -110,7 +110,7 @@ public class BgpConfigurationManager {
         protected void update(InstanceIdentifier<BgpRouter> identifier,
                               BgpRouter original, BgpRouter update) {
 
-            LOG.info("Bgp Router Updated in DS - " + "key: " + identifier + ", original=" + original + ", update=" + update);
+            LOG.debug("Bgp Router Updated in DS - key: {}, original={}, update={} ", identifier, original, update);
 
             updateBgpRouter(original, update);
         }
@@ -132,9 +132,7 @@ public class BgpConfigurationManager {
         @Override
         protected void add(InstanceIdentifier<BgpRouter> identifier,
                            BgpRouter value) {
-            LOG.info("Bgp Router added in DS - " + "key: " + identifier + ", value=" + value);
-            LOG.info("Bgp Router localASNumber:" + value.getLocalAsNumber());
-            LOG.info("Bgp Router localASIdentifier:" + value.getLocalAsIdentifier());
+            LOG.debug("Bgp Router added in DS - key: {}, value={} ",identifier, value);
 
             addBgpRouter(value);
         }
@@ -181,7 +179,7 @@ public class BgpConfigurationManager {
             if(gateway != null) {
                 if ((gateway.getPeerAddressType() != null) && (gateway.getPeerAddressType() instanceof org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.bgp.rev130715.bgp.neighbors.bgp.neighbor.peer.address.type.IpAddress)) {
                     IpAddress neighborIPAddr = ((org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.bgp.rev130715.bgp.neighbors.bgp.neighbor.peer.address.type.IpAddress) gateway.getPeerAddressType()).getIpAddress();
-                    LOG.info("Bgp Neighbor IP Address " + neighborIPAddr.getIpv4Address().getValue());
+                    LOG.debug("Bgp Neighbor IP Address {} ", neighborIPAddr.getIpv4Address().getValue());
 
                     configureBgpServer(BgpOp.DEL_NGHBR);
 
@@ -197,7 +195,7 @@ public class BgpConfigurationManager {
         protected void remove(InstanceIdentifier<BgpNeighbors> identifier,
                               BgpNeighbors del) {
 
-            LOG.info("Bgp Neighbors deleted in DS - " + "key: " + identifier + ", value=" + del);
+            LOG.debug("Bgp Neighbors deleted in DS - key: {}, value={} ", identifier, del);
             removeBgpNeighbors(del);
         }
 
@@ -221,7 +219,7 @@ public class BgpConfigurationManager {
                     configureBgpServer(BgpOp.DEL_NGHBR);
                 }
                 if(gateway.getAsNumber() != null) {
-                    LOG.info("Bgp Neighbor AS number " + gateway.getAsNumber());
+                    LOG.debug("Bgp Neighbor AS number {} ", gateway.getAsNumber());
                     if(bgpConfiguration.getNeighbourAsNum() != gateway.getAsNumber()) {
                         bgpConfiguration.setNeighbourAsNum(gateway.getAsNumber());
                         bgpConfiguration.setConfigUpdated();
@@ -229,7 +227,7 @@ public class BgpConfigurationManager {
                 }
                 if((gateway.getPeerAddressType() != null) && (gateway.getPeerAddressType() instanceof org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.bgp.rev130715.bgp.neighbors.bgp.neighbor.peer.address.type.IpAddress)) {
                     IpAddress neighborIPAddr = ((org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.bgp.rev130715.bgp.neighbors.bgp.neighbor.peer.address.type.IpAddress)gateway.getPeerAddressType()).getIpAddress();
-                    LOG.info("Bgp Neighbor IP Address " + neighborIPAddr.getIpv4Address().getValue());
+                    LOG.debug("Bgp Neighbor IP Address {}", neighborIPAddr.getIpv4Address().getValue());
                     if(bgpConfiguration.getNeighbourIp() != neighborIPAddr.getIpv4Address().getValue()) {
                         bgpConfiguration.setNeighbourIp(neighborIPAddr.getIpv4Address().getValue());
                         bgpConfiguration.setConfigUpdated();
@@ -247,7 +245,7 @@ public class BgpConfigurationManager {
         protected void update(InstanceIdentifier<BgpNeighbors> identifier,
                               BgpNeighbors original, BgpNeighbors update) {
 
-            LOG.info("Bgp Neighbors Updated in DS - " + "key: " + identifier + ", original=" + original + ", update=" + update);
+            LOG.debug("Bgp Neighbors Updated in DS - key: {}, original={}, update={} ", identifier,  original, update);
 
             updateBgpNeighbors(original, update);
 
@@ -261,12 +259,12 @@ public class BgpConfigurationManager {
 
             if(gateway != null) {
                 if(gateway.getAsNumber() != null) {
-                    LOG.info("Bgp Neighbor AS number " + gateway.getAsNumber());
+                    LOG.debug("Bgp Neighbor AS number {} ", gateway.getAsNumber());
                     bgpConfiguration.setNeighbourAsNum(gateway.getAsNumber());
                 }
                 if((gateway.getPeerAddressType() != null) && (gateway.getPeerAddressType() instanceof org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.bgp.rev130715.bgp.neighbors.bgp.neighbor.peer.address.type.IpAddress)) {
                     IpAddress neighborIPAddr = ((org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.bgp.rev130715.bgp.neighbors.bgp.neighbor.peer.address.type.IpAddress)gateway.getPeerAddressType()).getIpAddress();
-                    LOG.info("Bgp Neighbor IP Address " + neighborIPAddr.getIpv4Address().getValue());
+                    LOG.debug("Bgp Neighbor IP Address {} ", neighborIPAddr.getIpv4Address().getValue());
                     bgpConfiguration.setNeighbourIp(neighborIPAddr.getIpv4Address().getValue());
 
                 }
@@ -280,8 +278,7 @@ public class BgpConfigurationManager {
         @Override
         protected void add(InstanceIdentifier<BgpNeighbors> identifier,
                            BgpNeighbors value) {
-            LOG.info("key: " + identifier + ", value=" + value);
-            LOG.info("Bgp Neighbor added in DS - " + "key: " + identifier + ", value=" + value);
+            LOG.debug("Bgp Neighbor added in DS - key: {}, value={} ", identifier, value);
 
             addBgpNeighbors(value);
         }
@@ -322,7 +319,7 @@ public class BgpConfigurationManager {
                         bgpManager.deleteNeighbor(bgpConfiguration.getNeighbourIp());
                         break;
                     default:
-                        LOG.info("Invalid configuration option");
+                        LOG.error("Invalid configuration option {}", bgpOp);
                 }
 
                 retry = false;

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpManager.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpManager.java
index 35d492471d2e48227a0cafc39bcff876c19c077a..d8e387eaf58e52478b4e2d215045a37b2bf8bcf3 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpManager.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/BgpManager.java
@@ -96,14 +96,14 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
 
     public void startBgpService() throws TException {
         if(bgpThriftClient == null) {
-            LOGGER.info("Start Bgp Service - bgpThriftClient is null. Unable to start BGP service.");
+            LOGGER.error("Start Bgp Service - bgpThriftClient is null. Unable to start BGP service.");
             return;
         }
 
         // Now try start bgp - if bgp is already Active, it will tell us, nothing to do then
         try {
             bgpThriftClient.startBgp((int)bgpConfiguration.getAsNum(), bgpConfiguration.getRouterId());
-            LOGGER.info("Started BGP with AS number " + (int)bgpConfiguration.getAsNum() + " and router id " + bgpConfiguration.getRouterId());
+            LOGGER.debug("Started BGP with AS number " + (int)bgpConfiguration.getAsNum() + " and router id " + bgpConfiguration.getRouterId());
         } catch (BgpRouterException be) {
             if(be.getErrorCode() == BgpRouterException.BGP_ERR_ACTIVE) {
                 LOGGER.info("bgp server already active");
@@ -121,12 +121,12 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
 
         }  catch (TException t) {
             LOGGER.error("Could not set up thrift connection with bgp server");
-            //LOGGER.trace("Transport error while starting bgp server ", t);
+            LOGGER.debug("Transport error while starting bgp server ", t);
             reInitConn();
             throw t;
         } catch (Exception e) {
             LOGGER.error("Error while starting bgp server");
-            //LOGGER.trace("Bgp Service not started due to exception", e);
+            LOGGER.debug("Bgp Service not started due to exception", e);
             return;
         }
 
@@ -174,15 +174,15 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
 
     protected void addNeighbor(String ipAddress, long asNum) throws TException {
         if(bgpThriftClient == null) {
-            LOGGER.info("Add BGP Neighbor - bgpThriftClient is null. Unable to add BGP Neighbor.");
+            LOGGER.error("Add BGP Neighbor - bgpThriftClient is null. Unable to add BGP Neighbor.");
             return;
         }
 
         try {
             bgpThriftClient.addNeighbor(ipAddress, (int) asNum);
         } catch (BgpRouterException b) {
-            LOGGER.error("Failed to add BGP neighbor " + ipAddress + "due to BgpRouter Exception number " + b.getErrorCode());
-            LOGGER.error("BgpRouterException trace ", b);
+            LOGGER.error("Failed to add BGP neighbor " + ipAddress + " due to BgpRouter Exception number " + b.getErrorCode());
+            LOGGER.debug("BgpRouterException trace ", b);
         } catch (TException t) {
             LOGGER.error(String.format("Failed adding neighbor %s due to Transport error", ipAddress));
             reInitConn();
@@ -195,7 +195,7 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
 
     protected void deleteNeighbor(String ipAddress) throws TException {
         if(bgpThriftClient == null) {
-            LOGGER.info("Delete BGP Neighbor - bgpThriftClient is null. Unable to delete BGP Neighbor.");
+            LOGGER.error("Delete BGP Neighbor - bgpThriftClient is null. Unable to delete BGP Neighbor.");
             return;
         }
 
@@ -203,7 +203,7 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
             bgpThriftClient.delNeighbor(ipAddress);
         } catch (BgpRouterException b) {
             LOGGER.error("Failed to delete BGP neighbor " + ipAddress + "due to BgpRouter Exception number " + b.getErrorCode());
-            LOGGER.error("BgpRouterException trace ", b);
+            LOGGER.debug("BgpRouterException trace ", b);
         }catch (TException t) {
             LOGGER.error(String.format("Failed deleting neighbor %s due to Transport error", ipAddress));
             reInitConn();
@@ -217,14 +217,14 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
     @Override
     public void addVrf(String rd, Collection<String> importRts, Collection<String> exportRts) throws Exception {
         if(bgpThriftClient == null) {
-            LOGGER.info("Add BGP vrf - bgpThriftClient is null. Unable to add BGP vrf.");
+            LOGGER.error("Add BGP vrf - bgpThriftClient is null. Unable to add BGP vrf.");
             return;
         }
         try {
             bgpThriftClient.addVrf(rd, new ArrayList<>(importRts), new ArrayList<>(exportRts));
         } catch (BgpRouterException b) {
             LOGGER.error("Failed to add BGP vrf " + rd + "due to BgpRouter Exception number " + b.getErrorCode());
-            LOGGER.error("BgpRouterException trace ", b);
+            LOGGER.debug("BgpRouterException trace ", b);
             throw b;
         } catch (TException t) {
             LOGGER.error(String.format("Failed adding vrf %s due to Transport error", rd));
@@ -246,7 +246,7 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
             bgpThriftClient.delVrf(rd);
         } catch (BgpRouterException b) {
             LOGGER.error("Failed to delete BGP vrf " + rd + "due to BgpRouter Exception number " + b.getErrorCode());
-            LOGGER.error("BgpRouterException trace ", b);
+            LOGGER.debug("BgpRouterException trace ", b);
             throw b;
         } catch (TException t) {
             LOGGER.error(String.format("Failed deleting vrf %s due to Transport error", rd));
@@ -270,7 +270,7 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
             bgpThriftClient.addPrefix(rd, prefix, nextHop, vpnLabel);
         } catch (BgpRouterException b) {
             LOGGER.error("Failed to add BGP prefix " + prefix + "due to BgpRouter Exception number " + b.getErrorCode());
-            LOGGER.error("BgpRouterException trace ", b);
+            LOGGER.debug("BgpRouterException trace ", b);
             throw b;
         } catch (TException t) {
             LOGGER.error(String.format("Failed adding prefix entry <vrf:prefix:nexthop:vpnlabel> %s:%s:%s:%d due to Transport error",
@@ -296,7 +296,7 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
             bgpThriftClient.delPrefix(rd, prefix);
         } catch (BgpRouterException b) {
             LOGGER.error("Failed to delete BGP prefix " + prefix + "due to BgpRouter Exception number " + b.getErrorCode());
-            LOGGER.error("BgpRouterException trace ", b);
+            LOGGER.debug("BgpRouterException trace ", b);
             throw b;
         } catch (TException t) {
             LOGGER.error(String.format("Failed deleting prefix entry <vrf:prefix> %s:%s due to Transport error",
@@ -321,10 +321,10 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
         }
         try {
             bgpThriftClient.connect(host, port);
-            LOGGER.info("Connected to BGP server " + host + " on port " + port);
+            LOGGER.debug("Connected to BGP server {} on port {} ", host, port);
         } catch (BgpRouterException b) {
             LOGGER.error("Failed to connect to BGP server " + host + " on port " + port + " due to BgpRouter Exception number " + b.getErrorCode());
-            //_logger.error("BgpRouterException trace ", b);
+            LOGGER.debug("BgpRouterException trace ", b);
             throw b;
         } catch (TException t) {
             LOGGER.error("Failed to initialize BGP Connection due to Transport error ");
@@ -349,10 +349,10 @@ public class BgpManager implements BindingAwareProvider, AutoCloseable, IBgpMana
 
         try {
             bgpThriftClient.reInit();
-            LOGGER.info("Reinitialized connection to BGP Server " + bgpHost);
+            LOGGER.debug("Reinitialized connection to BGP Server {}", bgpHost);
         } catch (BgpRouterException b) {
-            LOGGER.error("Failed to reinitialize connection to BGP server " + bgpHost + " on port " + bgpPort + " due to BgpRouter Exception number " + b.getErrorCode());
-            LOGGER.error("BgpRouterException trace ", b);
+            LOGGER.error("Failed to reinitialize connection to BGP server {} on port {} due to BgpRouter Exception number {}", bgpHost, bgpPort, b.getErrorCode());
+            LOGGER.debug("BgpRouterException trace ", b);
         } catch (TException t) {
             LOGGER.error("Failed to reinitialize BGP Connection due to Transport error.");
         }

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java
index 28d196a093992fe7f1281eff8da85c8119f5885b..496f3cfa847b356c4cd9090373a8eac090177ca1 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java
@@ -44,7 +44,7 @@ public class FibDSWriter {
 
         VrfEntry vrfEntry = new VrfEntryBuilder().setDestPrefix(prefix).
             setNextHopAddress(nexthop).setLabel((long)label).build();
-        logger.debug("Created vrfEntry for " + prefix + " nexthop " + nexthop + " label " + label);
+        logger.debug("Created vrfEntry for {} nexthop {} label {}", prefix, nexthop, label);
 
         List<VrfEntry> vrfEntryList = new ArrayList<VrfEntry>();
         vrfEntryList.add(vrfEntry);
@@ -62,7 +62,7 @@ public class FibDSWriter {
 
     public synchronized void removeFibEntryFromDS(String rd, String prefix) {
 
-        logger.debug("Removing fib entry with destination prefix " + prefix + " from vrf table for rd " + rd);
+        logger.debug("Removing fib entry with destination prefix {} from vrf table for rd {}", prefix, rd);
 
         InstanceIdentifierBuilder<VrfEntry> idBuilder =
             InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).child(VrfEntry.class, new VrfEntryKey(prefix));

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/client/implementation/BgpRouter.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/client/implementation/BgpRouter.java
index e5af15acd93e733c946c5d4d08b633a9334102f6..93c92f87ad2e5ba911747da2815469ee3d2f8516 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/client/implementation/BgpRouter.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/client/implementation/BgpRouter.java
@@ -70,7 +70,7 @@ public class BgpRouter {
         this.bgpPort = bgpPort;
         bop = new BgpOp();
         try {
-            LOGGER.info("Connecting to BGP Server " + bgpHost + " on port " + bgpPort);
+            LOGGER.debug("Connecting to BGP Server " + bgpHost + " on port " + bgpPort);
             reInit();
         } catch (Exception e) {
             LOGGER.error("Failed connecting to BGP server ");
@@ -142,7 +142,7 @@ public class BgpRouter {
         bop.type = START_BGP;
         bop.asNum = asNum;
         bop.rtrId = rtrId;
-        LOGGER.info("Starting BGP Server with as number " + asNum + " and router ID " + rtrId);
+        LOGGER.debug("Starting BGP Server with as number {} and router ID {} ", asNum, rtrId);
         dispatch(bop);
     }
 
@@ -151,7 +151,7 @@ public class BgpRouter {
         bop.type = ADD_NBR;
         bop.nbrIp = nbrIp;
         bop.nbrAsNum = nbrAsNum;
-        LOGGER.info("Adding BGP Neighbor " + nbrIp + " with as number " + nbrAsNum);
+        LOGGER.debug("Adding BGP Neighbor {} with as number {} ", nbrIp, nbrAsNum);
         dispatch(bop);
     }
 
@@ -159,7 +159,7 @@ public class BgpRouter {
         throws TException, BgpRouterException {
         bop.type = DEL_NBR;
         bop.nbrIp = nbrIp;
-        LOGGER.info("Deleting BGP Neighbor " + nbrIp);
+        LOGGER.debug("Deleting BGP Neighbor {} ", nbrIp);
         dispatch(bop);
     }
 
@@ -169,7 +169,7 @@ public class BgpRouter {
         bop.rd = rd;
         bop.irts = irts;
         bop.erts = erts;
-        LOGGER.info("Adding BGP VRF rd: " + rd);
+        LOGGER.debug("Adding BGP VRF rd: {} ", rd);
         dispatch(bop);
     }
 
@@ -177,7 +177,7 @@ public class BgpRouter {
         throws TException, BgpRouterException {
         bop.type = DEL_VRF;
         bop.rd = rd;
-        LOGGER.info("Deleting BGP VRF rd: " + rd);
+        LOGGER.debug("Deleting BGP VRF rd: {} " + rd);
         dispatch(bop);
     }
 
@@ -188,7 +188,7 @@ public class BgpRouter {
         bop.pfx = prefix;
         bop.nh = nexthop;
         bop.lbl = label;
-        LOGGER.info("Adding BGP route - rd:" + rd + " prefix:" + prefix + " nexthop:" + nexthop + " label:" + label);
+        LOGGER.debug("Adding BGP route - rd:{} prefix:{} nexthop:{} label:{} ", rd ,prefix, nexthop, label);
         dispatch(bop);
     }
 
@@ -197,7 +197,7 @@ public class BgpRouter {
         bop.type = DEL_PFX;
         bop.rd = rd;
         bop.pfx = prefix;
-        LOGGER.info("Deleting BGP route - rd:" + rd + " prefix:" + prefix);
+        LOGGER.debug("Deleting BGP route - rd:{} prefix:{} ", rd, prefix);
         dispatch(bop);
     }
 
@@ -267,7 +267,7 @@ public class BgpRouter {
         BgpSyncHandle bsh = BgpSyncHandle.getInstance();
 
         try {
-            LOGGER.info("Starting BGP Route sync.. ");
+            LOGGER.debug("Starting BGP Route sync.. ");
             initRibSync(bsh);
             while (bsh.getState() != bsh.DONE) {
                 Routes r = doRibSync(bsh);
@@ -288,7 +288,7 @@ public class BgpRouter {
                 }
             }
             endRibSync(bsh);
-            LOGGER.info("Completed BGP Route sync.");
+            LOGGER.debug("Completed BGP Route sync.");
         }  catch (Exception e) {
             throw e;
         }

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpThriftService.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpThriftService.java
index dfe4af646d97f2907c2f8b39c1cd6bd5d81ea699..921c9cf96217643c340dd9b0f6826e5c4d2632fd 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpThriftService.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpThriftService.java
@@ -31,12 +31,12 @@ public class BgpThriftService {
 
 
        public void start() {
-               LOGGER.info("BGP Thrift Server starting.");
+               LOGGER.debug("BGP Thrift Server starting...");
                startBgpThriftServer();
        }
        
        public void stop() {
-               LOGGER.info("BGP Thrift Server stopping.");
+               LOGGER.debug("BGP Thrift Server stopping...");
                stopBgpThriftServer();
        }
 
@@ -68,13 +68,12 @@ public class BgpThriftService {
 
        public void stopBgpThriftServer() {
                try {
-            LOGGER.debug("Server stopping");
-
             if (serverTransport != null) {
                 serverTransport.close();
             }
             
             server.stop();
+                       LOGGER.info("BGP Thrift Server stopped");
         } catch (Exception e) {
             LOGGER.error("Error while stopping the server - {} {}", getClass().getName(), e.getMessage());
         }
@@ -86,7 +85,7 @@ public class BgpThriftService {
 
                try {
                                serverTransport = new TServerSocket(port);
-                   LOGGER.info("Server Socket on Port {} ", port);
+                               LOGGER.info("BGP Thrift Server started on port {} ", port);
                        } catch (TTransportException e) {
                                LOGGER.error("Transport Exception while starting bgp thrift server", e);
                                return;

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpUpdateHandler.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpUpdateHandler.java
index 9f3c40a89a65a2d5ae33f791bf1cab1abd3767bf..bf7b33bbd49bdc2039ccca25fd4b5c8acf646c55 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpUpdateHandler.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/thrift/server/implementation/BgpUpdateHandler.java
@@ -20,21 +20,20 @@ class BgpUpdateHandler implements BgpUpdater.Iface {
     public void onUpdatePushRoute(String rd, String prefix, int plen,
                                 String nexthop, int label) {
 
-       LOGGER.info("Route add ** " + rd + " ** " + prefix + "/" + plen
-               + " ** " + nexthop + " ** " + label);
+       LOGGER.debug("Route add ** {} ** {}/{} ** {} ** {} ", rd, prefix, plen, nexthop, label);
         //Write to FIB in Data Store
         fibDSWriter.addFibEntryToDS(rd, prefix + "/" + plen, nexthop, label);
 
    }
 
    public void onUpdateWithdrawRoute(String rd, String prefix, int plen) {
-       LOGGER.info("Route del ** " + rd + " ** " + prefix + "/" + plen);
+       LOGGER.debug("Route del ** {} ** {}/{} ", rd, prefix, plen);
        fibDSWriter.removeFibEntryFromDS(rd, prefix + "/" + plen);
 
    }
 
    public void onStartConfigResyncNotification() {
-       LOGGER.info("BGP (re)started");
+       LOGGER.debug("BGP (re)started");
        bgpManager.reInitConn();
    }
 

diff --git a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/AbstractMockFibManager.java b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/AbstractMockFibManager.java
index 5aab67b93af63a508b8b5fc6890d5f47ff0f4122..e186e027813cc4a88c44bce5438a519309eeeb8b 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/AbstractMockFibManager.java
+++ b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/AbstractMockFibManager.java
@@ -1,4 +1,4 @@
-package org.opendaylight.vpnservice.test;
+package org.opendaylight.vpnservice.bgpmanager.test;
 
 import java.util.Collection;
 

diff --git a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/BgpManagerTest.java b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/BgpManagerTest.java
index 1c7ee261b0fee0d0bb364f3914ae03b9d0ace62f..bcf127d1f004760c74a94047a1d7c3a988bbd4f4 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/BgpManagerTest.java
+++ b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/BgpManagerTest.java
@@ -1,4 +1,4 @@
-package org.opendaylight.vpnservice.test;
+package org.opendaylight.vpnservice.bgpmanager.test;
 
 import java.math.BigInteger;
 import java.util.ArrayList;

diff --git a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/MockFibManager.java b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/MockFibManager.java
index dfbbf95c08b4b9bca1abcd6d2ba1a1ade501c1a9..e395d969531d8c22847280d374bdab6c7a446a38 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/MockFibManager.java
+++ b/bgpmanager/bgpmanager-impl/src/test/java/org/opendaylight/vpnservice/bgpmanager/test/MockFibManager.java
@@ -1,4 +1,4 @@
-package org.opendaylight.vpnservice.test;
+package org.opendaylight.vpnservice.bgpmanager.test;
 
 import java.util.Collection;