From a52f00e9d0af1181d3e9c87508789fb4ced022f5 Mon Sep 17 00:00:00 2001 From: Itohan Date: Mon, 30 Sep 2019 23:39:44 +0000 Subject: Minor bug fixes in CLI - Added USER_ID header for SDC - Changed multicloud url - Added samples for commands - Fixed Bug in service-create command Signed-off-by: Itohan Ukponmwan Issue-ID: CLI-229 Change-Id: I9ec94d6dd390d2b5bf059c2f8a82c67b65fbeb34 --- .../open-cli-schema/service-model/get-resource-module-name.yaml | 2 ++ .../service-model/service-model-add-vf-schema-elalto.yaml | 4 +++- .../service-model/service-model-approve-schema-elalto.yaml | 2 ++ .../service-model/service-model-archive-schema-elalto.yaml | 4 +++- .../service-model/service-model-checkin-schema-elalto.yaml | 4 +++- .../service-model/service-model-checkout-schema-elalto.yaml | 4 +++- .../service-model/service-model-create-schema-elalto.yaml | 2 ++ .../service-model/service-model-distribute-schema-elalto.yaml | 2 ++ .../service-model/service-model-list-schema-elalto.yaml | 2 ++ .../open-cli-schema/service-model/service-model-set-property.yaml | 2 ++ .../service-model/service-model-test-accept-schema-elalto.yaml | 4 +++- .../service-model/service-model-test-reject-schema-elalto.yaml | 2 ++ .../service-model/service-model-test-request-schema-elalto.yaml | 2 ++ .../service-model/service-model-test-start-schema-elalto.yaml | 2 ++ .../service-model/service-model-undocheckout-schema-elalto.yaml | 2 ++ .../service-model/service2vf-model-list-schema-elalto.yaml | 2 ++ 16 files changed, 37 insertions(+), 5 deletions(-) (limited to 'products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model') diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml index 74e75c7a..2519abc3 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml @@ -43,6 +43,8 @@ http: request: uri: /sdc2/rest/v1/followed method: GET + headers: + USER_ID: ${host-username} success_codes: - 200 result_map: diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-elalto.yaml index f7634e53..79ee5fe8 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-elalto.yaml @@ -72,10 +72,12 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/resourceInstance method: POST + headers: + USER_ID: ${host-username} body: '{"name": "${vf-name}", "componentVersion": "${vf-version}", "posY": 248, "posX": 406, "uniqueId": "${service-id}-${vf-id}", "originType": "VF", "componentUid": "${vf-id}", "icon": "defaulticon"}' success_codes: - 201 result_map: id: $b{$.uniqueId} uuid: $b{$.componentUid} - inputs: $b{$.inputs.[*].uniqueId} \ No newline at end of file + inputs: $b{$.inputs.[*].uniqueId} diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-elalto.yaml index ce679293..d7d4214f 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-elalto.yaml @@ -45,6 +45,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/distribution-state/approve method: POST + headers: + USER_ID: ${host-username} body: '{"userRemarks": "${remarks}"}' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-elalto.yaml index a90a649f..a9fb9d58 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-elalto.yaml @@ -39,7 +39,9 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/archive method: POST + headers: + USER_ID: ${host-username} body: '{}' success_codes: - 200 - - 417 \ No newline at end of file + - 417 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-elalto.yaml index cdb80d9d..48ec91f7 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-elalto.yaml @@ -58,10 +58,12 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/CHECKIN method: POST + headers: + USER_ID: ${host-username} body: '{"userRemarks": "${remarks}"}' success_codes: - 200 result_map: id: $b{$.uniqueId} version: $b{$.version} - uuid: $b{$.unid} \ No newline at end of file + uuid: $b{$.unid} diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-elalto.yaml index a2148ec2..43c2b85b 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-elalto.yaml @@ -50,9 +50,11 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/CHECKOUT method: POST + headers: + USER_ID: ${host-username} body: '{}' success_codes: - 200 result_map: id: $b{$.uniqueId} - version: $b{$.version} \ No newline at end of file + version: $b{$.version} diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-elalto.yaml index 9e59252a..e116730a 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-elalto.yaml @@ -83,6 +83,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services method: POST + headers: + USER_ID: ${host-username} body: '{ "artifacts":{}, "toscaArtifacts":{}, diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-elalto.yaml index 74431223..ee2ce97f 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-elalto.yaml @@ -39,6 +39,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/distribution/PROD/activate method: POST + headers: + USER_ID: ${host-username} body: '{}' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-elalto.yaml index 55fae0f5..33a1c20b 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-elalto.yaml @@ -67,6 +67,8 @@ http: request: uri: /sdc2/rest/v1/followed method: GET + headers: + USER_ID: ${host-username} success_codes: - 200 result_map: diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml index 33cd040a..e8e5a197 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml @@ -68,6 +68,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/resourceInstance/${vf-resource-id}/inputs method: POST + headers: + USER_ID: ${host-username} body: '[{"constraints":[],"definition":false,"name":"${property-name}","parentUniqueId":"${input-uuid}","password":false,"required":false,"schema":{"property":{}},"toscaPresentation":{"ownerId":"${input-uuid}"},"type":"string","uniqueId":"${input-uuid}.${property-name}","value":"${property-value}"}]' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-elalto.yaml index 0f5d03a3..bf75ca70 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-elalto.yaml @@ -59,10 +59,12 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/certify method: POST + headers: + USER_ID: ${host-username} body: '{"userRemarks": "${remarks}"}' success_codes: - 200 result_map: id: $b{$.uniqueId} version: $b{$.version} - uuid: $b{$.unid} \ No newline at end of file + uuid: $b{$.unid} diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-elalto.yaml index eba54b21..365ee7f9 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-elalto.yaml @@ -45,6 +45,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/failCertification method: POST + headers: + USER_ID: ${host-username} body: '{"userRemarks": "${test-remark}"}' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-elalto.yaml index d3dc707e..a5022ed9 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-elalto.yaml @@ -44,6 +44,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/certificationRequest method: POST + headers: + USER_ID: ${host-username} body: '{"userRemarks": "${remarks}"}' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-elalto.yaml index 9c12957a..73f24add 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-elalto.yaml @@ -39,6 +39,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/startCertification method: POST + headers: + USER_ID: ${host-username} body: '{}' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-elalto.yaml index f4df3196..9a49ea35 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-elalto.yaml @@ -39,6 +39,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-uuid}/lifecycleState/UNDOCHECKOUT method: POST + headers: + USER_ID: ${host-username} body: '{"userRemarks": null}' success_codes: - 200 diff --git a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-elalto.yaml b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-elalto.yaml index 14d44529..de7f0985 100644 --- a/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-elalto.yaml +++ b/products/onap-elalto/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-elalto.yaml @@ -63,6 +63,8 @@ http: request: uri: /sdc2/rest/v1/catalog/services/${service-id} method: GET + headers: + USER_ID: ${host-username} success_codes: - 200 result_map: -- cgit 1.2.3-korg