NETVIRT-1163:No option to configure IPv6 on ODL

No option was available to configure IPv6 in ConfigCli , so adding one

Change-Id: If7b6ec769f7aa41c1494e0bd6b6f793120661a19
Signed-off-by: Loshmitha <loshmitha@ericsson.com>

diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
index c93ea957158a7035678b90309b8cc80421fab031..f8eae51b2fa30071b7ec8d5fc03407d6471d3eb5 100644 (file)
--- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
+++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java
@@ -345,30 +345,29 @@ public class ConfigureBgpCli extends OsgiCommandSupport {
                 session.getConsole().println("error: Address family must be lu/evpn/vpnv4/vpnv6 ");
                 return;
             }
-            try {
-                af_safi.valueOf(addressFamily);
-                af_afi afi;
-                af_safi safi;
-                if (addressFamily.equals("vpnv6")) {
-                    afi = af_afi.findByValue(2);
-                    safi = af_safi.findByValue(5);
-                } else if (addressFamily.equals("evpn")) {
-                    afi = af_afi.findByValue(3);
-                    safi = af_safi.findByValue(6);
-                } else if (addressFamily.equals("lu")) {
-                    afi = af_afi.findByValue(1);
-                    safi = af_safi.findByValue(4);
-                } else { // vpnv4
-                    afi = af_afi.findByValue(1);
-                    safi = af_safi.findByValue(5);
-                }
-                bgpManager.addAddressFamily(ip, afi, safi);
-            } catch (IllegalArgumentException e) {
+
+            af_afi afi ;
+            af_safi safi ;
+            if (addressFamily.equals("vpnv6")) {
+                afi = af_afi.findByValue(2);
+                safi = af_safi.findByValue(5);
+            } else if (addressFamily.equals("evpn")) {
+                afi = af_afi.findByValue(3);
+                safi = af_safi.findByValue(6);
+            } else if (addressFamily.equals("lu")) {
+                afi = af_afi.findByValue(1);
+                safi = af_safi.findByValue(4);
+            } else if  (addressFamily.equals("vpnv4")) {
+                afi = af_afi.findByValue(1);
+                safi = af_safi.findByValue(5);
+            } else {
                 session.getConsole().println(
                         "invalid addressFamily valid values SAFI_IPV4_LABELED_UNICAST | SAFI_MPLS_VPN");
                 printAddNeighborHelp();
-                return;
+                return ;
             }
+            bgpManager.addAddressFamily(ip, afi, safi);
+
         }
         if (getAsNumber(ip) != -1) {
             session.getConsole().println("neighbor with ip " + ip + " already exists");