diff options
author | luxin <luxin7@huawei.com> | 2017-09-04 17:40:41 +0800 |
---|---|---|
committer | luxin <luxin7@huawei.com> | 2017-09-04 17:40:41 +0800 |
commit | d45def4032e4455b46093c3439e8e5c7af76ea76 (patch) | |
tree | 12aac69dbff1b8babc95fb960fee560f805dc3db /ResmanagementService/service | |
parent | 09687684134eedeae9563aeddc16c72f35589be7 (diff) |
Modify vfc url openoapi to api
Change-Id: Ibd24d6d4d3742121fbf6a76c9dec30dc9f14675e
Issue-Id:VFC-216
Signed-off-by: luxin <luxin7@huawei.com>
Diffstat (limited to 'ResmanagementService/service')
62 files changed, 71 insertions, 71 deletions
diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/getcpulimits.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/getcpulimits.json index c2eb426..6489275 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/getcpulimits.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/getcpulimits.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/vimdriver/v1/limits/1234/cpumemory", + "uri": "/api/vimdriver/v1/limits/1234/cpumemory", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/getdisklimits.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/getdisklimits.json index a99b0df..89c0f9c 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/getdisklimits.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/getdisklimits.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/vimdriver/v1/limits/1234/disk", + "uri": "/api/vimdriver/v1/limits/1234/disk", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/gethost.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/gethost.json index 427d208..f12b3e1 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/gethost.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/gethost.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/vimdriver/v1/[a-zA-Z0-9\\-\\_]{1,36}/hosts/[a-zA-Z0-9\\-\\_]{1,36}",
+ "uri": "/api/vimdriver/v1/[a-zA-Z0-9\\-\\_]{1,36}/hosts/[a-zA-Z0-9\\-\\_]{1,36}",
"method": "get",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/gethosts.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/gethosts.json index 58d315b..70fdf70 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/gethosts.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/gethosts.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/vimdriver/v1/[a-zA-Z0-9\\-\\_]{1,36}/hosts",
+ "uri": "/api/vimdriver/v1/[a-zA-Z0-9\\-\\_]{1,36}/hosts",
"method": "get",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/getnetworks.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/getnetworks.json index e8afa28..3a576c0 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/getnetworks.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/getnetworks.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/vimdriver/v1/networks",
+ "uri": "/api/vimdriver/v1/networks",
"method": "get",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/getports.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/getports.json index 37902ca..082d35d 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/getports.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/getports.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/vimdriver/v1/ports",
+ "uri": "/api/vimdriver/v1/ports",
"method": "get",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor1.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor1.json index 9cbc812..4985a72 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor1.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor1.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/umcres/v1/resinfo",
+ "uri": "/api/umcres/v1/resinfo",
"method": "post",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor2.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor2.json index 631cf55..6d573b2 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor2.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor2.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/umcres/v1/resinfo",
+ "uri": "/api/umcres/v1/resinfo",
"method": "post",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor3.json b/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor3.json index 4452178..353ee2b 100644 --- a/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor3.json +++ b/ResmanagementService/service/src/integration-test/resources/mocoserver/sendmsgmonitor3.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/umcres/v1/resinfo",
+ "uri": "/api/umcres/v1/resinfo",
"method": "delete",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostsfail1.json index 2966f48..5057387 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts", + "uri": "/api/resmgr/v1/hosts", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostssuccess1.json index 4573a0c..70c5d2f 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/createhostssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts", + "uri": "/api/resmgr/v1/hosts", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostsfail1.json index 5144c9a..ff971a3 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts?id=aaaa", + "uri": "/api/resmgr/v1/hosts?id=aaaa", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostssuccess1.json index 98f3d13..f2a50f0 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/deletehostssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts?id=12345678", + "uri": "/api/resmgr/v1/hosts?id=12345678", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostsfail1.json index de24b26..dcc90af 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts", + "uri": "/api/resmgr/v1/hosts", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostssuccess1.json index 3280951..b8cdf6f 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/modhostssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts", + "uri": "/api/resmgr/v1/hosts", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidfail1.json index fe528b2..4a75892 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts/aaaa", + "uri": "/api/resmgr/v1/hosts/aaaa", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidsuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidsuccess1.json index 0cccaa0..5e710e4 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidsuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/hostroa/queryhostsbyidsuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/hosts/12345678", + "uri": "/api/resmgr/v1/hosts/12345678", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querycpulimitssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querycpulimitssuccess1.json index 8b24164..f180dcc 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querycpulimitssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querycpulimitssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/limits/1234/cpu?vimId=123", + "uri": "/api/resmgr/v1/limits/1234/cpu?vimId=123", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querydisklimitssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querydisklimitssuccess1.json index 7da9cdb..597077c 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querydisklimitssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/limitsroa/querydisklimitssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/limits/1234/disk?vimId=123", + "uri": "/api/resmgr/v1/limits/1234/disk?vimId=123", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationsfail1.json index c490bc9..1923783 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations", + "uri": "/api/resmgr/v1/locations", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationssuccess1.json index fb4b97a..79ee63a 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/createlocationssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations", + "uri": "/api/resmgr/v1/locations", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationsfail1.json index 136096d..95d1653 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations/aaaa", + "uri": "/api/resmgr/v1/locations/aaaa", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationssuccess1.json index eaaf8d9..4db9973 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/deletelocationssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations/12345678", + "uri": "/api/resmgr/v1/locations/12345678", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationsfail1.json index d362898..a11ed14 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations", + "uri": "/api/resmgr/v1/locations", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationssuccess1.json index 3205272..aeec735 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/modlocationssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations", + "uri": "/api/resmgr/v1/locations", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidfail1.json index b49a37d..67b3051 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations/aaaa", + "uri": "/api/resmgr/v1/locations/aaaa", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidsuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidsuccess1.json index 387adc9..18b80d3 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidsuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/locationroa/querylocationsbyidsuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/locations/12345678", + "uri": "/api/resmgr/v1/locations/12345678", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworksfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworksfail1.json index 014d49f..3371390 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworksfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworksfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks", + "uri": "/api/resmgr/v1/networks", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworkssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworkssuccess1.json index b909858..de74e50 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworkssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/createnetworkssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks", + "uri": "/api/resmgr/v1/networks", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworksfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworksfail1.json index d3a5e5a..9b2aa38 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworksfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworksfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks?id=aaaa", + "uri": "/api/resmgr/v1/networks?id=aaaa", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworkssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworkssuccess1.json index 1e56c4b..05da4de 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworkssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/deletenetworkssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks?id=12345678", + "uri": "/api/resmgr/v1/networks?id=12345678", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworksfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworksfail1.json index 2852a2a..cb5dd0d 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworksfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworksfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks", + "uri": "/api/resmgr/v1/networks", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworkssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworkssuccess1.json index fc6aed8..6e807b7 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworkssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/modnetworkssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks", + "uri": "/api/resmgr/v1/networks", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidfail1.json index ae888cf..5d8579c 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks/aaaa", + "uri": "/api/resmgr/v1/networks/aaaa", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidsuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidsuccess1.json index b933eb4..ab37a5f 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidsuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/networkroa/querynetworksbyidsuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/networks/12345678", + "uri": "/api/resmgr/v1/networks/12345678", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportsfail1.json index 7270bf4..bec2d4c 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports", + "uri": "/api/resmgr/v1/ports", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportssuccess1.json index b31d469..f2094e9 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/createportssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports", + "uri": "/api/resmgr/v1/ports", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportsfail1.json index c4e3659..121b70d 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports?id=aaaa", + "uri": "/api/resmgr/v1/ports?id=aaaa", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportssuccess1.json index 843593d..02b39d2 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/deleteportssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports?id=12345678", + "uri": "/api/resmgr/v1/ports?id=12345678", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportsfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportsfail1.json index 6c3f521..758129a 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportsfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportsfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports", + "uri": "/api/resmgr/v1/ports", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportssuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportssuccess1.json index 583764c..763df3e 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportssuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/modportssuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports", + "uri": "/api/resmgr/v1/ports", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidfail1.json index 6a1007f..eef43e4 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports/aaaa", + "uri": "/api/resmgr/v1/ports/aaaa", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidsuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidsuccess1.json index 4fe360f..8ec12cf 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidsuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/portroa/queryportsbyidsuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/ports/12345678", + "uri": "/api/resmgr/v1/ports/12345678", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcefail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcefail1.json index a604f52..afe4eec 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcefail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcefail1.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/resmgr/v1/resoperate/resmgr/vims?tenantId=1234",
+ "uri": "/api/resmgr/v1/resoperate/resmgr/vims?tenantId=1234",
"method": "post",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcesuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcesuccess1.json index b23f38f..bf22e58 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcesuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/addresourcesuccess1.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/resmgr/v1/resoperate/resmgr/vims?tenantId=1234&vimId=123",
+ "uri": "/api/resmgr/v1/resoperate/resmgr/vims?tenantId=1234&vimId=123",
"method": "post",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcefail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcefail1.json index d60484c..c16ad1f 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcefail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcefail1.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/resmgr/v1/resoperate",
+ "uri": "/api/resmgr/v1/resoperate",
"method": "delete",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcesuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcesuccess1.json index 4b099ae..00b046f 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcesuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/deleteresourcesuccess1.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/resmgr/v1/resoperate?vimId=123",
+ "uri": "/api/resmgr/v1/resoperate?vimId=123",
"method": "delete",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcefail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcefail1.json index 0a54e89..ea6aa65 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcefail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcefail1.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/resmgr/v1/resoperate/updateres?tenantId=1234",
+ "uri": "/api/resmgr/v1/resoperate/updateres?tenantId=1234",
"method": "put",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcesuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcesuccess1.json index c3196c1..4982ccc 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcesuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/resoperateroa/modresourcesuccess1.json @@ -1,6 +1,6 @@ {
"request": {
- "uri": "/openoapi/resmgr/v1/resoperate/updateres?tenantId=1234&vimId=123",
+ "uri": "/api/resmgr/v1/resoperate/updateres?tenantId=1234&vimId=123",
"method": "put",
"headers": {
"Content-Type": "application/json;charset=UTF-8"
diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitesfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitesfail1.json index 5584c1e..8c1e37b 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitesfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitesfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters", + "uri": "/api/resmgr/v1/datacenters", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitessuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitessuccess1.json index af0d3af..7eaffaa 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitessuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/createsitessuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters", + "uri": "/api/resmgr/v1/datacenters", "method": "post", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitesfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitesfail1.json index aacd3fe..17eb50a 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitesfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitesfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters/aaaa", + "uri": "/api/resmgr/v1/datacenters/aaaa", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitessuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitessuccess1.json index d4b083b..96c1374 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitessuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/deletesitessuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters/12345678", + "uri": "/api/resmgr/v1/datacenters/12345678", "method": "delete", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitesfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitesfail1.json index 2c1be4e..5d698a8 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitesfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitesfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters", + "uri": "/api/resmgr/v1/datacenters", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitessuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitessuccess1.json index da19356..ecc8595 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitessuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/modsitessuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters", + "uri": "/api/resmgr/v1/datacenters", "method": "put", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidfail1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidfail1.json index b12b02c..cc21209 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidfail1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidfail1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters/aaaa", + "uri": "/api/resmgr/v1/datacenters/aaaa", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidsuccess1.json b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidsuccess1.json index 984a7eb..6ade06c 100644 --- a/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidsuccess1.json +++ b/ResmanagementService/service/src/integration-test/resources/testcase/siteroa/querysitesbyidsuccess1.json @@ -1,6 +1,6 @@ { "request": { - "uri": "/openoapi/resmgr/v1/datacenters/12345678", + "uri": "/api/resmgr/v1/datacenters/12345678", "method": "get", "headers": { "Content-Type": "application/json;charset=UTF-8" diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java index 3abb3c4..68dc312 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/constant/UrlConstant.java @@ -35,16 +35,16 @@ public class UrlConstant { /** * MSB register url. */ - 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 ESR_GET_VIM_URL = "/openoapi/extsys/v1/vims/%s"; + public static final String ESR_GET_VIM_URL = "/api/extsys/v1/vims/%s"; - public static final String ESR_GET_VIMS_URL = "/openoapi/extsys/v1/vims"; + public static final String ESR_GET_VIMS_URL = "/api/extsys/v1/vims"; /** * send resource info to monitor url */ - public static final String SEND_MSG_MONITOR = "/openoapi/umc/v1/resinfo"; + public static final String SEND_MSG_MONITOR = "/api/umc/v1/resinfo"; /** * networks url. @@ -149,32 +149,32 @@ public class UrlConstant { /** * getNetworkURL. */ - public static final String GET_NETWORK_URL = "/openoapi/multivim/v1/%s/%s/networks"; + public static final String GET_NETWORK_URL = "/api/multivim/v1/%s/%s/networks"; /** * getTenantURL. */ - public static final String GET_TENANT_URL = "/openoapi/multivim/v1/%s/tenants"; + public static final String GET_TENANT_URL = "/api/multivim/v1/%s/tenants"; /** * getHostURL. */ - public static final String GET_HOST_URL = "/openoapi/multivim/v1/%s/%s/hosts"; + public static final String GET_HOST_URL = "/api/multivim/v1/%s/%s/hosts"; /** * getHostDetailURL. */ - public static final String GET_HOSTDETAIL_URL = "/openoapi/multivim/v1/%s/%s/hosts/%s"; + public static final String GET_HOSTDETAIL_URL = "/api/multivim/v1/%s/%s/hosts/%s"; /** * getNetworkURL. */ - public static final String GET_PORT_URL = "/openoapi/multivim/v1/%s/%s/ports"; + public static final String GET_PORT_URL = "/api/multivim/v1/%s/%s/ports"; /** * getLimitsURL. */ - public static final String GET_LIMITS_URL = "/openoapi/multivim/v1/%s/%s/limits"; + public static final String GET_LIMITS_URL = "/api/multivim/v1/%s/%s/limits"; /** * template notify M url. diff --git a/ResmanagementService/service/src/main/resources/swagger.json b/ResmanagementService/service/src/main/resources/swagger.json index 6273c04..6a31591 100644 --- a/ResmanagementService/service/src/main/resources/swagger.json +++ b/ResmanagementService/service/src/main/resources/swagger.json @@ -10,7 +10,7 @@ "name": "Resource Management services" } ], - "basePath": "/openoapi/resmgr/v1", + "basePath": "/api/resmgr/v1", "paths": { "/limits": { "get": { diff --git a/ResmanagementService/service/src/main/webapp/WEB-INF/web.xml b/ResmanagementService/service/src/main/webapp/WEB-INF/web.xml index 5e7e6bd..eb4ff01 100644 --- a/ResmanagementService/service/src/main/webapp/WEB-INF/web.xml +++ b/ResmanagementService/service/src/main/webapp/WEB-INF/web.xml @@ -29,7 +29,7 @@ </servlet> <servlet-mapping> <servlet-name>CXFServlet</servlet-name> - <url-pattern>/openoapi/resmgr/*</url-pattern> + <url-pattern>/api/resmgr/*</url-pattern> </servlet-mapping> <context-param> diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java index 0bcdb81..07b53a8 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java @@ -234,7 +234,7 @@ public class ResmgrAdapter2MSBManagerTest { private Map<String, String> getHashMap() { Map<String, String> paramsMap = new HashMap<>(); - paramsMap.put("url", "/openoapi/microservices/v1/services"); + paramsMap.put("url", "/api/microservices/v1/services"); paramsMap.put("methodType", "post"); return paramsMap; } diff --git a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java index 24200e8..0d0e24e 100644 --- a/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java +++ b/ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrServiceTest.java @@ -40,7 +40,7 @@ public class ResmgrAdapterMgrServiceTest { @Mock public String readVimAdapterInfoFromJson() throws IOException { - return "{\"serviceName\": \"resmgr\",\"version\": \"v1\",\"url\": \"/openoapi/resmgr/v1\",\"protocol\": \"REST\",\"visualRange\": \"1\",\"nodes\": [{\"ip\": \"127.0.0.1\",\"port\": \"8080\",\"ttl\": 0}]}"; + return "{\"serviceName\": \"resmgr\",\"version\": \"v1\",\"url\": \"/api/resmgr/v1\",\"protocol\": \"REST\",\"visualRange\": \"1\",\"nodes\": [{\"ip\": \"127.0.0.1\",\"port\": \"8080\",\"ttl\": 0}]}"; } }; |