BGPManager module sync up - 2

Change-Id: I6b31a75cd81a6863e88d19cbee1318579d4cd57e
Signed-off-by: Abhinav Gupta <abhinav.gupta@ericsson.com>

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
index cb84d2d053fbc012a018fc99b8d335fc6eb4db5e..72835c449f4a77360b3a2a3eed96f6477f11ee86 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ * Copyright (c) 2015 - 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
index 365e18600e5c609571bfa462d4d298a548db1b83..eb330c15b10f65f9d0131351849c196794ac043f 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
@@ -9,10 +9,6 @@
 package org.opendaylight.netvirt.bgpmanager;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Future;
 
 import org.apache.karaf.shell.commands.*;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
@@ -20,18 +16,11 @@ import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_afi;
 import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_safi;
 import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev150901.*;
 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.*;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.*;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-
 @Command(scope = "odl", name = "configure-bgp", description = "")
 public class ConfigureBgpCli extends OsgiCommandSupport {
 

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java
index 68333f564d9b7b9b1d7f6c606dd6d36a0818bd4e..ce518daa89b9fed183cc086c901fa39aa2d39874 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Neighbor.java
@@ -66,7 +66,7 @@ public class Neighbor extends OsgiCommandSupport {
         }
         BgpManager bm = Commands.getBgpManager();
         switch (action) {
-            case "add" :  
+            case "add" :
                 if (nbrIp == null) {
                     System.err.println("error: "+IP+" needed");
                     return null;
@@ -75,7 +75,7 @@ public class Neighbor extends OsgiCommandSupport {
                     System.err.println("error: Bgp config is not present");
                     return null;
                 }
-                int asn = bm.getConfig().getAsId().getLocalAs().intValue(); 
+                int asn = bm.getConfig().getAsId().getLocalAs().intValue();
                 int hops = 0;
                 if (!Commands.isValid(nbrIp, Commands.IPADDR, IP)) {
                     return null;

diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/OSGI-INF/blueprint/commands.xml b/vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/OSGI-INF/blueprint/commands.xml
index 5935b4c86e832bdf7c320eb8ef0ebbc8719fae07..ef0d4a75922a11bf2cc648b9870849d20fb69eb8 100644 (file)
--- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/OSGI-INF/blueprint/commands.xml
+++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/resources/OSGI-INF/blueprint/commands.xml
@@ -2,14 +2,14 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.ConfigureBgpCli">
+            <action class="org.opendaylight.netvirt.bgpmanager.ConfigureBgpCli">
             </action>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.DisplayBgpConfigCli">
+            <action class="org.opendaylight.netvirt.bgpmanager.DisplayBgpConfigCli">
             </action>
         </command>
     </command-bundle>
@@ -17,54 +17,54 @@
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.VtyshCli"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.VtyshCli"/>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.ClearBgpCli"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.ClearBgpCli"/>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.Connect"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.Connect"/>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.Neighbor"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.Neighbor"/>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.Router"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.Router"/>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.Vrf"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.Vrf"/>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.Network"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.Network"/>
         </command>
     </command-bundle>
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.Misc"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.Misc"/>
         </command>
     </command-bundle>
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
-            <action class="org.opendaylight.bgpmanager.commands.Cache"/>
+            <action class="org.opendaylight.netvirt.bgpmanager.commands.Cache"/>
         </command>
     </command-bundle>