Modify vfc huawei vnfmdriver url openoapi to api

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

diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/README.txt b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/README.txt
index 0561cad..5fbebce 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/README.txt
+++ b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/README.txt
@@ -42,7 +42,7 @@ How to run?
           'conf/server.xml'
           - Verify that 'Tomcat started.' is reported on the console.
     - Once service is started, please verify below details:
-        - from MSB service, verify that "hwvnfm"  is reported from GET request on "/openoapi/microservices/v1/services"
+        - from MSB service, verify that "hwvnfm"  is reported from GET request on "/api/microservices/v1/services"
         - from this service, run one of the supported REST API mentioned in open-o NFVO wiki and verify that the
           expected response is returned.
 How to stop?

diff --git a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json
index b58b080..2b97bc6 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json
+++ b/huawei/vnfmadapter/VnfmadapterService/deployment/src/main/release/etc/adapterInfo/vnfmadapter2drivermgr.json
@@ -6,7 +6,7 @@
         "port": "8482",
         "protocol": "http",
         "services": [{
-                "service_url": "/openoapi/hwvnfm/v1",
+                "service_url": "/api/hwvnfm/v1",
                 "support_sys": [{
                         "type": "vnfm",
                         "version": "V100R001"

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 1f1e7d3..12dc330 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": "/openoapi/hwvnfm/v1",
+  "url": "/api/hwvnfm/v1",
   "protocol": "REST",
   "visualRange": "1",
   "nodes": [

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getcsarinfo.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getcsarinfo.json
index 86d2650..f49db1e 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getcsarinfo.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getcsarinfo.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/openoapi/catalog/v1/csars/12345",
+        "uri": "/api/catalog/v1/csars/12345",
         "method": "get",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getvnfminfo.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getvnfminfo.json
index c2bb60f..05afe77 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getvnfminfo.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/mocoserver/getvnfminfo.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/openoapi/extsys/v1/vnfms/12345",
+        "uri": "/api/extsys/v1/vnfms/12345",
         "method": "get",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnffail.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnffail.json
index de6fbfb..0b7d952 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnffail.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnffail.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/vnfs",
+        "uri": "/rest/api/hw-vnfm/v1/12345/vnfs",
         "method": "post",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnfsuccess.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnfsuccess.json
index 646d04b..bcdd747 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnfsuccess.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/addvnfsuccess.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/vnfs",
+        "uri": "/rest/api/hw-vnfm/v1/12345/vnfs",
         "method": "post",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnffail.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnffail.json
index e2105a9..a62d086 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnffail.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnffail.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/vnfs/54321/terminate",
+        "uri": "/rest/api/hw-vnfm/v1/12345/vnfs/54321/terminate",
         "method": "post",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnfsuccess.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnfsuccess.json
index dce221a..ca557c4 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnfsuccess.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/deletevnfsuccess.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/vnfs/54321/terminate",
+        "uri": "/rest/api/hw-vnfm/v1/12345/vnfs/54321/terminate",
         "method": "post",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobfail.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobfail.json
index fe0937c..0c7a85e 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobfail.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobfail.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/jobs/54321",
+        "uri": "/rest/api/hw-vnfm/v1/12345/jobs/54321",
         "method": "get",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobsuccess.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobsuccess.json
index 1aa63ca..0c6f380 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobsuccess.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getjobsuccess.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/jobs/54321",
+        "uri": "/rest/api/hw-vnfm/v1/12345/jobs/54321",
         "method": "get",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnffail.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnffail.json
index 1b0349e..ddfcce8 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnffail.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnffail.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/vnfs/54321",
+        "uri": "/rest/api/hw-vnfm/v1/12345/vnfs/54321",
         "method": "get",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnfsuccess.json b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnfsuccess.json
index 0b6525a..72db799 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnfsuccess.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/integration-test/resources/vnfmadapter/testcase/vnfroa/getvnfsuccess.json
@@ -1,6 +1,6 @@
 {
     "request": {
-        "uri": "/rest/openoapi/hw-vnfm/v1/12345/vnfs/54321",
+        "uri": "/rest/api/hw-vnfm/v1/12345/vnfs/54321",
         "method": "get",
         "headers": {
             "Content-Type": "application/json;charset=UTF-8"

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java
index af48609..957a581 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/ParamConstants.java
@@ -105,15 +105,15 @@ public class ParamConstants {
 
     public static final String VNF_GET_VMINFO = "/v2/vapps/instances/%s/vm";
 
-    public static final String MSB_REGISTER_URL = "/openoapi/microservices/v1/services";
+    public static final String MSB_REGISTER_URL = "/api/microservices/v1/services";
 
-    public static final String MSB_UNREGISTER_URL = "/openoapi/microservices/v1/services/hw-vnfm";
+    public static final String MSB_UNREGISTER_URL = "/api/microservices/v1/services/hw-vnfm";
 
-    public static final String ESR_GET_VNFM_URL = "/openoapi/extsys/v1/vnfms/%s";
+    public static final String ESR_GET_VNFM_URL = "/api/extsys/v1/vnfms/%s";
 
-    public static final String ESR_GET_VNFMS_URL = "/openoapi/extsys/v1/vnfms";
+    public static final String ESR_GET_VNFMS_URL = "/api/extsys/v1/vnfms";
 
-    public static final String GRANT_RES_URL = "/openoapi/resmgr/v1/resource/grant";
+    public static final String GRANT_RES_URL = "/api/resmgr/v1/resource/grant";
 
     public static final String HEAL_VNF = "/v2/vapps/instances/vm/%s/action";
 

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java
index 8b906a1..0f09ddb 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/constant/UrlConstant.java
@@ -24,13 +24,13 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.constant;
  */
 public class UrlConstant {
 
-    public static final String REST_MSB_REGISTER = "/openoapi/microservices/v1/services";
+    public static final String REST_MSB_REGISTER = "/api/microservices/v1/services";
 
-    public static final String REST_DRIVERMGR_REGISTER = "/openoapi/drivermgr/v1/drivers";
+    public static final String REST_DRIVERMGR_REGISTER = "/api/drivermgr/v1/drivers";
 
-    public static final String REST_CSARINFO_GET = "/openoapi/catalog/v1/csars/%s";
+    public static final String REST_CSARINFO_GET = "/api/catalog/v1/csars/%s";
 
-    public static final String REST_VNFMINFO_GET = "/openoapi/extsys/v1/vnfms/%s";
+    public static final String REST_VNFMINFO_GET = "/api/extsys/v1/vnfms/%s";
 
     public static final String URL_ALLCLOUD_GET = "/rest/vnfm/vnfmvim/v2/computeservice/getAllCloud";
 

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 7ff1e2c..d6ef28f 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 Huawei Technologies Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import org.apache.commons.io.IOUtils;
  * @author
  * @version NFVO 0.5 Oct 24, 2016
  */
-@Path("/openoapi/hwvnfm/v1")
+@Path("/api/hwvnfm/v1")
 @Produces({MediaType.APPLICATION_JSON})
 public class SwaggerRoa {
     /**

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 fafd3e5..870875c 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 NFVO 0.5 Aug 24, 2016
  */
 @SuppressWarnings("unchecked")
-@Path("/openoapi/hwvnfm/v1")
+@Path("/api/hwvnfm/v1")
 @Consumes(MediaType.APPLICATION_JSON)
 @Produces(MediaType.APPLICATION_JSON)
 public class VnfRoa {

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties
index b7520c0..df20f4e 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/registerService.properties
@@ -15,7 +15,7 @@
 ###############################################################################
 serviceName=hw-vnfm
 version=v1
-url=/openoapi/hw-vnfm/v1
+url=/api/hw-vnfm/v1
 protocol=REST
 visualRange=1
 ip=10.229.33.207

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json
index aa3bf1f..7ed2718 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/resources/swagger.json
@@ -10,7 +10,7 @@
             "name": "Huawei VNFM Driver services"
         }
     ],
-  "basePath": "/openoapi",
+  "basePath": "/api",
   "paths": {
     "/{vnfmtype}/v1/{vnfmid}/vnfs": {
       "post": {

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java
index 10e0305..dc76d84 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/Driver2MSBManagerTest.java
@@ -70,7 +70,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -92,7 +92,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -114,7 +114,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -136,7 +136,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -158,7 +158,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -177,7 +177,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -199,7 +199,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -221,7 +221,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -243,7 +243,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -265,7 +265,7 @@ public class Driver2MSBManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
index dc0431c..761b7e1 100644 (file)
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/VnfmAdapter2DriverManagerTest.java
@@ -70,7 +70,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -92,7 +92,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -114,7 +114,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -136,7 +136,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -158,7 +158,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.registerDriver(paramsMap, new JSONObject());
@@ -177,7 +177,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -199,7 +199,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -221,7 +221,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -243,7 +243,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);
@@ -265,7 +265,7 @@ public class VnfmAdapter2DriverManagerTest {
             }
         };
         Map<String, String> paramsMap = new HashMap<>();
-        paramsMap.put("url", "/test/openoapi");
+        paramsMap.put("url", "/test/api");
         paramsMap.put("path", "http://localhost:8080");
         paramsMap.put("methodType", "get");
         JSONObject obj = manager.unregisterDriver(paramsMap);