Update ODL Tenant IP to ODL IP

Change-Id: Ifeae3b37576a60cd20b1ee156fda20c7f5c85f6c
Signed-off-by: Shakib Ahmed <sheikahm@cisco.com>

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigUtil.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigUtil.java
index 221b3508b10a2334b6e742692df332581431c2df..1f9118ee65d151391f716e78a691f97b369db85c 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigUtil.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigUtil.java
@@ -32,7 +32,7 @@ public class ConfigUtil {
     private boolean lispMapRegisterEnabled = DEFAULT_LISP_MAPREGISTER_ENABLED;
     private boolean l3FlatEnabled = DEFAULT_L3_FLAT_ENABLED;
 
-    static final String ODL_TENANT_IP = "odl.ip.tenant";
+    static final String ODL_IP = "odl.ip";
     static final String LISP_OVERLAY_ENABLED = "gbp.lisp.enabled";
     static final String LISP_MAPREGISTER_ENABLED = "vpp.lisp.mapregister.enabled";
     static final String L3_FLAT_ENABLED = "vpp.l3.flat.enabled";
@@ -67,7 +67,7 @@ public class ConfigUtil {
         if (configStr == null) {
             odlTenantIp = null;
             LOG.debug("Configuration variable {} is being unset. Setting the variable to null",
-                    ODL_TENANT_IP);
+                    ODL_IP);
             return;
         }
         odlTenantIp = new IpAddress(configStr.trim().toCharArray());

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigurationService.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigurationService.java
index 14977b45ce5206164640d81c4ad76d7b224bb470..c6b44e927ae936a94ea635236c635ff599b4f011 100644 (file)
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigurationService.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/config/ConfigurationService.java
@@ -71,7 +71,7 @@ public class ConfigurationService implements ManagedService{
     private void mapConfigMethods() {
         configMethods = new HashMap<>();
 
-        configMethods.put(ConfigUtil.ODL_TENANT_IP,
+        configMethods.put(ConfigUtil.ODL_IP,
                 ip -> configUtil.configureOdlTenantIp((String) ip));
         configMethods.put(ConfigUtil.LISP_MAPREGISTER_ENABLED,
                 mrConfig -> configUtil.configureMapRegister((String) mrConfig));

diff --git a/renderers/vpp/src/main/resources/startup.cfg b/renderers/vpp/src/main/resources/startup.cfg
index 04c908bad27405970908774d755036de9dc04774..9e696f658f666117568b481d14e0f3378b479521 100644 (file)
--- a/renderers/vpp/src/main/resources/startup.cfg
+++ b/renderers/vpp/src/main/resources/startup.cfg
@@ -10,7 +10,7 @@
 
 # This property should be  set to the Ip address the ODL can be reached from tenant network.
 # Valid config: Ip Address (IPv4/ IPv6)
-#odl.ip.tenant = 10.0.0.1
+#odl.ip = 10.0.0.1
 
 # This property should be true if L3 overlay is desired. If `true`, GBP will
 # push LISP configurations in VPP.