diff options
| author |   MatthieuGeerebaert <matthieu.geerebaert@orange.com> | 2018-03-29 00:42:08 +0200 |
|---|---|---|
| committer | MatthieuGeerebaert <matthieu.geerebaert@orange.com> | 2018-04-03 23:48:32 +0200 |
| commit | 7d695d108ce9f5fd5ee977fe12e47b704f507623 (patch) | |
| tree | 42b4d6e72ef5546c2c9c100323b2db1b33c4ab84 /src/test/resources | |
| parent | 9ac6c3cc7e3f4aec9ba69e7a5bb0800471c4e8dc (diff) | |
Add serviceOrder rest services
- Add create, get, find serviceOrder operations
- Add tests
- Add Mongo / Mysql / H2 datasource management ( H2 test )
- Add VSCode restclient samples with .settings to play with serviceOrder
operations
- Resolve conflict 40291, with cherry pick
Change-Id: I81a76a211fe5526a3a31deb945770f0a5e2c195f
Issue-ID: EXTAPI-42
Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com>
Diffstat (limited to 'src/test/resources')
8 files changed, 66 insertions, 4 deletions
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index f778b8a..793da56 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -12,6 +12,7 @@ onap.cloudOwner=CloudOwner # NBI nbi.url=http://127.0.0.1:8080/nbi/api/v1 +nbi.callForVNF=false # SDC sdc.host=http://127.0.0.1:8091 @@ -23,4 +24,9 @@ aai.host=http://127.0.0.1:8091 aai.header.authorization=Basic QUFJOkFBSQ== aai.api.id=AAI +# SO +so.host=http://127.0.0.1:8091 +so.header.authorization= +so.api.id=SO + diff --git a/src/test/resources/mappings/sdc_find.json b/src/test/resources/mappings/sdc_find.json index e992f2b..6aa4dc5 100644 --- a/src/test/resources/mappings/sdc_find.json +++ b/src/test/resources/mappings/sdc_find.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPath": "/sdc/v1/catalog/services/" + "url": "/sdc/v1/catalog/services/" }, "response": { "status": 200, diff --git a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json b/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json index 3aeff82..4956be7 100644 --- a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json +++ b/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPath": "/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439/metadata" + "url": "/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439/metadata" }, "response": { "status": 200, diff --git a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json b/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json index 2090397..ebf72bb 100644 --- a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json +++ b/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPath": "/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439/toscaModel" + "url": "/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439/toscaModel" }, "response": { "status": 200, diff --git a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json b/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json index 567503a..55edc99 100644 --- a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json +++ b/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json @@ -1,7 +1,7 @@ { "request": { "method": "GET", - "urlPath": "/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca/metadata" + "url": "/sdc/v1/catalog/services/1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca/metadata" }, "response": { "status": 200, diff --git a/src/test/resources/mappings/so_delete_service_instance.json b/src/test/resources/mappings/so_delete_service_instance.json new file mode 100644 index 0000000..a2e854e --- /dev/null +++ b/src/test/resources/mappings/so_delete_service_instance.json @@ -0,0 +1,18 @@ +{ + "request": { + "method": "DELETE", + "url": "/ecomp/mso/infra/serviceInstances/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb" + }, + "response": { + "status": 201, + "headers": { + "Content-Type": "application/json" + }, + "jsonBody": { + "requestReference": { + "instanceId": "instanceId", + "requestId": "requestId" + } + } + } +}
\ No newline at end of file diff --git a/src/test/resources/mappings/so_get_.json b/src/test/resources/mappings/so_get_.json new file mode 100644 index 0000000..5d4148f --- /dev/null +++ b/src/test/resources/mappings/so_get_.json @@ -0,0 +1,20 @@ +{ + "request": { + "method": "GET", + "url": "/ecomp/mso/infra/orchestrationRequests/v4/requestId" + }, + "response": { + "status": 200, + "headers": { + "Content-Type": "application/json" + }, + "jsonBody": { + "request": { + "requestStatus": { + "requestState": "COMPLETE", + "percentProgress": 100 + } + } + } + } +}
\ No newline at end of file diff --git a/src/test/resources/mappings/so_post_create_service_instance.json b/src/test/resources/mappings/so_post_create_service_instance.json new file mode 100644 index 0000000..4b61b2c --- /dev/null +++ b/src/test/resources/mappings/so_post_create_service_instance.json @@ -0,0 +1,18 @@ +{ + "request": { + "method": "POST", + "url": "/ecomp/mso/infra/serviceInstance/v4" + }, + "response": { + "status": 201, + "headers": { + "Content-Type": "application/json" + }, + "jsonBody": { + "requestReference": { + "instanceId": "instanceId", + "requestId": "requestId" + } + } + } +}
\ No newline at end of file |