JAVA-22208 Fix port to 1030,1031 for jenkins (#15100)
This commit is contained in:
parent
81be7c4ad5
commit
9e3c735879
|
@ -63,12 +63,12 @@ class LoadBalancerBooksClientIntegrationTest {
|
||||||
|
|
||||||
String serviceId = "books-service";
|
String serviceId = "books-service";
|
||||||
RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(ServiceInstanceListSuppliers
|
RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(ServiceInstanceListSuppliers
|
||||||
.toProvider(serviceId, instance(serviceId, "localhost", false), instance(serviceId, "localhost", true)),
|
.toProvider(serviceId, instance(serviceId, "localhost", 1030, false), instance(serviceId, "localhost", 1031, true)),
|
||||||
serviceId, -1);
|
serviceId, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static DefaultServiceInstance instance(String serviceId, String host, boolean secure) {
|
private static DefaultServiceInstance instance(String serviceId, String host, int port, boolean secure) {
|
||||||
return new DefaultServiceInstance(serviceId, serviceId, host, 80, secure);
|
return new DefaultServiceInstance(serviceId, serviceId, host, port, secure);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
@ -80,13 +80,13 @@ class LoadBalancerIntegrationTest {
|
||||||
void staticConfigurationWorks() {
|
void staticConfigurationWorks() {
|
||||||
String serviceId = "test-book-service";
|
String serviceId = "test-book-service";
|
||||||
RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(ServiceInstanceListSuppliers
|
RoundRobinLoadBalancer loadBalancer = new RoundRobinLoadBalancer(ServiceInstanceListSuppliers
|
||||||
.toProvider(serviceId, instance(serviceId, "bookservice1", false), instance(serviceId, "bookservice2", false)),
|
.toProvider(serviceId, instance(serviceId, "bookservice1", 1030, false), instance(serviceId, "bookservice2", 1031, false)),
|
||||||
serviceId, -1);
|
serviceId, -1);
|
||||||
assertLoadBalancer(loadBalancer, Arrays.asList("bookservice1", "bookservice2"));
|
assertLoadBalancer(loadBalancer, Arrays.asList("bookservice1", "bookservice2"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static DefaultServiceInstance instance(String serviceId, String host, boolean secure) {
|
private static DefaultServiceInstance instance(String serviceId, String host, int port, boolean secure) {
|
||||||
return new DefaultServiceInstance(serviceId, serviceId, host, 80, secure);
|
return new DefaultServiceInstance(serviceId, serviceId, host, port, secure);
|
||||||
}
|
}
|
||||||
|
|
||||||
@EnableAutoConfiguration
|
@EnableAutoConfiguration
|
||||||
|
|
|
@ -14,11 +14,11 @@ public class TestConfig {
|
||||||
|
|
||||||
@Bean(initMethod = "start", destroyMethod = "stop")
|
@Bean(initMethod = "start", destroyMethod = "stop")
|
||||||
public WireMockServer mockBooksService() {
|
public WireMockServer mockBooksService() {
|
||||||
return new WireMockServer(options().port(80));
|
return new WireMockServer(options().port(1030));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean(name="secondMockBooksService", initMethod = "start", destroyMethod = "stop")
|
@Bean(name="secondMockBooksService", initMethod = "start", destroyMethod = "stop")
|
||||||
public WireMockServer secondBooksMockService() {
|
public WireMockServer secondBooksMockService() {
|
||||||
return new WireMockServer(options().port(81));
|
return new WireMockServer(options().port(1031));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,11 +11,11 @@ public class WireMockConfig {
|
||||||
|
|
||||||
@Bean(initMethod = "start", destroyMethod = "stop")
|
@Bean(initMethod = "start", destroyMethod = "stop")
|
||||||
public WireMockServer mockBooksService() {
|
public WireMockServer mockBooksService() {
|
||||||
return new WireMockServer(80);
|
return new WireMockServer(1030);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean(initMethod = "start", destroyMethod = "stop")
|
@Bean(initMethod = "start", destroyMethod = "stop")
|
||||||
public WireMockServer mockBooksService2() {
|
public WireMockServer mockBooksService2() {
|
||||||
return new WireMockServer(81);
|
return new WireMockServer(1031);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
eureka:
|
|
||||||
client:
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
spring:
|
|
||||||
application:
|
|
||||||
name: books-service
|
|
||||||
cloud:
|
|
||||||
loadbalancer:
|
|
||||||
ribbon:
|
|
||||||
enabled: false
|
|
||||||
discovery:
|
|
||||||
client:
|
|
||||||
simple:
|
|
||||||
instances:
|
|
||||||
books-service[0]:
|
|
||||||
uri: http://localhost:80
|
|
||||||
books-service[1]:
|
|
||||||
uri: http://localhost:81
|
|
|
@ -14,6 +14,6 @@ spring:
|
||||||
simple:
|
simple:
|
||||||
instances:
|
instances:
|
||||||
books-service[0]:
|
books-service[0]:
|
||||||
uri: http://localhost:80
|
uri: http://localhost:1030
|
||||||
books-service[1]:
|
books-service[1]:
|
||||||
uri: http://localhost:81
|
uri: http://localhost:1031
|
||||||
|
|
Loading…
Reference in New Issue