BgpRouter code enhancements

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

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java
index a281d49c47548022af2c40306f6dd1878ef98269..1dffc37ec2bba19a5f333187fe5a3d5b93706686 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Router.java
@@ -13,7 +13,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.Neighbors;
 
@@ -49,10 +49,10 @@ public class Router extends OsgiCommandSupport {
             required = false, multiValued = false)
     private final String fbit = null;
 
-    private final BgpConfigurationManager bgpConfigurationManager;
+    private final BgpManager bgpManager;
 
-    public Router(BgpConfigurationManager bgpConfigurationManager) {
-        this.bgpConfigurationManager = bgpConfigurationManager;
+    public Router(BgpManager bgpManager) {
+        this.bgpManager = bgpManager;
     }
 
     private Object usage() {
@@ -101,14 +101,14 @@ public class Router extends OsgiCommandSupport {
                             return null;
                     }
                 }
-                bgpConfigurationManager.startBgp(asn, rid, stalePath, fb);
+                bgpManager.startBgp(asn, rid, stalePath, fb);
                 break;
             case "del":
                 // check: nothing to stop?
                 if (asNum != null || rid != null || spt != null || fbit != null) {
                     session.getConsole().println("note: option(s) not needed; ignored");
                 }
-                Bgp conf = bgpConfigurationManager.getConfig();
+                Bgp conf = bgpManager.getConfig();
                 if (conf == null) {
                     session.getConsole().println("error : no BGP configs present");
                     break;
@@ -119,7 +119,7 @@ public class Router extends OsgiCommandSupport {
                             + "before stopping the router instance");
                     break;
                 }
-                bgpConfigurationManager.stopBgp();
+                bgpManager.stopBgp();
                 break;
             default:
                 return usage();