SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prove s.c.c.discovery.{hostname|ipAddress} work

Browse Source
This commit is contained in:
Spencer Gibb
2016-03-21 11:47:21 -06:00
parent 8db3c72c33
commit a6803340c2
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
View File

@@ -138,6 +138,16 @@ public class ConsulDiscoveryProperties {
return this.preferIpAddress ? this.ipAddress : this.hostname;
}
public void setHostname(String hostname) {
this.hostname = hostname;
this.hostInfo.override = true;
}
public void setIpAddress(String ipAddress) {
this.ipAddress = ipAddress;
this.hostInfo.override = true;
}
@Data
public class Lifecycle {
private boolean enabled = true;

25
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedPropsTests.java
View File

@@ -16,10 +16,6 @@
package org.springframework.cloud.consul.discovery;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Map;
import org.junit.FixMethodOrder;
@@ -40,6 +36,9 @@ import com.ecwid.consul.v1.ConsulClient;
import com.ecwid.consul.v1.Response;
import com.ecwid.consul.v1.agent.model.Service;
import static org.junit.Assert.assertThat;
import static org.hamcrest.Matchers.*;
/**
* @author Spencer Gibb
*/
@@ -48,7 +47,9 @@ import com.ecwid.consul.v1.agent.model.Service;
@SpringApplicationConfiguration(classes = TestPropsConfig.class)
@WebIntegrationTest(value = { "spring.application.name=myTestService",
"spring.cloud.consul.discovery.instanceId=myTestService1",
"spring.cloud.consul.discovery.port=4452"}, randomPort = true)
"spring.cloud.consul.discovery.port=4452",
"spring.cloud.consul.discovery.hostname=myhost",
"spring.cloud.consul.discovery.ipAddress=10.0.0.1"}, randomPort = true)
public class ConsulLifecycleCustomizedPropsTests {
@Autowired
@@ -60,15 +61,21 @@ public class ConsulLifecycleCustomizedPropsTests {
@Autowired
ApplicationContext context;
@Autowired
ConsulDiscoveryProperties properties;
@Test
public void contextLoads() {
Response<Map<String, Service>> response = consul.getAgentServices();
Map<String, Service> services = response.getValue();
Service service = services.get("myTestService1");
assertNotNull("service was null", service);
assertEquals("service port is discovery port", 4452, service.getPort().intValue());
assertEquals("service id was wrong", "myTestService1", service.getId());
assertEquals("service name was wrong", "myTestService", service.getService());
assertThat("service was null", service, is(notNullValue()));
assertThat("service port is discovery port", 4452, equalTo(service.getPort()));
assertThat("service id was wrong", "myTestService1", equalTo(service.getId()));
assertThat("service name was wrong", "myTestService", equalTo(service.getService()));
assertThat("property hostname was wrong", "myhost", equalTo(this.properties.getHostname()));
assertThat("property ipAddress was wrong", "10.0.0.1", equalTo(this.properties.getIpAddress()));
assertThat("service address was wrong", "myhost", equalTo(service.getAddress()));
}
}