BgpRouter code enhancements

[netvirt.git] / bgpmanager / impl / src / main / java / org / opendaylight / netvirt / bgpmanager / commands / Cache.java

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 ad6141b01f149d678812d29b03ddcbebd7c8769d..0f839dea6feb6f6395eaf55a876290e88e3c6ab8 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
@@ -17,7 +17,7 @@ import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
-import org.opendaylight.netvirt.bgpmanager.BgpConfigurationManager;
+import org.opendaylight.netvirt.bgpmanager.BgpManager;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.Bgp;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.AsId;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.bgp.GracefulRestart;
@@ -72,10 +72,10 @@ public class Cache extends OsgiCommandSupport {
     private static final String RDSTR = "RD";
     private static final String MPSTR = "Maxpath";
 
-    private final BgpConfigurationManager bgpConfigurationManager;
+    private final BgpManager bgpManager;
 
-    public Cache(BgpConfigurationManager bgpConfigurationManager) {
-        this.bgpConfigurationManager = bgpConfigurationManager;
+    public Cache(BgpManager bgpManager) {
+        this.bgpManager = bgpManager;
     }
 
     private Object usage() {
@@ -98,6 +98,7 @@ public class Cache extends OsgiCommandSupport {
         boolean listVrfs = false;
         boolean listNets = false;
         PrintStream ps = System.out;
+
         if (action != null) {
             return usage();
         }
@@ -135,11 +136,11 @@ public class Cache extends OsgiCommandSupport {
             // legacy behaviour forces to check for a connection
             // that's initiated by default at startup without
             // writing to config.
-            String configHost = bgpConfigurationManager.getConfigHost();
-            int configPort = bgpConfigurationManager.getConfigPort();
+            String configHost = bgpManager.getConfigHost();
+            int configPort = bgpManager.getConfigPort();
             ps.printf("%nConfiguration Server%n\t%s  %s%n\t%s  %d%n",
                     HTSTR, configHost, PTSTR, configPort);
-            Bgp config = bgpConfigurationManager.getConfig();
+            Bgp config = bgpManager.getConfig();
             if (config == null) {
                 if (fileStream != null) {
                     fileStream.close();