Merge pull request #195 from aantono/master

* pull195:
  Allow customized Management Port.

.gitignore

@@ -10,6 +10,7 @@ target/
 _site/
 .idea
 *.iml
+*.ipr
 .factorypath
 *.swp
 /consul

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

@@ -80,6 +80,9 @@ public class ConsulDiscoveryProperties {
 	/** Port to register the service under (defaults to listening port) */
 	private Integer port;
 
+	/** Port to register the management service under (defaults to management port) */
+	private Integer managementPort;
+
 	private Lifecycle lifecycle = new Lifecycle();
 
 	/**

spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java

@@ -221,6 +221,17 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
 		return normalizeForDns(getAppName()) + SEPARATOR + properties.getManagementSuffix();
 	}
 
+	/**
+	 * @return the port of the Management Service
+	 */
+	protected Integer getManagementPort() {
+		// If an alternate external port is specified, use it instead
+		if (properties.getManagementPort() != null) {
+			return properties.getManagementPort();
+		}
+		return super.getManagementPort();
+	}
+
 	public static String normalizeForDns(String s) {
 		if (s == null || !Character.isLetter(s.charAt(0))
 				|| !Character.isLetterOrDigit(s.charAt(s.length()-1))) {

spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedManagementServicePortTests.java

@@ -0,0 +1,69 @@
+package org.springframework.cloud.consul.discovery;
+
+import com.ecwid.consul.v1.ConsulClient;
+import com.ecwid.consul.v1.Response;
+import com.ecwid.consul.v1.agent.model.Service;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.autoconfigure.ManagementServerProperties;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.WebIntegrationTest;
+import org.springframework.cloud.consul.ConsulAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Aleksandr Tarasov (aatarasov)
+ * @author Alex Antonov (aantonov)
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@SpringApplicationConfiguration(classes = TestConfig.class)
+@WebIntegrationTest(value = {"spring.application.name=myTestService-G",
+		"spring.cloud.consul.discovery.instanceId=myTestService1-G",
+		"spring.cloud.consul.discovery.managementPort=4452", "management.port=0"}, randomPort = true)
+public class ConsulLifecycleCustomizedManagementServicePortTests {
+	@Autowired
+	ConsulLifecycle lifecycle;
+
+	@Autowired
+	ConsulClient consul;
+
+	@Autowired
+	ConsulDiscoveryProperties discoveryProperties;
+
+	@Autowired
+	ManagementServerProperties managementServerProperties;
+
+	@Test
+	public void contextLoads() {
+		Response<Map<String, Service>> response = consul.getAgentServices();
+		Map<String, Service> services = response.getValue();
+		Service service = services.get("myTestService-G-0-management");
+		assertNotNull("service was null", service);
+		assertEquals("service port is not 4452", 4452, service.getPort().intValue());
+		assertEquals("management port is not 0", 0, managementServerProperties.getPort().intValue());
+		assertEquals("service id was wrong", "myTestService-G-0-management", service.getId());
+		assertEquals("service name was wrong", "myTestService-G-management", service.getService());
+		assertFalse("service address must not be empty", StringUtils.isEmpty(service.getAddress()));
+		assertEquals("service address must equals hostname from discovery properties", discoveryProperties.getHostname(), service.getAddress());
+	}
+
+	@Configuration
+	@EnableAutoConfiguration
+	@Import({ConsulAutoConfiguration.class,
+			ConsulDiscoveryClientConfiguration.class})
+	public static class TestConfig {
+
+	}
+}