From c9b3c2d143621f25a670049aadf61830d3ed321c Mon Sep 17 00:00:00 2001 From: HuabingZhao Date: Tue, 13 Mar 2018 10:19:52 +0800 Subject: Support multiple versions under a service name Modify the service name when sync service route from consul Issue-ID: MSB-178 Change-Id: I5a1a3efe02a8cf7f56518d1b745505b049553810 Signed-off-by: HuabingZhao --- .../serviceListener/MicroServiceChangeListener.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/serviceListener/MicroServiceChangeListener.java') diff --git a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/serviceListener/MicroServiceChangeListener.java b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/serviceListener/MicroServiceChangeListener.java index 2e1b8ff..55b6676 100644 --- a/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/serviceListener/MicroServiceChangeListener.java +++ b/apiroute/apiroute-service/src/main/java/org/onap/msb/apiroute/wrapper/serviceListener/MicroServiceChangeListener.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright 2016-2017 ZTE, Inc. and others. + * Copyright 2016-2018 ZTE, Inc. and others. * * 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 @@ -105,8 +105,8 @@ public class MicroServiceChangeListener implements IMicroServiceChangeListener { return true; String protocol = microServiceInfo.getProtocol(); - String routeName = - RouteUtil.getRouteNameByns(microServiceInfo.getServiceName(), microServiceInfo.getNamespace()); + String routeName = RouteUtil.getRouteNameByns(microServiceInfo.getServiceName(), microServiceInfo.getVersion(), + microServiceInfo.getNamespace()); String publishUrl = ""; String version = ""; if (StringUtils.isNotBlank(microServiceInfo.getVersion())) { @@ -156,8 +156,8 @@ public class MicroServiceChangeListener implements IMicroServiceChangeListener { */ private void saveServiceByProtocol(MicroServiceFullInfo microServiceInfo, String routeWay) throws Exception { String protocol = microServiceInfo.getProtocol(); - String routeName = - RouteUtil.getRouteNameByns(microServiceInfo.getServiceName(), microServiceInfo.getNamespace()); + String routeName = RouteUtil.getRouteNameByns(microServiceInfo.getServiceName(), microServiceInfo.getVersion(), + microServiceInfo.getNamespace()); switch (protocol) { case RouteUtil.PROTOCOL_UI: @@ -195,8 +195,8 @@ public class MicroServiceChangeListener implements IMicroServiceChangeListener { private void deleteServiceByProtocol(MicroServiceFullInfo microServiceInfo, String routeWay) { String protocol = microServiceInfo.getProtocol(); String host = getHost(microServiceInfo); - String routeName = - RouteUtil.getRouteNameByns(microServiceInfo.getServiceName(), microServiceInfo.getNamespace()); + String routeName = RouteUtil.getRouteNameByns(microServiceInfo.getServiceName(), microServiceInfo.getVersion(), + microServiceInfo.getNamespace()); if (RouteUtil.PROTOCOL_UI.equals(protocol)) { @@ -502,7 +502,7 @@ public class MicroServiceChangeListener implements IMicroServiceChangeListener { if (RouteUtil.ROUTEWAY_DOMAIN.equals(routeWay)) { String discoverServiceName = RouteUtil.getRouteNameByns(microServiceInfo.getServiceName(), - microServiceInfo.getNamespace()); + microServiceInfo.getVersion(), microServiceInfo.getNamespace()); List publishNodes = getPublishNodes(discoverServiceName, microServiceInfo.getVersion(), microServiceInfo.getNamespace()); if (publishNodes != null && publishNodes.size() > 0) { -- cgit 1.2.3-korg