Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
xiaolongzuo
6 years ago
commit
9d3a57e02d
@ -0,0 +1 @@
|
|||||||
|
language: java
|
||||||
@ -1,83 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2018 the original author or authors.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package org.springframework.cloud.alibaba.nacos;
|
|
||||||
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigurations;
|
|
||||||
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
|
|
||||||
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
|
|
||||||
import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
|
|
||||||
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
|
|
||||||
import org.springframework.cloud.commons.util.InetUtils;
|
|
||||||
import org.springframework.cloud.commons.util.InetUtilsProperties;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
|
|
||||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @author xiaojing
|
|
||||||
*/
|
|
||||||
public class NacosDiscoveryAutoConfigurationTests {
|
|
||||||
|
|
||||||
private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner()
|
|
||||||
.withConfiguration(
|
|
||||||
AutoConfigurations.of(NacosDiscoveryTestConfiguration.class,
|
|
||||||
NacosDiscoveryAutoConfiguration.class,
|
|
||||||
NacosDiscoveryClientAutoConfiguration.class))
|
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080")
|
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.port=18080")
|
|
||||||
.withPropertyValues("spring.cloud.nacos.discovery.service=myapp");
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testProperties() {
|
|
||||||
this.contextRunner.run(context -> {
|
|
||||||
NacosDiscoveryProperties properties = context
|
|
||||||
.getBean(NacosDiscoveryProperties.class);
|
|
||||||
assertThat(properties.getPort()).isEqualTo(18080);
|
|
||||||
assertThat(properties.getServerAddr()).isEqualTo("127.0.0.1:8080");
|
|
||||||
assertThat(properties.getService()).isEqualTo("myapp");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void nacosRegistration() {
|
|
||||||
this.contextRunner.run(context -> {
|
|
||||||
NacosRegistration nacosRegistration = context
|
|
||||||
.getBean(NacosRegistration.class);
|
|
||||||
assertThat(nacosRegistration.getPort()).isEqualTo(18080);
|
|
||||||
assertThat(nacosRegistration.getServiceId()).isEqualTo("myapp");
|
|
||||||
assertThat(nacosRegistration.getRegisterWeight()).isEqualTo(1F);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@AutoConfigureBefore(NacosDiscoveryAutoConfiguration.class)
|
|
||||||
static class NacosDiscoveryTestConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
AutoServiceRegistrationProperties autoServiceRegistrationProperties() {
|
|
||||||
return new AutoServiceRegistrationProperties();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
InetUtils inetUtils() {
|
|
||||||
return new InetUtils(new InetUtilsProperties());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -0,0 +1,126 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.alibaba.nacos.api.naming.NamingService;
|
||||||
|
import com.alibaba.nacos.api.naming.pojo.Instance;
|
||||||
|
import com.alibaba.nacos.api.naming.pojo.ListView;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.springframework.cloud.client.ServiceInstance;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
import static org.springframework.cloud.alibaba.nacos.test.NacosMockTest.serviceInstance;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
public class NacosDiscoveryClientTests {
|
||||||
|
|
||||||
|
private String host = "123.123.123.123";
|
||||||
|
private int port = 8888;
|
||||||
|
private String serviceName = "test-service";
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetServers() throws Exception {
|
||||||
|
|
||||||
|
ArrayList<Instance> instances = new ArrayList<>();
|
||||||
|
|
||||||
|
HashMap<String, String> map = new HashMap<>();
|
||||||
|
map.put("test-key", "test-value");
|
||||||
|
map.put("secure", "true");
|
||||||
|
|
||||||
|
instances.add(serviceInstance(serviceName, false, host, port, map));
|
||||||
|
|
||||||
|
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
||||||
|
NacosDiscoveryProperties.class);
|
||||||
|
|
||||||
|
NamingService namingService = mock(NamingService.class);
|
||||||
|
|
||||||
|
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
||||||
|
when(namingService.selectInstances(eq(serviceName), eq(true)))
|
||||||
|
.thenReturn(instances);
|
||||||
|
|
||||||
|
NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient(
|
||||||
|
nacosDiscoveryProperties);
|
||||||
|
|
||||||
|
List<ServiceInstance> serviceInstances = discoveryClient
|
||||||
|
.getInstances(serviceName);
|
||||||
|
|
||||||
|
assertThat(serviceInstances.size()).isEqualTo(1);
|
||||||
|
|
||||||
|
ServiceInstance serviceInstance = serviceInstances.get(0);
|
||||||
|
|
||||||
|
assertThat(serviceInstance.getServiceId()).isEqualTo(serviceName);
|
||||||
|
assertThat(serviceInstance.getHost()).isEqualTo(host);
|
||||||
|
assertThat(serviceInstance.getPort()).isEqualTo(port);
|
||||||
|
assertThat(serviceInstance.isSecure()).isEqualTo(true);
|
||||||
|
assertThat(serviceInstance.getUri().toString())
|
||||||
|
.isEqualTo(getUri(serviceInstance));
|
||||||
|
assertThat(serviceInstance.getMetadata().get("test-key")).isEqualTo("test-value");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetAllService() throws Exception {
|
||||||
|
|
||||||
|
ListView<String> nacosServices = new ListView<>();
|
||||||
|
|
||||||
|
nacosServices.setData(new LinkedList<>());
|
||||||
|
|
||||||
|
nacosServices.getData().add(serviceName + "1");
|
||||||
|
nacosServices.getData().add(serviceName + "2");
|
||||||
|
nacosServices.getData().add(serviceName + "3");
|
||||||
|
|
||||||
|
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
||||||
|
NacosDiscoveryProperties.class);
|
||||||
|
|
||||||
|
NamingService namingService = mock(NamingService.class);
|
||||||
|
|
||||||
|
NacosDiscoveryClient discoveryClient = new NacosDiscoveryClient(
|
||||||
|
nacosDiscoveryProperties);
|
||||||
|
|
||||||
|
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
||||||
|
when(namingService.getServicesOfServer(eq(1), eq(Integer.MAX_VALUE)))
|
||||||
|
.thenReturn(nacosServices);
|
||||||
|
|
||||||
|
List<String> services = discoveryClient.getServices();
|
||||||
|
|
||||||
|
assertThat(services.size()).isEqualTo(3);
|
||||||
|
assertThat(services.contains(serviceName + "1"));
|
||||||
|
assertThat(services.contains(serviceName + "2"));
|
||||||
|
assertThat(services.contains(serviceName + "3"));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getUri(ServiceInstance instance) {
|
||||||
|
|
||||||
|
if (instance.isSecure()) {
|
||||||
|
return "https://" + host + ":" + port;
|
||||||
|
}
|
||||||
|
|
||||||
|
return "http://" + host + ":" + port;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,147 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.registry;
|
||||||
|
|
||||||
|
import java.net.Inet4Address;
|
||||||
|
import java.net.InetAddress;
|
||||||
|
import java.net.NetworkInterface;
|
||||||
|
import java.util.Enumeration;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
|
||||||
|
import org.springframework.cloud.commons.util.InetUtils;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
|
||||||
|
@RunWith(SpringRunner.class)
|
||||||
|
@SpringBootTest(classes = NacosAutoServiceRegistrationIpNetworkInterfaceTests.TestConfig.class, properties = {
|
||||||
|
"spring.application.name=myTestService1",
|
||||||
|
"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848" }, webEnvironment = RANDOM_PORT)
|
||||||
|
public class NacosAutoServiceRegistrationIpNetworkInterfaceTests {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosRegistration registration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosAutoServiceRegistration nacosAutoServiceRegistration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosDiscoveryProperties properties;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private InetUtils inetUtils;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void contextLoads() throws Exception {
|
||||||
|
|
||||||
|
assertNotNull("NacosRegistration was not created", registration);
|
||||||
|
assertNotNull("NacosDiscoveryProperties was not created", properties);
|
||||||
|
assertNotNull("NacosAutoServiceRegistration was not created",
|
||||||
|
nacosAutoServiceRegistration);
|
||||||
|
|
||||||
|
checkoutNacosDiscoveryServiceIP();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryServiceIP() {
|
||||||
|
assertEquals("NacosDiscoveryProperties service IP was wrong",
|
||||||
|
getIPFromNetworkInterface(TestConfig.netWorkInterfaceName),
|
||||||
|
registration.getHost());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getIPFromNetworkInterface(String networkInterface) {
|
||||||
|
|
||||||
|
if (!TestConfig.hasValidNetworkInterface) {
|
||||||
|
return inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
NetworkInterface netInterface = NetworkInterface.getByName(networkInterface);
|
||||||
|
|
||||||
|
Enumeration<InetAddress> inetAddress = netInterface.getInetAddresses();
|
||||||
|
while (inetAddress.hasMoreElements()) {
|
||||||
|
InetAddress currentAddress = inetAddress.nextElement();
|
||||||
|
if (currentAddress instanceof Inet4Address
|
||||||
|
&& !currentAddress.isLoopbackAddress()) {
|
||||||
|
return currentAddress.getHostAddress();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return networkInterface;
|
||||||
|
}
|
||||||
|
catch (Exception e) {
|
||||||
|
return networkInterface;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableAutoConfiguration
|
||||||
|
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
|
||||||
|
NacosDiscoveryClientAutoConfiguration.class,
|
||||||
|
NacosDiscoveryAutoConfiguration.class })
|
||||||
|
public static class TestConfig {
|
||||||
|
|
||||||
|
static boolean hasValidNetworkInterface = false;
|
||||||
|
static String netWorkInterfaceName;
|
||||||
|
|
||||||
|
static {
|
||||||
|
|
||||||
|
try {
|
||||||
|
Enumeration<NetworkInterface> enumeration = NetworkInterface
|
||||||
|
.getNetworkInterfaces();
|
||||||
|
while (enumeration.hasMoreElements() && !hasValidNetworkInterface) {
|
||||||
|
NetworkInterface networkInterface = enumeration.nextElement();
|
||||||
|
Enumeration<InetAddress> inetAddress = networkInterface
|
||||||
|
.getInetAddresses();
|
||||||
|
while (inetAddress.hasMoreElements()) {
|
||||||
|
InetAddress currentAddress = inetAddress.nextElement();
|
||||||
|
if (currentAddress instanceof Inet4Address
|
||||||
|
&& !currentAddress.isLoopbackAddress()) {
|
||||||
|
hasValidNetworkInterface = true;
|
||||||
|
netWorkInterfaceName = networkInterface.getName();
|
||||||
|
System.setProperty(
|
||||||
|
"spring.cloud.nacos.discovery.network-interface",
|
||||||
|
networkInterface.getName());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception e) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,82 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.registry;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
|
||||||
|
@RunWith(SpringRunner.class)
|
||||||
|
@SpringBootTest(classes = NacosAutoServiceRegistrationIpTests.TestConfig.class, properties = {
|
||||||
|
"spring.application.name=myTestService1",
|
||||||
|
"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848",
|
||||||
|
"spring.cloud.nacos.discovery.ip=123.123.123.123" }, webEnvironment = RANDOM_PORT)
|
||||||
|
public class NacosAutoServiceRegistrationIpTests {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosRegistration registration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosAutoServiceRegistration nacosAutoServiceRegistration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosDiscoveryProperties properties;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void contextLoads() throws Exception {
|
||||||
|
|
||||||
|
assertNotNull("NacosRegistration was not created", registration);
|
||||||
|
assertNotNull("NacosDiscoveryProperties was not created", properties);
|
||||||
|
assertNotNull("NacosAutoServiceRegistration was not created",
|
||||||
|
nacosAutoServiceRegistration);
|
||||||
|
|
||||||
|
checkoutNacosDiscoveryServiceIP();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryServiceIP() {
|
||||||
|
assertEquals("NacosDiscoveryProperties service IP was wrong", "123.123.123.123",
|
||||||
|
registration.getHost());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableAutoConfiguration
|
||||||
|
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
|
||||||
|
NacosDiscoveryClientAutoConfiguration.class,
|
||||||
|
NacosDiscoveryAutoConfiguration.class })
|
||||||
|
public static class TestConfig {
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.registry;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||||
|
import static org.springframework.cloud.alibaba.nacos.registry.NacosRegistration.MANAGEMENT_PORT;
|
||||||
|
import static org.springframework.cloud.alibaba.nacos.registry.NacosRegistration.MANAGEMENT_CONTEXT_PATH;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
|
||||||
|
@RunWith(SpringRunner.class)
|
||||||
|
@SpringBootTest(classes = NacosAutoServiceRegistrationManagementPortTests.TestConfig.class, properties = {
|
||||||
|
"spring.application.name=myTestService1", "management.server.port=8888",
|
||||||
|
"management.server.servlet.context-path=/test-context-path",
|
||||||
|
"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848",
|
||||||
|
"spring.cloud.nacos.discovery.port=8888" }, webEnvironment = RANDOM_PORT)
|
||||||
|
public class NacosAutoServiceRegistrationManagementPortTests {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosRegistration registration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosAutoServiceRegistration nacosAutoServiceRegistration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosDiscoveryProperties properties;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void contextLoads() throws Exception {
|
||||||
|
|
||||||
|
assertNotNull("NacosRegistration was not created", registration);
|
||||||
|
assertNotNull("NacosDiscoveryProperties was not created", properties);
|
||||||
|
assertNotNull("NacosAutoServiceRegistration was not created",
|
||||||
|
nacosAutoServiceRegistration);
|
||||||
|
|
||||||
|
checkoutNacosDiscoveryManagementData();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryManagementData() {
|
||||||
|
assertEquals("NacosDiscoveryProperties management port was wrong", "8888",
|
||||||
|
properties.getMetadata().get(MANAGEMENT_PORT));
|
||||||
|
|
||||||
|
assertEquals("NacosDiscoveryProperties management context path was wrong",
|
||||||
|
"/test-context-path",
|
||||||
|
properties.getMetadata().get(MANAGEMENT_CONTEXT_PATH));
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableAutoConfiguration
|
||||||
|
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
|
||||||
|
NacosDiscoveryClientAutoConfiguration.class,
|
||||||
|
NacosDiscoveryAutoConfiguration.class })
|
||||||
|
public static class TestConfig {
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,82 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.registry;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
|
||||||
|
@RunWith(SpringRunner.class)
|
||||||
|
@SpringBootTest(classes = NacosAutoServiceRegistrationPortTests.TestConfig.class, properties = {
|
||||||
|
"spring.application.name=myTestService1",
|
||||||
|
"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848",
|
||||||
|
"spring.cloud.nacos.discovery.port=8888" }, webEnvironment = RANDOM_PORT)
|
||||||
|
public class NacosAutoServiceRegistrationPortTests {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosRegistration registration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosAutoServiceRegistration nacosAutoServiceRegistration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosDiscoveryProperties properties;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void contextLoads() throws Exception {
|
||||||
|
|
||||||
|
assertNotNull("NacosRegistration was not created", registration);
|
||||||
|
assertNotNull("NacosDiscoveryProperties was not created", properties);
|
||||||
|
assertNotNull("NacosAutoServiceRegistration was not created",
|
||||||
|
nacosAutoServiceRegistration);
|
||||||
|
|
||||||
|
checkoutNacosDiscoveryServicePort();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryServicePort() {
|
||||||
|
assertEquals("NacosDiscoveryProperties service Port was wrong", 8888,
|
||||||
|
registration.getPort());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableAutoConfiguration
|
||||||
|
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
|
||||||
|
NacosDiscoveryClientAutoConfiguration.class,
|
||||||
|
NacosDiscoveryAutoConfiguration.class })
|
||||||
|
public static class TestConfig {
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,199 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.registry;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||||
|
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
|
||||||
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
|
import org.springframework.boot.web.server.LocalServerPort;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpoint;
|
||||||
|
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
|
||||||
|
import org.springframework.cloud.commons.util.InetUtils;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.test.context.junit4.SpringRunner;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
|
||||||
|
@RunWith(SpringRunner.class)
|
||||||
|
@SpringBootTest(classes = NacosAutoServiceRegistrationTests.TestConfig.class, properties = {
|
||||||
|
"spring.application.name=myTestService1",
|
||||||
|
"spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848",
|
||||||
|
"spring.cloud.nacos.discovery.endpoint=test-endpoint",
|
||||||
|
"spring.cloud.nacos.discovery.namespace=test-namespace",
|
||||||
|
"spring.cloud.nacos.discovery.log-name=test-logName",
|
||||||
|
"spring.cloud.nacos.discovery.weight=2",
|
||||||
|
"spring.cloud.nacos.discovery.clusterName=test-cluster",
|
||||||
|
"spring.cloud.nacos.discovery.namingLoadCacheAtStart=true",
|
||||||
|
"spring.cloud.nacos.discovery.secure=true",
|
||||||
|
"spring.cloud.nacos.discovery.accessKey=test-accessKey",
|
||||||
|
"spring.cloud.nacos.discovery.secretKey=test-secretKey" }, webEnvironment = RANDOM_PORT)
|
||||||
|
public class NacosAutoServiceRegistrationTests {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosRegistration registration;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosAutoServiceRegistration nacosAutoServiceRegistration;
|
||||||
|
|
||||||
|
@LocalServerPort
|
||||||
|
private int port;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private NacosDiscoveryProperties properties;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private InetUtils inetUtils;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void contextLoads() throws Exception {
|
||||||
|
|
||||||
|
assertNotNull("NacosRegistration was not created", registration);
|
||||||
|
assertNotNull("NacosDiscoveryProperties was not created", properties);
|
||||||
|
assertNotNull("NacosAutoServiceRegistration was not created",
|
||||||
|
nacosAutoServiceRegistration);
|
||||||
|
|
||||||
|
checkoutNacosDiscoveryServerAddr();
|
||||||
|
checkoutNacosDiscoveryEndpoint();
|
||||||
|
checkoutNacosDiscoveryNamespace();
|
||||||
|
checkoutNacosDiscoveryLogName();
|
||||||
|
checkoutNacosDiscoveryWeight();
|
||||||
|
checkoutNacosDiscoveryClusterName();
|
||||||
|
checkoutNacosDiscoveryCache();
|
||||||
|
checkoutNacosDiscoverySecure();
|
||||||
|
checkoutNacosDiscoveryAccessKey();
|
||||||
|
checkoutNacosDiscoverySecrectKey();
|
||||||
|
|
||||||
|
checkoutNacosDiscoveryServiceName();
|
||||||
|
checkoutNacosDiscoveryServiceIP();
|
||||||
|
checkoutNacosDiscoveryServicePort();
|
||||||
|
|
||||||
|
checkAutoRegister();
|
||||||
|
|
||||||
|
checkoutEndpoint();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkAutoRegister() {
|
||||||
|
assertTrue("Nacos Auto Registration was not start",
|
||||||
|
nacosAutoServiceRegistration.isRunning());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryServerAddr() {
|
||||||
|
assertEquals("NacosDiscoveryProperties server address was wrong",
|
||||||
|
"127.0.0.1:8848", properties.getServerAddr());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryEndpoint() {
|
||||||
|
assertEquals("NacosDiscoveryProperties endpoint was wrong", "test-endpoint",
|
||||||
|
properties.getEndpoint());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryNamespace() {
|
||||||
|
assertEquals("NacosDiscoveryProperties namespace was wrong", "test-namespace",
|
||||||
|
properties.getNamespace());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryLogName() {
|
||||||
|
assertEquals("NacosDiscoveryProperties logName was wrong", "test-logName",
|
||||||
|
properties.getLogName());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryWeight() {
|
||||||
|
assertEquals(2, properties.getWeight(), 0.00000001);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryClusterName() {
|
||||||
|
assertEquals("NacosDiscoveryProperties cluster was wrong", "test-cluster",
|
||||||
|
properties.getClusterName());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryCache() {
|
||||||
|
assertEquals("NacosDiscoveryProperties naming load cache was wrong", "true",
|
||||||
|
properties.getNamingLoadCacheAtStart());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoverySecure() {
|
||||||
|
assertEquals("NacosDiscoveryProperties is secure was wrong", true,
|
||||||
|
properties.isSecure());
|
||||||
|
assertEquals("NacosDiscoveryProperties is secure was wrong", "true",
|
||||||
|
properties.getMetadata().get("secure"));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryAccessKey() {
|
||||||
|
assertEquals("NacosDiscoveryProperties is access key was wrong", "test-accessKey",
|
||||||
|
properties.getAccessKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoverySecrectKey() {
|
||||||
|
assertEquals("NacosDiscoveryProperties is secret key was wrong", "test-secretKey",
|
||||||
|
properties.getSecretKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryServiceName() {
|
||||||
|
assertEquals("NacosDiscoveryProperties service name was wrong", "myTestService1",
|
||||||
|
properties.getService());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryServiceIP() {
|
||||||
|
assertEquals("NacosDiscoveryProperties service IP was wrong",
|
||||||
|
inetUtils.findFirstNonLoopbackHostInfo().getIpAddress(),
|
||||||
|
registration.getHost());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutNacosDiscoveryServicePort() {
|
||||||
|
assertEquals("NacosDiscoveryProperties service Port was wrong", port,
|
||||||
|
registration.getPort());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void checkoutEndpoint() throws Exception {
|
||||||
|
NacosDiscoveryEndpoint nacosDiscoveryEndpoint = new NacosDiscoveryEndpoint(
|
||||||
|
properties);
|
||||||
|
Map<String, Object> map = nacosDiscoveryEndpoint.nacosDiscovery();
|
||||||
|
assertEquals(map.get("NacosDiscoveryProperties"), properties);
|
||||||
|
assertEquals(map.get("subscribe"),
|
||||||
|
properties.namingServiceInstance().getSubscribeServices());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
@EnableAutoConfiguration
|
||||||
|
@ImportAutoConfiguration({ AutoServiceRegistrationConfiguration.class,
|
||||||
|
NacosDiscoveryClientAutoConfiguration.class,
|
||||||
|
NacosDiscoveryAutoConfiguration.class })
|
||||||
|
public static class TestConfig {
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,159 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.ribbon;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import com.alibaba.nacos.api.naming.NamingService;
|
||||||
|
import com.alibaba.nacos.api.naming.pojo.Instance;
|
||||||
|
|
||||||
|
import com.netflix.client.config.IClientConfig;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
|
||||||
|
|
||||||
|
import static org.assertj.core.api.Assertions.assertThat;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
|
import static org.mockito.ArgumentMatchers.eq;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
import static org.springframework.cloud.alibaba.nacos.test.NacosMockTest.serviceInstance;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
|
||||||
|
public class NacosServerListTests {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public void testEmptyInstancesReturnsEmptyList() throws Exception {
|
||||||
|
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
||||||
|
NacosDiscoveryProperties.class);
|
||||||
|
|
||||||
|
NamingService namingService = mock(NamingService.class);
|
||||||
|
|
||||||
|
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
||||||
|
when(namingService.selectInstances(anyString(), eq(true))).thenReturn(null);
|
||||||
|
|
||||||
|
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
||||||
|
List<NacosServer> servers = serverList.getInitialListOfServers();
|
||||||
|
assertThat(servers).isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public void testGetServers() throws Exception {
|
||||||
|
|
||||||
|
ArrayList<Instance> instances = new ArrayList<>();
|
||||||
|
instances.add(serviceInstance("test-service", false, Collections.emptyMap()));
|
||||||
|
|
||||||
|
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
||||||
|
NacosDiscoveryProperties.class);
|
||||||
|
|
||||||
|
NamingService namingService = mock(NamingService.class);
|
||||||
|
|
||||||
|
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
||||||
|
when(namingService.selectInstances(eq("test-service"), eq(true)))
|
||||||
|
.thenReturn(instances);
|
||||||
|
|
||||||
|
IClientConfig clientConfig = mock(IClientConfig.class);
|
||||||
|
when(clientConfig.getClientName()).thenReturn("test-service");
|
||||||
|
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
||||||
|
serverList.initWithNiwsConfig(clientConfig);
|
||||||
|
List<NacosServer> servers = serverList.getInitialListOfServers();
|
||||||
|
assertThat(servers).hasSize(1);
|
||||||
|
|
||||||
|
servers = serverList.getUpdatedListOfServers();
|
||||||
|
assertThat(servers).hasSize(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
public void testGetServersWithInstanceStatus() throws Exception {
|
||||||
|
ArrayList<Instance> instances = new ArrayList<>();
|
||||||
|
|
||||||
|
HashMap<String, String> map1 = new HashMap<>();
|
||||||
|
map1.put("instanceNum", "1");
|
||||||
|
HashMap<String, String> map2 = new HashMap<>();
|
||||||
|
map2.put("instanceNum", "2");
|
||||||
|
instances.add(serviceInstance("test-service", false, map1));
|
||||||
|
instances.add(serviceInstance("test-service", true, map2));
|
||||||
|
|
||||||
|
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
||||||
|
NacosDiscoveryProperties.class);
|
||||||
|
|
||||||
|
NamingService namingService = mock(NamingService.class);
|
||||||
|
|
||||||
|
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
||||||
|
when(namingService.selectInstances(eq("test-service"), eq(true)))
|
||||||
|
.thenReturn(instances.stream().filter(Instance::isHealthy)
|
||||||
|
.collect(Collectors.toList()));
|
||||||
|
|
||||||
|
IClientConfig clientConfig = mock(IClientConfig.class);
|
||||||
|
when(clientConfig.getClientName()).thenReturn("test-service");
|
||||||
|
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
||||||
|
serverList.initWithNiwsConfig(clientConfig);
|
||||||
|
List<NacosServer> servers = serverList.getInitialListOfServers();
|
||||||
|
assertThat(servers).hasSize(1);
|
||||||
|
|
||||||
|
NacosServer nacosServer = servers.get(0);
|
||||||
|
|
||||||
|
assertThat(nacosServer.getMetaInfo().getInstanceId())
|
||||||
|
.isEqualTo(instances.get(1).getInstanceId());
|
||||||
|
assertThat(nacosServer.getMetadata()).isEqualTo(map2);
|
||||||
|
assertThat(nacosServer.getInstance().isHealthy()).isEqualTo(true);
|
||||||
|
assertThat(nacosServer.getInstance().getServiceName()).isEqualTo("test-service");
|
||||||
|
assertThat(nacosServer.getInstance().getMetadata().get("instanceNum"))
|
||||||
|
.isEqualTo("2");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateServers() throws Exception {
|
||||||
|
ArrayList<Instance> instances = new ArrayList<>();
|
||||||
|
|
||||||
|
HashMap<String, String> map = new HashMap<>();
|
||||||
|
map.put("instanceNum", "1");
|
||||||
|
instances.add(serviceInstance("test-service", true, map));
|
||||||
|
|
||||||
|
NacosDiscoveryProperties nacosDiscoveryProperties = mock(
|
||||||
|
NacosDiscoveryProperties.class);
|
||||||
|
|
||||||
|
NamingService namingService = mock(NamingService.class);
|
||||||
|
|
||||||
|
when(nacosDiscoveryProperties.namingServiceInstance()).thenReturn(namingService);
|
||||||
|
when(namingService.selectInstances(eq("test-service"), eq(true)))
|
||||||
|
.thenReturn(instances.stream().filter(Instance::isHealthy)
|
||||||
|
.collect(Collectors.toList()));
|
||||||
|
|
||||||
|
IClientConfig clientConfig = mock(IClientConfig.class);
|
||||||
|
when(clientConfig.getClientName()).thenReturn("test-service");
|
||||||
|
NacosServerList serverList = new NacosServerList(nacosDiscoveryProperties);
|
||||||
|
serverList.initWithNiwsConfig(clientConfig);
|
||||||
|
|
||||||
|
List<NacosServer> servers = serverList.getUpdatedListOfServers();
|
||||||
|
assertThat(servers).hasSize(1);
|
||||||
|
|
||||||
|
assertThat(servers.get(0).getInstance().isHealthy()).isEqualTo(true);
|
||||||
|
assertThat(servers.get(0).getInstance().getMetadata().get("instanceNum"))
|
||||||
|
.isEqualTo("1");
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.test;
|
||||||
|
|
||||||
|
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
|
||||||
|
import org.springframework.context.annotation.Bean;
|
||||||
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
|
||||||
|
@Configuration
|
||||||
|
public class CommonTestConfig {
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
@LoadBalanced
|
||||||
|
RestTemplate loadBalancedRestTemplate() {
|
||||||
|
return new RestTemplate();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2018 the original author or authors.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.springframework.cloud.alibaba.nacos.test;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import com.alibaba.nacos.api.naming.pojo.Instance;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author xiaojing
|
||||||
|
*/
|
||||||
|
public class NacosMockTest {
|
||||||
|
|
||||||
|
public static Instance serviceInstance(String serviceName, boolean isHealthy,
|
||||||
|
Map<String, String> metadata) {
|
||||||
|
Instance instance = new Instance();
|
||||||
|
instance.setInstanceId(UUID.randomUUID().toString());
|
||||||
|
instance.setServiceName(serviceName);
|
||||||
|
instance.setHealthy(isHealthy);
|
||||||
|
instance.setMetadata(metadata);
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Instance serviceInstance(String serviceName, boolean isHealthy,
|
||||||
|
String host, int port, Map<String, String> metadata) {
|
||||||
|
Instance instance = new Instance();
|
||||||
|
instance.setIp(host);
|
||||||
|
instance.setPort(port);
|
||||||
|
instance.setServiceName(serviceName);
|
||||||
|
instance.setHealthy(isHealthy);
|
||||||
|
instance.setMetadata(metadata);
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue