Fix published url for huaweidriver

Change-Id: I3f5a4a6733dc2c262f822970ca556fb4cbd9fbcb
Issue-Id:VFC-542
Signed-off-by: luxin <luxin7@huawei.com>

diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
index 12dc330..9d8322c 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
+++ b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapterinfo.json
@@ -1,7 +1,7 @@
 {
   "serviceName": "hwvnfm",
   "version": "v1",
-  "url": "/api/hwvnfm/v1",
+  "url": "/api/huaweivnfmdriver/v1",
   "protocol": "REST",
   "visualRange": "1",
   "nodes": [

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java
index 63e73c9..27a5ae3 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/SwaggerRoa.java
@@ -31,18 +31,20 @@ import org.apache.commons.io.IOUtils;
  * @author
  * @version VFC 1.0 Oct 24, 2016
  */
-@Path("/api/hwvnfm/v1")
+@Path("/api/huaweivnfmdriver/v1")
 @Produces({MediaType.APPLICATION_JSON})
 public class SwaggerRoa {
+
     /**
      * API doc.
+     * 
      * @param filename
      * @return
      * @throws IOException
      */
     @GET
     @Path("/swagger.json")
-    public String apidoc() throws IOException{
+    public String apidoc() throws IOException {
         ClassLoader classLoader = getClass().getClassLoader();
         return IOUtils.toString(classLoader.getResourceAsStream("swagger.json"));
     }

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
index 35f7cea..4867ace 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
@@ -51,7 +51,7 @@ import net.sf.json.JSONObject;
  * @version VFC 1.0 Aug 24, 2016
  */
 @SuppressWarnings("unchecked")
-@Path("/api/hwvnfm/v1")
+@Path("/api/huaweivnfmdriver/v1")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
 public class VnfRoa {