From df0d44d1534bd7257694848be6331753c2f04f47 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 23 Oct 2014 06:56:53 -0700 Subject: [PATCH] Update docs and tests for /eureka path --- docs/src/main/asciidoc/spring-cloud-netflix.adoc | 4 ++-- .../java/eurekademo/ApplicationTests.java | 4 ++-- .../cloud/netflix/eureka/server/ApplicationTests.java | 6 +++--- .../src/main/resources/application.yml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc index 23e2ef92..41f7936c 100644 --- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc +++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc @@ -41,7 +41,7 @@ public class Application { eureka: client: serviceUrl: - defaultZone: http://localhost:8080/v2/ + defaultZone: http://localhost:8761/eureka/api/ ``` The default application name, virtual host and non-secure port are taken from the `Environment` is @@ -89,7 +89,7 @@ public class Application { ``` The server has a home page with a UI, and HTTP API endpoints per the -normal Eureka functionality under `/v2/*`. +normal Eureka functionality under `/eureka/api/*`. Eureka background reading: see https://github.com/cfregly/fluxcapacitor/wiki/NetflixOSS-FAQ#eureka-service-discovery-load-balancer[flux capacitor] and https://groups.google.com/forum/?fromgroups#!topic/eureka_netflix/g3p2r7gHnN0[google group discussion]. diff --git a/spring-cloud-netflix-eureka-server/java/eurekademo/ApplicationTests.java b/spring-cloud-netflix-eureka-server/java/eurekademo/ApplicationTests.java index 0491c54e..82a8025e 100644 --- a/spring-cloud-netflix-eureka-server/java/eurekademo/ApplicationTests.java +++ b/spring-cloud-netflix-eureka-server/java/eurekademo/ApplicationTests.java @@ -27,14 +27,14 @@ public class ApplicationTests { @Test public void catalogLoads() { @SuppressWarnings("rawtypes") - ResponseEntity entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/v2/apps", Map.class); + ResponseEntity entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/eureka/api/apps", Map.class); assertEquals(HttpStatus.OK, entity.getStatusCode()); } @Test public void adminLoads() { @SuppressWarnings("rawtypes") - ResponseEntity entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/admin/env", Map.class); + ResponseEntity entity = new TestRestTemplate().getForEntity("http://localhost:" + port + "/env", Map.class); assertEquals(HttpStatus.OK, entity.getStatusCode()); } diff --git a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java index cb17881b..564af370 100644 --- a/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java +++ b/spring-cloud-netflix-eureka-server/src/test/java/org/springframework/cloud/netflix/eureka/server/ApplicationTests.java @@ -22,7 +22,7 @@ import org.springframework.test.context.web.WebAppConfiguration; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = Application.class) @WebAppConfiguration -@IntegrationTest({ "server.port=0", "spring.application.name=eureka", "management.contextPath=/admin", "spring.jmx.enabled=true" }) +@IntegrationTest({ "server.port=0", "spring.application.name=eureka", "spring.jmx.enabled=true" }) public class ApplicationTests { @Value("${local.server.port}") @@ -43,7 +43,7 @@ public class ApplicationTests { public void catalogLoads() { @SuppressWarnings("rawtypes") ResponseEntity entity = new TestRestTemplate().getForEntity( - "http://localhost:" + port + "/v2/apps", Map.class); + "http://localhost:" + port + "/eureka/api/apps", Map.class); assertEquals(HttpStatus.OK, entity.getStatusCode()); } @@ -51,7 +51,7 @@ public class ApplicationTests { public void adminLoads() { @SuppressWarnings("rawtypes") ResponseEntity entity = new TestRestTemplate().getForEntity( - "http://localhost:" + port + "/admin/env", Map.class); + "http://localhost:" + port + "/env", Map.class); assertEquals(HttpStatus.OK, entity.getStatusCode()); } diff --git a/spring-cloud-netflix-zuul/src/main/resources/application.yml b/spring-cloud-netflix-zuul/src/main/resources/application.yml index 014037ef..f48d1df3 100644 --- a/spring-cloud-netflix-zuul/src/main/resources/application.yml +++ b/spring-cloud-netflix-zuul/src/main/resources/application.yml @@ -40,8 +40,8 @@ eureka: availabilityZones: default #serviceUrl: - #default: http://localhost:8080/eureka/v2/ - #defaultZone: http://localhost:8080/eureka/v2/ + #default: http://localhost:8761/eureka/api/ + #defaultZone: http://localhost:8761/eureka/api/ instance: #Virtual host name by which the clients identifies this service