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 (file)
--- 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 {
 \r
     String MQ_TOPIC_NAME_ALARM = "topic://voss/fm/alarm";\r
 \r
-    String NFVO_PATH = "/onapapi/umc/v1/fm/curalarms/findAll";\r
+    String NFVO_PATH = "/api/umc/v1/fm/curalarms/findAll";\r
 \r
     int NFVO_STATUS_OK = 200;\r
 \r

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 (file)
--- 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;\r
 import org.onap.holmes.common.api.entity.ServiceRegisterEntity;\r
 \r
-@Path("/onapapi/microservices/v1/services")\r
+@Path("/api/microservices/v1/services")\r
 public interface MicroserviceBusRest {\r
 \r
     @Path("")\r

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 (file)
--- 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");\r
         serviceRegisterEntity.setProtocol("REST");\r
         serviceRegisterEntity.setVersion("v1");\r
-        serviceRegisterEntity.setUrl("/onapapi/holmes-rule-mgmt/v1");\r
+        serviceRegisterEntity.setUrl("/api/holmes-rule-mgmt/v1");\r
         serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9101", 0);\r
         serviceRegisterEntity.setVisualRange("1|0");\r
         return serviceRegisterEntity;\r