From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Wed, 6 Sep 2017 12:17:13 +0000 (+0800)
Subject: Change the API Path
X-Git-Tag: v1.0.0~46
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fcommon.git;a=commitdiff_plain;h=24c65df2bbe1f244b5f13b39243c25ad95c6635b

Change the API Path

Change the url from onapapi to api

Change-Id: I0e62ddecb561c810a0a29d09abf893f33261be77
Issue-ID: HOLMES-39
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
---

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/constant/AlarmConst.java b/holmes-actions/src/main/java/org/onap/holmes/common/constant/AlarmConst.java
index e9e5361..690cde6 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/constant/AlarmConst.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/constant/AlarmConst.java
@@ -21,7 +21,7 @@ public interface AlarmConst {
 
     String MQ_TOPIC_NAME_ALARM = "topic://voss/fm/alarm";
 
-    String NFVO_PATH = "/onapapi/umc/v1/fm/curalarms/findAll";
+    String NFVO_PATH = "/api/umc/v1/fm/curalarms/findAll";
 
     int NFVO_STATUS_OK = 200;
 
diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/msb/MicroserviceBusRest.java b/holmes-actions/src/main/java/org/onap/holmes/common/msb/MicroserviceBusRest.java
index 10ecda3..06b91e5 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/msb/MicroserviceBusRest.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/msb/MicroserviceBusRest.java
@@ -24,7 +24,7 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import org.onap.holmes.common.api.entity.ServiceRegisterEntity;
 
-@Path("/onapapi/microservices/v1/services")
+@Path("/api/microservices/v1/services")
 public interface MicroserviceBusRest {
 
     @Path("")
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
index a38c26e..72d9a61 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
@@ -55,7 +55,7 @@ public class MSBRegisterUtilTest {
         serviceRegisterEntity.setServiceName("holmes-rule-mgmt");
         serviceRegisterEntity.setProtocol("REST");
         serviceRegisterEntity.setVersion("v1");
-        serviceRegisterEntity.setUrl("/onapapi/holmes-rule-mgmt/v1");
+        serviceRegisterEntity.setUrl("/api/holmes-rule-mgmt/v1");
         serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9101", 0);
         serviceRegisterEntity.setVisualRange("1|0");
         return serviceRegisterEntity;