From 5d25b2c1343f9403f5e00ecb15714bbc15011dcf Mon Sep 17 00:00:00 2001 From: Shakib Ahmed Date: Wed, 24 May 2017 02:50:10 -0700 Subject: [PATCH] Update ODL Tenant IP to ODL IP Change-Id: Ifeae3b37576a60cd20b1ee156fda20c7f5c85f6c Signed-off-by: Shakib Ahmed --- .../groupbasedpolicy/renderer/vpp/config/ConfigUtil.java | 4 ++-- .../renderer/vpp/config/ConfigurationService.java | 2 +- renderers/vpp/src/main/resources/startup.cfg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 221b3508b..1f9118ee6 100644 --- 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 14977b45c..c6b44e927 100644 --- 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 04c908bad..9e696f658 100644 --- 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. -- 2.36.6