diff options
Diffstat (limited to 'products/onap-dublin/features/sdc/src/main/resources/open-cli-schema')
43 files changed, 510 insertions, 227 deletions
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-create-schema-dublin.yaml index 20077715..91b6ccd8 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create SDC consumer info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-show-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-show-schema-dublin.yaml index 5de269e4..58836699 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-show-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/consumer/sdc-consumer-show-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Retrieve SDC consumer info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml index addce58d..bd67c6a1 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml @@ -18,7 +18,7 @@ description: Get resource module name info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml index dc881d90..0a81b0f1 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Add a artifact to a Service model info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org parameters: - - name: service-uniqueId + - name: service-id description: Service Unique Id type: string - long_option: service-uniqueId + long_option: service-id short_option: x is_optional: false - name: remarks @@ -62,7 +62,7 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-uniqueId}/artifacts + uri: /sdc2/rest/v1/catalog/services/${service-id}/artifacts method: POST headers: Content-MD5: $s{md5:__body__} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml index 06b4c4fb..c0d6bbf0 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml @@ -18,22 +18,22 @@ description: Helps to add VF into service models in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-id + - name: service-id description: Onap Service Name type: string short_option: x - long_option: service-model-id + long_option: service-id is_optional: false - - name: vf-uniqueId + - name: vf-id description: VF Unique ID type: string short_option: y - long_option: vf-uniqueId + long_option: vf-id is_optional: true - name: vf-name description: VF Name @@ -51,14 +51,18 @@ parameters: results: direction: portrait attributes: - - name: ID + - name: id description: Service ID scope: short type: string - - name: UUID + - name: uuid description: Service UUID scope: short type: string + - name: inputs + description: VNF Input ids + scope: short + type: string http: service: name: sdc @@ -66,11 +70,12 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-id}/resourceInstance + uri: /sdc2/rest/v1/catalog/services/${service-id}/resourceInstance method: POST - body: '{"name": "${vf-name}", "componentVersion": "${vf-version}", "posY": 248, "posX": 406, "uniqueId": "${service-model-id}-${vf-uniqueId}", "originType": "VF", "componentUid": "${vf-uniqueId}", "icon": "defaulticon"}' + 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}
\ No newline at end of file + id: $b{$.uniqueId} + uuid: $b{$.componentUid} + inputs: $b{$.inputs.[*].uniqueId}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml index 5b39b846..943796df 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Approves the Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-uniqueId - description: Service model UniqueId (can be found by running service-model-list) + - name: service-id + description: Service model UniqueId type: string - long_option: service-model-uniqueId + long_option: service-id short_option: b is_optional: false - name: remarks @@ -43,7 +43,7 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-uniqueId}/distribution-state/approve + uri: /sdc2/rest/v1/catalog/services/${service-id}/distribution-state/approve method: POST body: '{"userRemarks": "${remarks}"}' success_codes: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-dublin.yaml new file mode 100644 index 00000000..e28e4ac6 --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-dublin.yaml @@ -0,0 +1,45 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: service-model-archive +description: Archive the Service model in SDC + +info: + product: onap-dublin + service: sdc.catalog + author: ONAP CLI Team onap-discuss@lists.onap.org + + +parameters: + - name: service-id + description: Service model UniqueId + type: string + long_option: service-id + short_option: b + is_optional: false + +http: + service: + name: sdc + version: v1.0 + auth: basic + mode: direct + request: + uri: /sdc2/rest/v1/catalog/services/${service-id}/archive + method: POST + body: '{}' + success_codes: + - 200 + - 417
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml index 444a0c58..29936912 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml @@ -18,14 +18,14 @@ description: Checkin Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-uuid - description: Service model UUID (can be found by running service-model-list) + - name: service-id + description: Service model ID type: string - long_option: service-model-uuid + long_option: service-id short_option: b is_optional: false - name: remarks @@ -34,7 +34,21 @@ parameters: long_option: remarks short_option: r is_optional: false - +results: + direction: portrait + attributes: + - name: id + description: NS checked out version unique ID + scope: short + type: string + - name: uuid + description: NS checked out version unique ID + scope: short + type: string + - name: version + description: VF version + scope: short + type: string http: service: name: sdc @@ -42,8 +56,12 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/lifecycleState/CHECKIN + uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/CHECKIN method: POST body: '{"userRemarks": "${remarks}"}' success_codes: - 200 + result_map: + id: $b{$.uniqueId} + version: $b{$.version} + uuid: $b{$.unid}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml index ec0ccc6d..4d15c875 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml @@ -18,25 +18,29 @@ description: Checkout Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-uuid - description: Service model UUID (can be found from service-model-list) + - name: service-id + description: Service model ID type: string - long_option: service-model-uuid + long_option: service-id short_option: b is_optional: true results: direction: portrait attributes: - - name: ID + - name: id description: NS checked out version unique ID scope: short type: string + - name: version + description: VF version + scope: short + type: string http: service: name: sdc @@ -44,10 +48,11 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/lifecycleState/CHECKOUT + uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/CHECKOUT method: POST body: '{}' success_codes: - 200 result_map: - ID: $b{$.uniqueId}
\ No newline at end of file + id: $b{$.uniqueId} + version: $b{$.version}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml index ebc0c468..aa0e004b 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org @@ -66,10 +66,14 @@ parameters: results: direction: portrait attributes: - - name: ID + - name: id description: Service ID scope: short type: string + - name: uuid + description: Service UUID + scope: short + type: string http: service: name: sdc @@ -117,4 +121,5 @@ http: - 200 - 201 result_map: - ID: $b{$.uniqueId} + id: $b{$.uniqueId} + uuid: $b{$.uuid} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml index cf981b71..adbe0c0e 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Distributes the Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-uniqueId + - name: service-id description: Service model UUID (can be found from service-model-list) type: string - long_option: service-model-uniqueId + long_option: service-id short_option: b is_optional: true @@ -37,7 +37,7 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-uniqueId}/distribution/PROD/activate + uri: /sdc2/rest/v1/catalog/services/${service-id}/distribution/PROD/activate method: POST body: '{}' success_codes: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml index 87ccf7c8..8e5a3abf 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml @@ -18,7 +18,7 @@ description: List the service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org @@ -29,7 +29,7 @@ results: description: UUID type: string scope: short - - name: uniqueId + - name: id description: uniqueId type: string scope: short @@ -71,7 +71,7 @@ http: - 200 result_map: uuid: $b{services.[*].uuid} - uniqueId: $b{services.[*].uniqueId} + id: $b{services.[*].uniqueId} invariant-uuid: $b{services.[*].invariantUUID} version: $b{services.[*].version} name: $b{services.[*].name} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml index a7ea76b7..d69b6669 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml @@ -18,27 +18,27 @@ description: Set property to a service model info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org parameters: - - name: service-uniqueId + - name: service-id description: service UniqueId type: string - long_option: service-uniqueId + long_option: service-id short_option: x is_optional: false - - name: resource-uuid - description: resource uuid + - name: vf-resource-id + description: resource id provided by service ns_id.vf_id.vf_name type: string - long_option: resource-uuid + long_option: vf-resource-id short_option: y is_optional: false - - name: resource-uniqueId - description: resource UniqueId + - name: vf-id + description: resource id type: string - long_option: resource-uniqueId + long_option: vf-id short_option: z is_optional: false - name: property-name @@ -53,6 +53,12 @@ parameters: long_option: property-value short_option: r is_optional: false + - name: input-uuid + description: VF Model Input uuid + type: string + long_option: input-uuid + short_option: R + is_optional: false http: service: name: sdc @@ -60,8 +66,8 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-uniqueId}/resourceInstance/${resource-uniqueId}/properties + uri: /sdc2/rest/v1/catalog/services/${service-id}/resourceInstance/${vf-resource-id}/inputs method: POST - body: '[{"constraints":null,"defaultValue":null,"description":null,"name":"${property-name}","parentUniqueId":null,"password":false,"required":false,"schema":{"property":{}},"schemaType":null,"type":"string","uniqueId":"${resource-uuid}.${property-name}","value":"${property-value}","definition":false,"getInputValues":null,"parentPropertyType":null,"subPropertyInputPath":null,"toscaPresentation":{"ownerId":null},"getPolicyValues":null,"inputPath":null}]' + 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-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml index 85a31861..8522ea6a 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml @@ -18,24 +18,38 @@ description: Accepts the Service model test in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-id + - name: service-id description: Service model ID type: string - long_option: service-model-id + long_option: service-id short_option: b is_optional: false - - name: test-remark + - name: remarks description: Remarks when accepting test type: string - long_option: test-remark + long_option: remarks short_option: r is_optional: false - +results: + direction: portrait + attributes: + - name: id + description: NS checked out version unique ID + scope: short + type: string + - name: uuid + description: NS checked out version unique ID + scope: short + type: string + - name: version + description: VF version + scope: short + type: string http: service: name: sdc @@ -43,8 +57,12 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certify + uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/certify method: POST - body: '{"userRemarks": "${test-remark}"}' + body: '{"userRemarks": "${remarks}"}' success_codes: - 200 + result_map: + id: $b{$.uniqueId} + version: $b{$.version} + uuid: $b{$.unid}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml index 7a1aad14..83aead84 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Rejects the Service model test in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org parameters: - - name: service-model-id + - name: service-id description: Service model ID type: string - long_option: service-model-id + long_option: service-id short_option: b is_optional: false - name: test-remark @@ -43,7 +43,7 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/failCertification + uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/failCertification method: POST body: '{"userRemarks": "${test-remark}"}' success_codes: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml index cf3f7c9d..c0bdcd59 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml @@ -18,21 +18,21 @@ description: Request the certification of Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-id + - name: service-id description: Service model ID type: string - long_option: service-model-id + long_option: service-id short_option: b is_optional: true - - name: remark + - name: remarks description: Remarks when submitting for testing type: string - long_option: remark + long_option: remarks short_option: r http: @@ -42,9 +42,9 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certificationRequest + uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/certificationRequest method: POST - body: '{"userRemarks": "Requesting certification via CLI"}' + body: '{"userRemarks": "${remarks}"}' success_codes: - 200 diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml index 60c3239f..c43358d9 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Starts the testing of a Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-id + - name: service-id description: Service model ID type: string - long_option: service-model-id + long_option: service-id short_option: b is_optional: true @@ -37,7 +37,7 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/startCertification + uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/startCertification method: POST body: '{}' success_codes: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml index ae9e8356..50023907 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Undo Checkout of Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-uuid + - name: service-uuid description: Service model UUIID (check service-model-list) type: string - long_option: service-model-uuid + long_option: service-uuid short_option: b is_optional: true @@ -37,7 +37,7 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/lifecycleState/UNDOCHECKOUT + uri: /sdc2/rest/v1/catalog/services/${service-uuid}/lifecycleState/UNDOCHECKOUT method: POST body: '{"userRemarks": null}' success_codes: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml index 2241e05c..f2c67371 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml @@ -18,16 +18,16 @@ description: List the VF in a given service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-id + - name: service-id description: Service model uuid type: string short_option: z - long_option: service-model-id + long_option: service-id is_optional: false results: @@ -49,7 +49,7 @@ results: description: version type: string scope: short - - name: vf-unique-uuid + - name: vf-id description: customization UUID type: string scope: short @@ -61,12 +61,12 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-id} + uri: /sdc2/rest/v1/catalog/services/${service-id} method: GET success_codes: - 200 result_map: - vf-unique-uuid: $b{componentInstances.[*].uniqueId} + vf-id: $b{componentInstances.[*].uniqueId} vf-uuid: $b{componentInstances.[*].componentUid} vf-name: $b{componentInstances.[*].componentName} vf-version: $b{componentInstances.[*].componentVersion} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-add-artifact-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-add-artifact-schema-dublin.yaml index 1a6c6b7c..5eb0c8ca 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-add-artifact-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-add-artifact-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Add a artifact to a Virtual function info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org parameters: - - name: vf-uniqueId + - name: vf-id description: VF UniqueId type: string - long_option: vf-uniqueId + long_option: vf-id short_option: x is_optional: false - name: remarks @@ -62,7 +62,7 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/resources/${vf-uniqueId}/artifacts + uri: /sdc2/rest/v1/catalog/resources/${vf-id}/artifacts method: POST headers: Content-MD5: $s{md5:__body__} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-archive-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-archive-schema-dublin.yaml new file mode 100644 index 00000000..db14e45f --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-archive-schema-dublin.yaml @@ -0,0 +1,44 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: vf-model-archive +description: Archive VF model in SDC + +info: + product: onap-dublin + service: sdc.catalog + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vf-id + description: VF model ID + type: string + long_option: vf-id + short_option: b + is_optional: false + +http: + service: + name: sdc + version: v1.0 + auth: basic + mode: direct + request: + uri: /sdc2/rest/v1/catalog/resources/${vf-id}/archive + method: POST + body: '{}' + success_codes: + - 200 + - 417
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml index f14fd6e3..90877905 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml @@ -18,15 +18,15 @@ description: Certify a Virtual function info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org parameters: - - name: vf-uniqueId + - name: vf-id description: VF UniqueId type: string - long_option: vf-uniqueId + long_option: vf-id short_option: b is_optional: false - name: remarks @@ -36,6 +36,21 @@ parameters: short_option: r is_optional: true +results: + direction: portrait + attributes: + - name: id + description: VF version unique ID + scope: short + type: string + - name: uuid + description: VF UUID + scope: short + type: uuid + - name: version + description: VF version + scope: short + type: string http: service: name: sdc @@ -43,8 +58,12 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/resources/${vf-uniqueId}/lifecycleState/certify + uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/certify method: POST body: '{"userRemarks":"${remarks}"}' success_codes: - 200 + result_map: + id: $b{$.uniqueId} + uuid: $b{$.uuid} + version: $b{$.version} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-dublin.yaml index 9ec09f0a..b3a830d2 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkin-schema-dublin.yaml @@ -18,14 +18,14 @@ description: Checkin VF model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: vf-model-uuid - description: VF model UUID (can be found by running vf-model-list) + - name: vf-id + description: VF model ID type: string - long_option: vf-model-uuid + long_option: vf-id short_option: b is_optional: false - name: remarks @@ -35,7 +35,21 @@ parameters: short_option: r default_value: Checked in by ONAP CLI is_optional: false - +results: + direction: portrait + attributes: + - name: id + description: VF version unique ID + scope: short + type: string + - name: version + description: VF version + scope: short + type: string + - name: uuid + description: VF uuid + scope: short + type: string http: service: name: sdc @@ -43,8 +57,12 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/resources/${vf-model-uuid}/lifecycleState/CHECKIN + uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/CHECKIN method: POST body: '{"userRemarks": "${remarks}"}' success_codes: - 200 + result_map: + id: $b{$.uniqueId} + version: $b{$.version} + uuid: $b{$.uuid}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkout-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkout-schema-dublin.yaml index 511e29fd..c121811e 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkout-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-checkout-schema-dublin.yaml @@ -18,25 +18,29 @@ description: Checkout VF model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: vf-model-uuid - description: VF model UUID (can be found from vf-model-list) + - name: vf-id + description: VF model ID type: string - long_option: vf-model-uuid + long_option: vf-id short_option: b is_optional: false results: direction: portrait attributes: - - name: ID + - name: id description: VF checked out version unique ID scope: short type: string + - name: version + description: VF version + scope: short + type: string http: service: @@ -45,10 +49,11 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/resources/${vf-model-uuid}/lifecycleState/CHECKOUT + uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/CHECKOUT method: POST body: '{}' success_codes: - 200 result_map: - ID: $b{$.uniqueId}
\ No newline at end of file + id: $b{$.uniqueId} + version: $b{$.version}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml index 5a542ba2..5fa4cbaa 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create Virtual function from Vendor Software Product info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP HPA Team onap-discuss@lists.onap.org @@ -46,21 +46,29 @@ parameters: type: string long_option: vsp-id short_option: b - is_optional: false + is_optional: true - name: vsp-version description: VSP version type: string long_option: vsp-version short_option: g - is_optional: false + is_optional: true results: direction: portrait attributes: - - name: ID + - name: id description: VF ID scope: short type: string + - name: uuid + description: VF UUID + scope: short + type: string + - name: inputs + description: VNF Input ids + scope: short + type: string http: service: name: sdc @@ -70,49 +78,12 @@ http: request: uri: /sdc2/rest/v1/catalog/resources method: POST - body: '{ - "artifacts":{}, - "toscaArtifacts":{}, - "contactId":"${host-username}", - "categories":[{ - "name":"Generic", - "normalizedName":"generic", - "uniqueId":"resourceNewCategory.generic", - "icons": null, - "subcategories":[{ - "name":"Abstract", - "normalizedName":"abstract", - "uniqueId":"resourceNewCategory.generic.abstract", - "groupings":null, - "version":null, - "ownerId":null, - "icons":["abstract"], - "empty":false, - "type":null }], - "version":null, - "ownerId":null, - "empty":false, - "type":null }], - "description":"${description}", - "icon":"defaulticon", - "componentInstancesProperties":{}, - "componentInstancesAttributes":{}, - "name":"${name}", - "tags":["${name}"], - "capabilities":{}, - "requirements":{}, - "deploymentArtifacts":{}, - "componentType":"RESOURCE", - "vendorName":"${vendor-name}", - "vendorRelease":"1.0", - "componentInstances":[], - "properties":[], - "attributes":[], - "resourceType":"VF", - "csarUUID":"${vsp-id}", - "csarVersion":"1.0" - }' + body: '{"contactId": "${host-username}", "vendorRelease": "1.0", "requirements": {}, "artifacts": {}, "capabilities": {}, "componentInstancesProperties": {}, "deploymentArtifacts": {}, "icon": "defaulticon", "vendorName": "${vendor-name}", "description": "${description}", "tags": ["CLI", "${name}"], "properties": [], "categories": [{"subcategories": [{"normalizedName": "abstract", "name": "Abstract", "uniqueId": "resourceNewCategory.generic.abstract", "icons": ["database"]}], "normalizedName": "generic", "name": "Generic", "uniqueId": "resourceNewCategory.generic"}], "name": "${name}", "toscaArtifacts": {}, "csarUUID": "${vsp-id}", "resourceType": "VF", "csarVersion": "${vsp-version}", "componentType": "RESOURCE", "componentInstancesAttributes": {}, "attributes": [], "componentInstances": []}' + context: + remove_empty_node: true success_codes: - 201 result_map: - ID: $b{$.uniqueId} + id: $b{$.uniqueId} + uuid: $b{$.uuid} + inputs: $b{$.inputs.[*].uniqueId}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-dublin.yaml index daf8be02..79665673 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-list-schema-dublin.yaml @@ -18,7 +18,7 @@ description: List the VF resource model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org @@ -29,8 +29,8 @@ results: description: UUID type: string scope: short - - name: uniqueid - description: UUID + - name: id + description: id type: string scope: short - name: invariant-uuid @@ -74,7 +74,7 @@ http: - 200 result_map: uuid: $b{resources.[*].uuid} - uniqueid: $b{resources.[*].uniqueId} + id: $b{resources.[*].uniqueId} invariant-uuid: $b{resources.[*].invariantUUID} version: $b{resources.[*].version} name: $b{resources.[*].name} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml index d320848f..7d95c4a3 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create license aggreement info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org parameters: @@ -40,12 +40,6 @@ parameters: short_option: e long_option: vlm-version is_optional: false - - name: description - description: Description for aggreement - type: string - short_option: z - long_option: description - is_optional: false - name: vlm-feature-group-id description: VLM feature group type: string @@ -56,7 +50,7 @@ parameters: results: direction: portrait attributes: - - name: ID + - name: id description: aggreement ID scope: short type: string @@ -69,10 +63,8 @@ http: request: uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/license-agreements method: POST - body: '{"addedFeatureGroupsIds": ["${vlm-feature-group-id}"], "description": "${description}", "licenseTerm": {"choice": "Fixed_Term", "other": ""}, "name": "${name}"}' + body: '{"addedFeatureGroupsIds": ["${vlm-feature-group-id}"], "licenseTerm": {"choice": "Fixed_Term", "other": ""}, "name": "${name}"}' success_codes: - 200 result_map: - ID: $b{$.value} - sample_response: - body: '{"value":"2DEB6CB4B082415BB7A697C9CD1273BA"}' + id: $b{$.value} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-archive-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-archive-schema-dublin.yaml new file mode 100644 index 00000000..96e91715 --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-archive-schema-dublin.yaml @@ -0,0 +1,45 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: vlm-archive +description: Archive Vendor License Model + +info: + product: onap-dublin + service: sdc.onboarding + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vlm-id + description: Onap VLM ID + type: string + short_option: x + long_option: vlm-id + is_optional: false + +http: + service: + name: sdc + version: v1.0 + auth: basic + mode: direct + request: + uri: /onboarding-api/v1.0/items/${vlm-id}/actions + method: PUT + body: '{"action": "ARCHIVE"}' + success_codes: + - 201 + - 200 + - 417
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-dublin.yaml index ebe16263..ca09bd2e 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create License Model info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org @@ -38,7 +38,7 @@ parameters: results: direction: portrait attributes: - - name: ID + - name: id description: License Model ID scope: short type: uuid @@ -59,5 +59,5 @@ http: success_codes: - 200 result_map: - ID: $b{$.itemId} + id: $b{$.itemId} version: $b{$.version.id}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-delete-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-delete-schema-dublin.yaml index a22a0365..526d03e8 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-delete-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-delete-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Delete License Model (certified vlms cannot be deleted) info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-dublin.yaml index 6bcf1339..86f99e23 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-entitlement-pool-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create Entitlement Pool info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org @@ -41,35 +41,29 @@ parameters: short_option: e long_option: vlm-version is_optional: false - - name: description - description: Description for Entitlement Pool - type: string - short_option: z - long_option: description - is_optional: false - name: manufacture-reference-number description: Manufature Reference Number type: string short_option: k long_option: manufacture-reference-number is_optional: false - - name: startDate + - name: start-date description: License start date (MM/DD/YYYY) type: string short_option: l - long_option: startDate + long_option: start-date is_optional: false - - name: expiryDate + - name: expiry-date description: License end date (MM/DD/YYYY) type: string short_option: g - long_option: expiryDate - is_optional: false + long_option: expiry-date + is_optional: false results: direction: portrait attributes: - - name: ID + - name: id description: Entitlement Pool ID scope: short type: string @@ -82,8 +76,8 @@ http: request: uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/entitlement-pools method: POST - body: '{"name":"${name}","time":{"choice":"","other":""},"startDate":"${startDate}","expiryDate":"${expiryDate}","manufacturerReferenceNumber":"${manufacture-reference-number}"}' + body: '{"name":"${name}","time":{"choice":"","other":""},"startDate":"${start-date}","expiryDate":"${expiry-date}","manufacturerReferenceNumber":"${manufacture-reference-number}"}' success_codes: - 200 result_map: - ID: $b{$.value} + id: $b{$.value} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-dublin.yaml index b4559d27..d3cd45a0 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-feature-group-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create feature group Pool info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org @@ -41,12 +41,6 @@ parameters: short_option: e long_option: vlm-version is_optional: false - - name: description - description: Description for feature group - type: string - short_option: z - long_option: description - is_optional: false - name: vlm-key-group-id description: VLM keygroup type: string @@ -69,7 +63,7 @@ parameters: results: direction: portrait attributes: - - name: ID + - name: id description: Feature group ID scope: short type: string @@ -82,10 +76,8 @@ http: request: uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/feature-groups method: POST - body: '{"name": "${name}", "addedLicenseKeyGroupsIds": ["${vlm-key-group-id}"], "addedEntitlementPoolsIds": ["${vlm-entitle-pool-id}"], "partNumber": "${part-number}", "description": "${description}"}' + body: '{"name": "${name}", "addedLicenseKeyGroupsIds": ["${vlm-key-group-id}"], "addedEntitlementPoolsIds": ["${vlm-entitle-pool-id}"], "partNumber": "${part-number}"}' success_codes: - 200 result_map: - ID: $b{$.value} - sample_response: - body: '{"value":"2DEB6CB4B082415BB7A697C9CD1273BA"}' + id: $b{$.value} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-dublin.yaml index d1e5f16c..b82220e8 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-key-group-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create License Key Group info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org @@ -48,17 +48,11 @@ parameters: long_option: type is_optional: false default_value: Universal - - name: description - description: Description for License Key Group - type: string - short_option: z - long_option: description - is_optional: true results: direction: portrait attributes: - - name: ID + - name: id description: License Model ID scope: short type: string @@ -71,8 +65,8 @@ http: request: uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/license-key-groups method: POST - body: '{"description": "${description}", "name": "${name}", "type": "${type}"}' + body: '{"name": "${name}", "type": "${type}"}' success_codes: - 200 result_map: - ID: $b{$.value}
\ No newline at end of file + id: $b{$.value}
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-dublin.yaml index bf53824c..5962674a 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-list-schema-dublin.yaml @@ -18,7 +18,7 @@ description: List the vendor license models in ONAP info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP HPA Integration Team (itohan.ukponmwan@intel.com) results: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-dublin.yaml index 99a0f46b..029d71d1 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-submit-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Submit Vendor License Model info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-dublin.yaml index 42c92f37..27f6a8d7 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Upload the CSAR/ZIP file to VSP info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org parameters: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-archive-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-archive-schema-dublin.yaml new file mode 100644 index 00000000..22010b8c --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-archive-schema-dublin.yaml @@ -0,0 +1,45 @@ +# Copyright © Intel Corporation 2019 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: vsp-archive +description: Archive Vendor Software Product + +info: + product: onap-dublin + service: sdc.onboarding + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vsp-id + description: Onap VSP ID + type: string + short_option: x + long_option: vsp-id + is_optional: false + +http: + service: + name: sdc + version: v1.0 + auth: basic + mode: direct + request: + uri: /onboarding-api/v1.0/items/${vsp-id}/actions + method: PUT + body: '{"action": "ARCHIVE"}' + success_codes: + - 201 + - 200 + - 417 diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-commit-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-commit-schema-dublin.yaml new file mode 100644 index 00000000..4bc103da --- /dev/null +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-commit-schema-dublin.yaml @@ -0,0 +1,56 @@ +# Copyright 2019 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: vsp-commit +description: Commit Vendor Software Product + +info: + product: onap-dublin + service: sdc.onboarding + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vsp-id + description: Onap VSP ID + type: string + short_option: x + long_option: vsp-id + is_optional: false + - name: vsp-version + description: VSP version + type: string + short_option: y + long_option: vsp-version + is_optional: false + - name: remarks + description: VSP remarks + type: string + short_option: z + long_option: remarks + is_optional: true + default_value: Created by OCOMP +http: + service: + name: sdc + version: v1.0 + auth: basic + mode: direct + request: + uri: /onboarding-api/v1.0/items/${vsp-id}/versions/${vsp-version}/actions + method: PUT + body: '{"action":"Commit","commitRequest":{"message":"${remarks}"}}' + success_codes: + - 201 + - 200 diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml index 19c92393..16dc068b 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Create Vendor Software Product info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org parameters: @@ -71,17 +71,22 @@ parameters: long_option: onboarding-method short_option: o is_optional: false + default_value: NetworkPackage results: direction: portrait attributes: - - name: ID + - name: id description: VSP ID scope: short type: string - name: version description: VSP Model version scope: short + type: string + - name: version-id + description: VSP Model version id + scope: short type: uuid http: service: @@ -95,7 +100,7 @@ http: body: '{ "category": "resourceNewCategory.generic", "vendorId": "${vlm-id}", - "subCategory": "resourceNewCategory.generic.abstract", + "subCategory": "resourceNewCategory.generic.network elements", "description": "${vsp-description}", "licensingVersion": "${vlm-version}", "licensingData": {"featureGroups": ["${vlm-feature-group-id}"], "licenseAgreement": "${vlm-agreement-id}"}, @@ -107,5 +112,6 @@ http: success_codes: - 200 result_map: - ID: $b{$.itemId} - version: $b{$.version.id} + id: $b{$.itemId} + version: $b{$.version.name} + version-id: $b{$.version.id} diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-dublin.yaml index a7bc98dc..2a4ddd84 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-dublin.yaml @@ -18,7 +18,7 @@ description: List of the Vendor Software Products info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org results: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-dublin.yaml index 6cd48e87..5306a7fb 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Package Vendor Software Product info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org parameters: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-dublin.yaml index 6d46f6fa..cdc372d9 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Submit Vendor Software Product info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org parameters: diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml index 41f1fea1..402b6ae8 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-dublin.yaml @@ -18,7 +18,7 @@ description: Validate the uploaded Vendor Software Product info: product: onap-dublin - service: sdc + service: sdc.onboarding author: ONAP CLI Team onap-discuss@lists.onap.org parameters: |