diff options
8 files changed, 27 insertions, 37 deletions
diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-sample-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-sample-beijing.yaml deleted file mode 100644 index ce0dd7f6..00000000 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-sample/services/service-create-sample-beijing.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2018 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_sample_version: 1.0 - -name: service-create -version: onap-beijing -samples: - sample1: - name: Create a service instance - input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -c customer -s subscriber -i instance -r
\ No newline at end of file diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-create-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-create-schema-beijing.yaml index 1db8b9d9..4cc8b9e1 100644 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-create-schema-beijing.yaml +++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-create-schema-beijing.yaml @@ -58,12 +58,24 @@ parameters: short_option: j long_option: model-version is_optional: false + - name: model-version-id + description: model-version-id + type: string + short_option: n + long_option: model-version-id + is_optional: false - name: customer description: unique id for customer type: string short_option: c long_option: customer is_optional: false + - name: requestor-id + description: requestor ID + type: string + short_option: q + long_option: requestor-id + is_optional: false - name: instance-name description: service instance name type: string @@ -95,13 +107,13 @@ results: http: service: name: so - version: v3 + version: v4 auth: basic mode: direct request: - uri: /ecomp/mso/infra/serviceInstances/v3 + uri: /ecomp/mso/infra/serviceInstances/v4 method: POST - body: '{"requestDetails": {"cloudConfiguration" : {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"modelInfo": {"modelType": "service","modelInvariantId": "${model-invariant-id}","modelNameVersionId": "${model-uuid}","modelName": "${model-name}","modelVersion": "${model-version}"},"subscriberInfo": {"globalSubscriberId": "${customer}"},"requestInfo": {"instanceName": "${instance-name}","source": "VID","suppressRollback": "${supress-rollback}"},"requestParameters": {"subscriptionServiceType": "${service-type}"}}}' + body: '{"requestDetails": {"cloudConfiguration" : {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"modelInfo": {"modelType": "service","modelInvariantId": "${model-invariant-id}","modelNameVersionId": "${model-uuid}","modelName": "${model-name}","modelVersion": "${model-version}", "modelVersionId": "${model-version-id}"},"subscriberInfo": {"globalSubscriberId": "${customer}"},"requestInfo": {"requestorId": "${requestor-id}","instanceName": "${instance-name}","source": "VID","suppressRollback": "${supress-rollback}"},"requestParameters": {"subscriptionServiceType": "${service-type}","aLaCarte":true}}}' success_codes: - 202 diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml index 1fadf705..7cb2604d 100644 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml +++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-beijing.yaml @@ -75,11 +75,11 @@ parameters: http: service: name: so - version: v3 + version: v4 auth: basic mode: direct request: - uri: /ecomp/mso/infra/serviceInstances/v3/${service-id} + uri: /ecomp/mso/infra/serviceInstances/v4/${service-id} method: DELETE body: '{"requestDetails": {"modelInfo": {"modelType": "service","modelInvariantId": "${model-invariant-id}","modelVersionId": "${model-uuid}","modelName": "${model-name}","modelVersion": "${model-version}"},"cloudConfiguration" : {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"subscriberInfo": {"globalSubscriberId": "${customer-name}"},"requestInfo": {"source": "VID"}}}' diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml index 232ca58b..eac89b53 100644 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml +++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-beijing.yaml @@ -119,11 +119,11 @@ results: http: service: name: so - version: v3 + version: v4 auth: basic mode: direct request: - uri: /ecomp/mso/infra/serviceInstances/v3/${service-instance-id}/vnfs + uri: /ecomp/mso/infra/serviceInstances/v4/${service-instance-id}/vnfs method: POST body: '{"requestDetails": {"modelInfo": {"modelType": "vnf","modelInvariantId": "${vf-model-invariant-id}","modelVersionId": "${vf-model-uuid}","modelName": "${vf-model-name}","modelVersion": "${vf-model-version}","modelCustomizationId": "${vf-model-customization-id}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"requestInfo": {"instanceName": "${instance-name}","source": "VID","productFamilyId": "${product-family}" },"relatedInstanceList": [{"relatedInstance": {"instanceId": "${service-instance-id}","modelInfo": {"modelType": "service","modelInvariantId": "${service-model-invariant-id}","modelVersionId": "${service-model-uuid}","modelName": "${service-model-name}","modelVersion": "${service-model-version}"}}}],"requestParameters": {}}}' diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-beijing.yaml index a082ce23..9067a044 100644 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-beijing.yaml +++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-beijing.yaml @@ -73,11 +73,11 @@ parameters: http: service: name: so - version: v3 + version: v4 auth: basic mode: direct request: - uri: /ecomp/mso/infra/serviceInstances/v3/${service-instance-id}/vnfs/${vf-id} + uri: /ecomp/mso/infra/serviceInstances/v4/${service-instance-id}/vnfs/${vf-id} method: DELETE body: '{"requestDetails": {"modelInfo": {"modelType": "vnf","modelInvariantId":"${model-invariant-id}","modelVersionId": "${model-uuid}","modelName": "${model-name}","modelVersion":"${model-version}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId":"${tenant-id}"},"requestInfo": {"source": "VID"},"requestParameters": {"userParams":[]}}}' success_codes: diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-beijing.yaml index a208791c..44933339 100644 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-beijing.yaml +++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-beijing.yaml @@ -76,11 +76,11 @@ results: http: service: name: so - version: v3 + version: v4 auth: basic mode: direct request: - uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules + uri: ecomp/mso/infra/serviceInstances/v4/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules method: PUT body: '{"requestDetails":{"modelInfo":{"modelType":"vfModule","modelInvariantId":"ff5256d2-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6478e5-ea33-3346-ac12-ab121484a3fe","modelName":"vSAMP12..base..module-0","modelVersion":"1"},"cloudConfiguration":{"lcpCloudRegionId":"${lcp-cloudregion-id}","tenantId":"${tenant-id}"},"requestInfo":{"instanceName":"${instance-name}","source":"VID","suppressRollback":"${supress-rollback}"},"relatedInstanceList":[{"relatedInstance":{"instanceId":"${service-instance-id}","modelInfo":{"modelType":"service","modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe","modelName":"${parenet-service-model}","modelVersion":"1.0"}}},{"relatedInstance":{"instanceId":"${vnf-instance-id}","modelInfo":{"modelType":"vnf","modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe","modelName":"vSAMP12","modelVersion":"1.0","modelCustomizationName":"vSAMP12 1"}}}],"requestParameters":{"userParams":[]}}}' diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-beijing.yaml index 53f4148b..e0f78b29 100644 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-beijing.yaml +++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-beijing.yaml @@ -75,11 +75,11 @@ parameters: http: service: name: so - version: v3 + version: v4 auth: basic mode: direct request: - uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id} + uri: /ecomp/mso/infra/serviceInstances/v4/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id} method: DELETE body: '{"requestDetails":{"modelInfo":{"modelType":"vfModule","modelInvariantId":"${vf-model-invariant-id}","modelName":"${vfmodule-name}","modelVersion":"${vfmodule-version}"},"cloudConfiguration":{"lcpCloudRegionId":"${cloud-region}","tenantId":"${tenant-id}"},"requestInfo":{"source":"VID"}}}' diff --git a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-beijing.yaml b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-beijing.yaml index 8fafbb3e..ee2fd1f2 100644 --- a/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-beijing.yaml +++ b/products/onap-beijing/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-beijing.yaml @@ -143,11 +143,11 @@ results: http: service: name: so - version: v3 + version: v4 auth: basic mode: direct request: - uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules + uri: /ecomp/mso/infra/serviceInstances/v4/${service-id}/vnfs/${vf-id}/vfModules method: POST body: '{"requestDetails": {"modelInfo": {"modelType": "vfModule","modelInvariantId": "${vfmodule-invariant-id}","modelNameVersionId": "${vfmodule-uuid}","modelName": "${vfmodule-name}","modelVersion": "${vfmodule-version}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"requestInfo": {"instanceName": "${module-name}","source": "VID"},"relatedInstanceList": [{"relatedInstance": {"instanceId": "${service-id}","modelInfo": {"modelType": "service","modelInvariantId": "${service-model-invariant-id}","modelNameVersionId": "${service-model-uuid}","modelName": "${service-model-name}","modelVersion": "${service-model-version}"}}},{"relatedInstance": {"instanceId": "${vf-id}","modelInfo": {"modelType": "vnf","modelInvariantId": "${vf-model-invariant-id}","modelNameVersionId": "${vf-model-uuid}","modelName": "${vf-model-name}","modelVersion": "${vf-model-version}","modelCustomizationName": "${vf-model-customization-id}"}}}],"requestParameters": {"userParams": []}}}' |