zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add endpoint cluster name for config & naming server list manager (#12253)

Browse Source
This commit is contained in:
nov.lzf 2024-06-24 09:37:41 +08:00 committed by GitHub
parent 5d871967ea
commit 63dc87a30c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java
View File

@ -35,6 +35,8 @@ public class PropertyKeyConst {
public static final String ENDPOINT_CONTEXT_PATH = "endpointContextPath"; public static final String ENDPOINT_CONTEXT_PATH = "endpointContextPath";
public static final String ENDPOINT_CLUSTER_NAME = "endpointClusterName";
public static final String SERVER_NAME = "serverName"; public static final String SERVER_NAME = "serverName";
public static final String NAMESPACE = "namespace"; public static final String NAMESPACE = "namespace";

3
client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
View File

@ -293,7 +293,8 @@ public class ServerListManager implements Closeable {
} }
private void initServerListName(NacosClientProperties properties) { private void initServerListName(NacosClientProperties properties) {
String serverListNameTmp = properties.getProperty(PropertyKeyConst.CLUSTER_NAME); String serverListNameTmp = properties.getProperty(PropertyKeyConst.ENDPOINT_CLUSTER_NAME,
properties.getProperty(PropertyKeyConst.CLUSTER_NAME));
if (!StringUtils.isBlank(serverListNameTmp)) { if (!StringUtils.isBlank(serverListNameTmp)) {
this.serverListName = serverListNameTmp; this.serverListName = serverListNameTmp;
} }

2
client/src/main/java/com/alibaba/nacos/client/naming/core/ServerListManager.java
View File

@ -111,7 +111,7 @@ public class ServerListManager implements ServerListFactory, Closeable {
if (!StringUtils.isBlank(contentPathTmp)) { if (!StringUtils.isBlank(contentPathTmp)) {
this.contentPath = contentPathTmp; this.contentPath = contentPathTmp;
} }
String serverListNameTmp = properties.getProperty(PropertyKeyConst.CLUSTER_NAME); String serverListNameTmp = properties.getProperty(PropertyKeyConst.ENDPOINT_CLUSTER_NAME);
if (!StringUtils.isBlank(serverListNameTmp)) { if (!StringUtils.isBlank(serverListNameTmp)) {
this.serverListName = serverListNameTmp; this.serverListName = serverListNameTmp;
} }

28
client/src/test/java/com/alibaba/nacos/client/config/impl/ServerListManagerTest.java
View File

@ -235,6 +235,34 @@ class ServerListManagerTest {
assertTrue(serverListManager.getName().contains("endpointContextPath")); assertTrue(serverListManager.getName().contains("endpointContextPath"));
} }
@Test
void testWithEndpointClusterName() throws NacosException {
Properties properties = new Properties();
String endpoint = "127.0.0.1";
properties.setProperty(PropertyKeyConst.ENDPOINT, endpoint);
String endpointPort = "9090";
properties.setProperty(PropertyKeyConst.ENDPOINT_PORT, endpointPort);
String testEndpointClusterName = "testEndpointClusterName";
properties.setProperty(PropertyKeyConst.ENDPOINT_CLUSTER_NAME, testEndpointClusterName);
String testClusterName = "testClusterName";
properties.setProperty(PropertyKeyConst.CLUSTER_NAME, testClusterName);
String endpointContextPath = "/endpointContextPath";
properties.setProperty(PropertyKeyConst.ENDPOINT_CONTEXT_PATH, endpointContextPath);
String contextPath = "/contextPath";
properties.setProperty(PropertyKeyConst.CONTEXT_PATH, contextPath);
final NacosClientProperties clientProperties = NacosClientProperties.PROTOTYPE.derive(properties);
ServerListManager serverListManager = new ServerListManager(clientProperties);
assertTrue(serverListManager.addressServerUrl.contains(endpointContextPath));
assertTrue(serverListManager.getName().contains("endpointContextPath"));
assertTrue(serverListManager.addressServerUrl.contains(testEndpointClusterName));
assertTrue(serverListManager.getName().contains(testEndpointClusterName));
assertFalse(serverListManager.addressServerUrl.contains(testClusterName));
assertFalse(serverListManager.getName().contains(testClusterName));
}
@Test @Test
void testWithoutEndpointContextPath() throws NacosException { void testWithoutEndpointContextPath() throws NacosException {
Properties properties = new Properties(); Properties properties = new Properties();

8
client/src/test/java/com/alibaba/nacos/client/naming/core/ServerListManagerTest.java
View File

@ -199,7 +199,7 @@ class ServerListManagerTest {
@Test @Test
void testConstructWithEndpointWithCustomPathAndName() throws Exception { void testConstructWithEndpointWithCustomPathAndName() throws Exception {
clientProperties.setProperty(PropertyKeyConst.CONTEXT_PATH, "aaa"); clientProperties.setProperty(PropertyKeyConst.CONTEXT_PATH, "aaa");
clientProperties.setProperty(PropertyKeyConst.CLUSTER_NAME, "bbb"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CLUSTER_NAME, "bbb");
clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1");
Mockito.reset(nacosRestTemplate); Mockito.reset(nacosRestTemplate);
Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/aaa/bbb"), any(), any(), any())) Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/aaa/bbb"), any(), any(), any()))
@ -213,7 +213,7 @@ class ServerListManagerTest {
@Test @Test
void testConstructWithEndpointWithEndpointPathAndName() throws Exception { void testConstructWithEndpointWithEndpointPathAndName() throws Exception {
clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CONTEXT_PATH, "aaa"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CONTEXT_PATH, "aaa");
clientProperties.setProperty(PropertyKeyConst.CLUSTER_NAME, "bbb"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CLUSTER_NAME, "bbb");
clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1");
Mockito.reset(nacosRestTemplate); Mockito.reset(nacosRestTemplate);
Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/aaa/bbb"), any(), any(), any())) Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/aaa/bbb"), any(), any(), any()))
@ -228,7 +228,7 @@ class ServerListManagerTest {
void testConstructEndpointContextPathPriority() throws Exception { void testConstructEndpointContextPathPriority() throws Exception {
clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CONTEXT_PATH, "aaa"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CONTEXT_PATH, "aaa");
clientProperties.setProperty(PropertyKeyConst.CONTEXT_PATH, "bbb"); clientProperties.setProperty(PropertyKeyConst.CONTEXT_PATH, "bbb");
clientProperties.setProperty(PropertyKeyConst.CLUSTER_NAME, "ccc"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CLUSTER_NAME, "ccc");
clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1");
Mockito.reset(nacosRestTemplate); Mockito.reset(nacosRestTemplate);
Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/aaa/ccc"), any(), any(), any())) Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/aaa/ccc"), any(), any(), any()))
@ -243,7 +243,7 @@ class ServerListManagerTest {
void testConstructEndpointContextPathIsEmpty() throws Exception { void testConstructEndpointContextPathIsEmpty() throws Exception {
clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CONTEXT_PATH, ""); clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CONTEXT_PATH, "");
clientProperties.setProperty(PropertyKeyConst.CONTEXT_PATH, "bbb"); clientProperties.setProperty(PropertyKeyConst.CONTEXT_PATH, "bbb");
clientProperties.setProperty(PropertyKeyConst.CLUSTER_NAME, "ccc"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT_CLUSTER_NAME, "ccc");
clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1"); clientProperties.setProperty(PropertyKeyConst.ENDPOINT, "127.0.0.1");
Mockito.reset(nacosRestTemplate); Mockito.reset(nacosRestTemplate);
Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/bbb/ccc"), any(), any(), any())) Mockito.when(nacosRestTemplate.get(eq("http://127.0.0.1:8080/bbb/ccc"), any(), any(), any()))