}
String serviceName = consul_serviceName;
- if (StringUtils.isNotBlank(namespace)) {
+ // Remove version and namespace from consul service name
+ // Consul_serviceName Format: serviceName-version-namespace
+ if (StringUtils.isNotBlank(version) && StringUtils.isNotBlank(namespace)) {
+ if (consul_serviceName.endsWith("-" + version + "-" + namespace)) {
+ serviceName = consul_serviceName.substring(0,
+ consul_serviceName.length() - version.length() - namespace.length() - 2);
+ }
+ } else if (StringUtils.isNotBlank(version)) {
+ if (consul_serviceName.endsWith("-" + version)) {
+ serviceName = consul_serviceName.substring(0, consul_serviceName.length() - version.length() - 1);
+ }
+ } else if (StringUtils.isNotBlank(namespace)) {
if (consul_serviceName.endsWith("-" + namespace)) {
serviceName = consul_serviceName.substring(0, consul_serviceName.length() - namespace.length() - 1);
}
"get MicroServiceInfo FAIL: The label query parameter format is wrong (key:value)");
}
- String consul_serviceName = getServiceName4Consul(serviceName, namespace);
+ String consul_serviceName = getServiceName4Consul(serviceName, version, namespace);
ConsulResponse consulResponse = getHealthServices(consul_serviceName, ifPassStatus, wait, index);
if (consulResponse == null) {
node.setIp(requestIP);
}
- String serverId = microServiceInfo.getNamespace() + "_" + serviceName + "_" + node.getIp() + "_"
- + node.getPort();
+ String serverId = microServiceInfo.getNamespace() + "_" + microServiceInfo.getVersion() + "_"
+ + serviceName + "_" + node.getIp() + "_" + node.getPort();
List<String> tags = new ArrayList<String>();
agentService.setId(serverId);
agentService.setPort(Integer.parseInt(node.getPort()));
- String consul_serviceName = getServiceName4Consul(serviceName, microServiceInfo.getNamespace());
+ String consul_serviceName = getServiceName4Consul(serviceName, microServiceInfo.getVersion(),
+ microServiceInfo.getNamespace());
agentService.setName(consul_serviceName);
checkServiceNameAndVersion(serviceName, version);
- String consul_serviceName = getServiceName4Consul(serviceName, namespace);
+ String consul_serviceName = getServiceName4Consul(serviceName, version, namespace);
List<CatalogService> catalogServiceList = getConsulServices(consul_serviceName, version);
"delete MicroServiceInfo FAIL:Port(" + port + ")is not a valid Port address");
}
- String consul_serviceName = getServiceName4Consul(serviceName, namespace);
+ String consul_serviceName = getServiceName4Consul(serviceName, version, namespace);
List<CatalogService> catalogServiceList = getConsulServices(consul_serviceName, version);
"healthCheck by TTL FAIL:Port(" + checkNode.getPort() + ")is not a valid Port address");
}
- String consul_serviceName = getServiceName4Consul(serviceName, namespace);
+ String consul_serviceName = getServiceName4Consul(serviceName, version, namespace);
List<CatalogService> catalogServiceList = getConsulServices(consul_serviceName, version);
}
- String consul_serviceName = getServiceName4Consul(serviceName, namespace);
+ String consul_serviceName = getServiceName4Consul(serviceName, version, namespace);
ConsulResponse consulResponse = getHealthServices(consul_serviceName, ifPassStatus, "", "");
if (consulResponse == null) {
}
- private String getServiceName4Consul(String serviceName, String namespace) {
- String consul_serviceName;
+ private String getServiceName4Consul(String serviceName, String version, String namespace) {
+ String consul_serviceName = serviceName;
+
+ if (StringUtils.isNotBlank(version)) {
+ consul_serviceName = consul_serviceName + "-" + version;
+ }
if (StringUtils.isNotBlank(namespace)) {
- // if (DiscoverUtil.APIGATEWAY_SERVINCE_DEFAULT.equals(namespace)) {
- // consul_serviceName=serviceName;
- // }else{
- consul_serviceName = serviceName + "-" + namespace;
- // }
- } else {
- consul_serviceName = serviceName;
+ consul_serviceName = consul_serviceName + "-" + namespace;
}
+
return consul_serviceName;
}
}
-
}
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({HttpClientUtil.class,ConfigUtil.class,DiscoverAppConfig.class})
+@PrepareForTest({HttpClientUtil.class, ConfigUtil.class, DiscoverAppConfig.class})
public class ConsulServiceWrapperTest {
private static final String restJson =
"[{\"Node\":\"server\",\"Address\":\"127.0.0.1\",\"TaggedAddresses\":{\"lan\":\"127.0.0.1\",\"wan\":\"127.0.0.1\"},\"ServiceID\":\"_test_10.74.56.36_5656\",\"ServiceName\":\"test\",\"ServiceTags\":[\"\\\"base\\\":{\\\"protocol\\\":\\\"REST\\\",\\\"version\\\":\\\"v1\\\",\\\"url\\\":\\\"/test\\\"}\",\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0\\\"}\"],\"ServiceAddress\":\"10.74.56.36\",\"ServicePort\":5656,\"ServiceEnableTagOverride\":false,\"CreateIndex\":1819452,\"ModifyIndex\":1819454}]";
private static final String catalog4ttlJson =
"[{\"Node\":\"server\",\"Address\":\"127.0.0.1\",\"TaggedAddresses\":{\"lan\":\"127.0.0.1\",\"wan\":\"127.0.0.1\"},\"ServiceID\":\"_test_10.74.56.36_5656\",\"ServiceName\":\"test\",\"ServiceTags\":[\"\\\"base\\\":{\\\"protocol\\\":\\\"REST\\\",\\\"version\\\":\\\"v1\\\",\\\"url\\\":\\\"/test\\\"}\",\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0\\\"}\",\"\\\"checks\\\":{\\\"ttl\\\":\\\"10s\\\"}\"],\"ServiceAddress\":\"10.74.56.36\",\"ServicePort\":5656,\"ServiceEnableTagOverride\":false,\"CreateIndex\":1819452,\"ModifyIndex\":1819454}]";
- private static final String mockRestUrl = "http://127.0.0.1:8500/v1/health/service/test";
+ private static final String mockRestUrl = "http://127.0.0.1:8500/v1/health/service/test-v1";
private static final String mockPostUrl = "http://127.0.0.1:8500/v1/catalog/register";
- private static final String mockdel_gettUrl = "http://127.0.0.1:8500/v1/catalog/service/test";
+ private static final String mockdel_gettUrl = "http://127.0.0.1:8500/v1/catalog/service/test-v1";
private static final String mockdeltUrl = "http://127.0.0.1:8500/v1/catalog/deregister";
private static final String mockdeltUrl4agent = "http://127.0.0.1:8500/v1/agent/deregister";
-
+
private static final String mockgetListUrl = "http://127.0.0.1:8500/v1/catalog/services";
private static final String restListJson =
- "{\"consul\":[],\"test-tt\":[\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0\\\"}\",\"\\\"base\\\":{\\\"version\\\":\\\"v1\\\",\\\"protocol\\\":\\\"REST\\\",\\\"url\\\":\\\"/api/microservices/v1\\\",\\\"visualRange\\\":\\\"0\\\"}\",\"\\\"ns\\\":{\\\"namespace\\\":\\\"tt\\\"}\"]}";
+ "{\"consul\":[],\"test-tt\":[\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0\\\"}\",\"\\\"base\\\":{\\\"version\\\":\\\"v1\\\",\\\"protocol\\\":\\\"REST\\\",\\\"url\\\":\\\"/api/microservices/v1\\\",\\\"visualRange\\\":\\\"0\\\"}\",\"\\\"ns\\\":{\\\"namespace\\\":\\\"tt\\\"}\"]}";
private static ConsulServiceWrapper consulServiceWrapper = ConsulServiceWrapper.getInstance();
-
+
@Test
- public void test_getAllMicroServiceInstances(){
- mockGetList();
- List<MicroServiceFullInfo> serviceList=consulServiceWrapper.getAllMicroServiceInstances();
- Assert.assertEquals(1, serviceList.size());
- MicroServiceFullInfo service=serviceList.get(0);
- Assert.assertEquals( "test-tt",service.getServiceName());
- Assert.assertEquals( "",service.getNamespace());
+ public void test_getAllMicroServiceInstances() {
+ mockGetList();
+ List<MicroServiceFullInfo> serviceList = consulServiceWrapper.getAllMicroServiceInstances();
+ Assert.assertEquals(1, serviceList.size());
+ MicroServiceFullInfo service = serviceList.get(0);
+ Assert.assertEquals("test-tt", service.getServiceName());
+ Assert.assertEquals("", service.getNamespace());
}
-
-
+
+
@Test
public void test_getMicroServiceInstance() {
mockGetRest();
serviceInfo.setHost("host");
serviceInfo.setPath("/test");
serviceInfo.setNetwork_plane_type("net");
-
- List<KeyVaulePair> metadata=new ArrayList<KeyVaulePair>();
- metadata.add(new KeyVaulePair("key1","val1"));
- metadata.add(new KeyVaulePair("key2","val2"));
+
+ List<KeyVaulePair> metadata = new ArrayList<KeyVaulePair>();
+ metadata.add(new KeyVaulePair("key1", "val1"));
+ metadata.add(new KeyVaulePair("key2", "val2"));
serviceInfo.setMetadata(metadata);
-
-
- List<String> labels=new ArrayList<String>();
+
+
+ List<String> labels = new ArrayList<String>();
labels.add("111:111");
- labels.add("222:222");
+ labels.add("222:222");
serviceInfo.setLabels(labels);
-
+
Set<Node> nodes = new HashSet<Node>();
Node node = new Node();
node.setIp("10.74.44.1");
Assert.assertEquals("HTTP 500 Internal Server Error", e.getMessage());
}
}
-
-
+
+
@Test
public void test_saveMicroServiceInstance2() {
MicroServiceInfo serviceInfo = new MicroServiceInfo();
serviceInfo.setHost("host");
serviceInfo.setPath("/test");
serviceInfo.setNetwork_plane_type("net");
-
- List<KeyVaulePair> metadata=new ArrayList<KeyVaulePair>();
- metadata.add(new KeyVaulePair("key1","val1"));
- metadata.add(new KeyVaulePair("key2","val2"));
+
+ List<KeyVaulePair> metadata = new ArrayList<KeyVaulePair>();
+ metadata.add(new KeyVaulePair("key1", "val1"));
+ metadata.add(new KeyVaulePair("key2", "val2"));
serviceInfo.setMetadata(metadata);
-
-
- List<String> labels=new ArrayList<String>();
+
+
+ List<String> labels = new ArrayList<String>();
labels.add("111:111");
- labels.add("222:222");
+ labels.add("222:222");
serviceInfo.setLabels(labels);
-
+
Set<Node> nodes = new HashSet<Node>();
Node node = new Node();
node.setIp("10.74.44.1");
Assert.assertEquals("HTTP 500 Internal Server Error", e.getMessage());
}
}
-
+
@Test
public void test_saveMicroServiceInstance4agent() {
MicroServiceInfo serviceInfo = new MicroServiceInfo();
nodes.add(node);
serviceInfo.setNodes(nodes);
- PowerMockito.mockStatic(System.class);
- PowerMockito.when(System.getenv("CONSUL_REGISTER_MODE")).thenReturn("agent");
- DiscoverAppConfig discoverConfig=PowerMockito.mock(DiscoverAppConfig.class);
- ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
-
-
+ PowerMockito.mockStatic(System.class);
+ PowerMockito.when(System.getenv("CONSUL_REGISTER_MODE")).thenReturn("agent");
+ DiscoverAppConfig discoverConfig = PowerMockito.mock(DiscoverAppConfig.class);
+ ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
+
+
mockGetRest4null();
// mockGetPost();
try {
} catch (Exception e) {
Assert.assertEquals("HTTP 500 Internal Server Error", e.getMessage());
}
-
+
PowerMockito.when(System.getenv("CONSUL_REGISTER_MODE")).thenReturn("catalog");
- ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
+ ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
}
@Test
mockDelete();
consulServiceWrapper.deleteMicroService("test", "v1", "");
}
-
+
@Test
public void test_deleteMicroServiceInstance() {
mockGet4Delete();
mockDelete();
consulServiceWrapper.deleteMicroServiceInstance("test", "v1", "", "10.74.56.36", "5656");
}
-
+
@Test
public void test_deleteMicroService4agent() {
- mockGet4Delete();
- mockDelete4agent();
-
- DiscoverAppConfig discoverConfig=PowerMockito.mock(DiscoverAppConfig.class);
- PowerMockito.mockStatic(System.class);
- PowerMockito.when(System.getenv("CONSUL_REGISTER_MODE")).thenReturn("agent");
- ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
-
- consulServiceWrapper.deleteMicroService("test", "v1", "");
-
- PowerMockito.when(System.getenv("CONSUL_REGISTER_MODE")).thenReturn("catalog");
- ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
+ mockGet4Delete();
+ mockDelete4agent();
+
+ DiscoverAppConfig discoverConfig = PowerMockito.mock(DiscoverAppConfig.class);
+ PowerMockito.mockStatic(System.class);
+ PowerMockito.when(System.getenv("CONSUL_REGISTER_MODE")).thenReturn("agent");
+ ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
+
+ consulServiceWrapper.deleteMicroService("test", "v1", "");
+
+ PowerMockito.when(System.getenv("CONSUL_REGISTER_MODE")).thenReturn("catalog");
+ ConfigUtil.getInstance().initConsulRegisterMode(discoverConfig);
}
-
+
@Test
public void test_healthCheckbyTTL() {
PowerMockito.when(HttpClientUtil.httpGet(mockdel_gettUrl)).thenReturn(catalogJson);
}
-
+
private void mockGetList() {
PowerMockito.mockStatic(HttpClientUtil.class);
PowerMockito.when(HttpClientUtil.httpGet(mockgetListUrl)).thenReturn(restListJson);
-
+
ConsulResponse<Object> consulResponse = new ConsulResponse(restJson, new BigInteger("1000"));
- PowerMockito.when(HttpClientUtil.httpWaitGet("http://127.0.0.1:8500/v1/health/service/test-tt")).thenReturn(consulResponse);
+ PowerMockito.when(HttpClientUtil.httpWaitGet("http://127.0.0.1:8500/v1/health/service/test-tt"))
+ .thenReturn(consulResponse);
}
PowerMockito.when(HttpClientUtil.httpPostWithJSON(mockdeltUrl, serviceJson)).thenReturn(200);
}
-
+
private void mockDelete4agent() {
- PowerMockito.when(HttpClientUtil.httpPostWithJSON("http://127.0.0.1:8500/v1/agent/service/deregister/_test_10.74.56.36_5656", "")).thenReturn(200);
+ PowerMockito.when(HttpClientUtil.httpPostWithJSON(
+ "http://127.0.0.1:8500/v1/agent/service/deregister/_test_10.74.56.36_5656", ""))
+ .thenReturn(200);
}
-
private void mockGetRest4null() {
PowerMockito.mockStatic(HttpClientUtil.class);
PowerMockito.when(HttpClientUtil.httpWaitGet(mockRestUrl)).thenReturn(null);
import org.onap.msb.sdclient.core.PublishFullAddress;
import org.onap.msb.sdclient.core.exception.UnprocessableEntityException;
-
import org.onap.msb.sdclient.wrapper.util.HttpClientUtil;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
private static final String restJson =
"[{\"Node\":{\"Node\":\"A23179111\",\"Address\":\"10.74.44.16\"},\"Service\":{\"ID\":\"_test_10.74.44.16_2356\",\"Service\":\"test\",\"Tags\":[\"\\\"base\\\":{\\\"protocol\\\":\\\"REST\\\",\\\"url\\\":\\\"/api/test/v1\\\",\\\"version\\\":\\\"v1\\\"}\",\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0|1\\\",\\\"apigateway\\\":\\\"test\\\",\\\"network_plane_type\\\":\\\"net\\\"}\"],\"Address\":\"10.74.44.16\",\"Port\":8086},\"Checks\":[{\"CheckID\":\"serfHealth\",\"Name\":\"Serf Health Status\",\"Status\":\"passing\"}]}]";
- private static final String mockRestUrl = "http://127.0.0.1:8500/v1/health/service/test";
+ private static final String mockRestUrl = "http://127.0.0.1:8500/v1/health/service/test-v1";
private static final String uiJson =
"[{\"Node\":{\"Node\":\"A23179111\",\"Address\":\"10.74.44.16\"},\"Service\":{\"ID\":\"_test_10.74.44.16_2356\",\"Service\":\"IUI_test\",\"Tags\":[\"\\\"base\\\":{\\\"protocol\\\":\\\"UI\\\",\\\"url\\\":\\\"/iui/test\\\",\\\"path\\\":\\\"/iui/test_path\\\",\\\"host\\\":\\\"testhost\\\"}\",\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0|1\\\",\\\"apigateway\\\":\\\"test\\\",\\\"network_plane_type\\\":\\\"net\\\"}\"],\"Address\":\"10.74.44.16\",\"Port\":8086},\"Checks\":[{\"CheckID\":\"serfHealth\",\"Name\":\"Serf Health Status\",\"Status\":\"passing\"}]}]";
private static final String tcpJson =
"[{\"Node\":{\"Node\":\"A23179111\",\"Address\":\"10.74.44.16\"},\"Service\":{\"ID\":\"_test_10.74.44.16_2356\",\"Service\":\"tcp_test\",\"Tags\":[\"\\\"base\\\":{\\\"protocol\\\":\\\"TCP\\\",\\\"url\\\":\\\"/\\\",\\\"version\\\":\\\"v1\\\",\\\"publish_port\\\":\\\"40001\\\"}\",\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0|1\\\",\\\"apigateway\\\":\\\"test\\\",\\\"network_plane_type\\\":\\\"net\\\"}\"],\"Address\":\"10.74.44.16\",\"Port\":8086},\"Checks\":[{\"CheckID\":\"serfHealth\",\"Name\":\"Serf Health Status\",\"Status\":\"passing\"}]}]";
- private static final String mockTCPUrl = "http://127.0.0.1:8500/v1/health/service/tcp_test";
+ private static final String mockTCPUrl = "http://127.0.0.1:8500/v1/health/service/tcp_test-v1";
private static final String httpJson =
"[{\"Node\":{\"Node\":\"A23179111\",\"Address\":\"10.74.44.16\"},\"Service\":{\"ID\":\"_test_10.74.44.16_2356\",\"Service\":\"test\",\"Tags\":[\"\\\"base\\\":{\\\"protocol\\\":\\\"HTTP\\\",\\\"url\\\":\\\"/test\\\",\\\"version\\\":\\\"v1\\\",\\\"host\\\":\\\"testhost\\\"}\",\"\\\"ns\\\":{\\\"namespace\\\":\\\"ns\\\"}\",\"\\\"labels\\\":{\\\"visualRange\\\":\\\"0|1\\\",\\\"apigateway\\\":\\\"test\\\",\\\"network_plane_type\\\":\\\"net\\\"}\"],\"Address\":\"10.74.44.16\",\"Port\":8086},\"Checks\":[{\"CheckID\":\"serfHealth\",\"Name\":\"Serf Health Status\",\"Status\":\"passing\"}]}]";
- private static final String mockHTTPUrl = "http://127.0.0.1:8500/v1/health/service/test-ns";
+ private static final String mockHTTPUrl = "http://127.0.0.1:8500/v1/health/service/test-v1-ns";
Code Review / msb / discovery.git / commitdiff