UNOMI-124 : Introduction of private (internal address)
diff --git a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java
index 9995668..366049f 100644
--- a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java
+++ b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ExportConfigurationServiceEndPoint.java
@@ -84,7 +84,7 @@
ExportConfiguration exportConfigSaved = configurationService.save(exportConfiguration);
CloseableHttpClient httpClient = HttpClients.createDefault();
try {
- HttpPut httpPut = new HttpPut("http://localhost:" + configSharingService.getProperty("internalServerPort") + "/configUpdate/exportConfigAdmin");
+ HttpPut httpPut = new HttpPut(configSharingService.getProperty("internalServerAddress") + "/configUpdate/exportConfigAdmin");
StringEntity input = new StringEntity(new ObjectMapper().writeValueAsString(exportConfigSaved));
input.setContentType(MediaType.APPLICATION_JSON);
httpPut.setEntity(input);
@@ -93,7 +93,7 @@
if (response.getStatusLine().getStatusCode() != 200) {
logger.error("Failed to update the running config: Please check the acceccibilty to the URI: \n{}",
- "http://localhost:" + configSharingService.getProperty("internalServerPort") + "/configUpdate/importConfigAdmin");
+ configSharingService.getProperty("internalServerAddress") + "/configUpdate/importConfigAdmin");
logger.error("HTTP Status code returned {}", response.getStatusLine().getStatusCode());
throw new PartialContentException("RUNNING_CONFIG_UPDATE_FAILED");
}
diff --git a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
index 2087e53..7cc6b4e 100644
--- a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
+++ b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
@@ -74,7 +74,7 @@
ImportConfiguration importConfigSaved = configurationService.save(importConfiguration);
CloseableHttpClient httpClient = HttpClients.createDefault();
try {
- HttpPut httpPut = new HttpPut("http://localhost:" + configSharingService.getProperty("internalServerPort") + "/configUpdate/importConfigAdmin");
+ HttpPut httpPut = new HttpPut(configSharingService.getProperty("internalServerAddress") + "/configUpdate/importConfigAdmin");
StringEntity input = new StringEntity(new ObjectMapper().writeValueAsString(importConfigSaved));
input.setContentType(MediaType.APPLICATION_JSON);
httpPut.setEntity(input);
@@ -83,7 +83,7 @@
if (response.getStatusLine().getStatusCode() != 200) {
logger.error("Failed to update the running config: Please check the accessibility to the URI: \n{}",
- "http://localhost:" + configSharingService.getProperty("internalServerPort") + "/configUpdate/importConfigAdmin");
+ configSharingService.getProperty("internalServerAddress") + "/configUpdate/importConfigAdmin");
logger.error("HTTP Status code returned {}", response.getStatusLine().getStatusCode());
throw new PartialContentException("RUNNING_CONFIG_UPDATE_FAILED");
}
diff --git a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index fafb5fd..75fbc01 100644
--- a/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/services/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -230,7 +230,7 @@
<bean id="configSharingServiceImpl" class="org.apache.unomi.services.services.ConfigSharingServiceImpl" destroy-method="preDestroy">
<property name="configProperties">
<map>
- <entry key="internalServerPort" value="${cluster.contextserver.port}" />
+ <entry key="internalServerAddress" value="${cluster.contextserver.internalAddress}" />
</map>
</property>
<property name="bundleContext" ref="blueprintBundleContext"/>
