Modify vfc huawei vnfmdriver url openoapi to api

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

10 files changed, 10 insertions, 10 deletions

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 86d2650b..f49db1ee 100644
--- 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 c2bb60f3..05afe775 100644
--- 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 de6fbfb5..0b7d9521 100644
--- 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 646d04b6..bcdd747e 100644
--- 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 e2105a9b..a62d086d 100644
--- 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 dce221ac..ca557c4e 100644
--- 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 fe0937cd..0c7a85ed 100644
--- 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 1aa63ca8..0c6f3809 100644
--- 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 1b0349e9..ddfcce8a 100644
--- 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 0b6525a6..72db7991 100644
--- 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"