diff options
Diffstat (limited to 'plugins/onap-1.1/features/so')
20 files changed, 485 insertions, 183 deletions
diff --git a/plugins/onap-1.1/features/so/pom.xml b/plugins/onap-1.1/features/so/pom.xml index c801f18d..7f800a7f 100644 --- a/plugins/onap-1.1/features/so/pom.xml +++ b/plugins/onap-1.1/features/so/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-plugins-onap-1.1-features</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>2.0.0</version> </parent> <artifactId>cli-plugins-onap-1.1-features-so</artifactId> diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml index 94f2e4a4..c9b1d7ac 100644 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml @@ -1,20 +1,11 @@ open_cli_schema_version: 1.0 name: service-create description: Create a service instance using MSO -<<<<<<< cf220435576757be81a477d68413c0dabc592478 -version: onap-1.1 -service: - name: so - version: v3 - auth: basic - mode: direct -======= info: product: onap-1.1 service: so author: ONAP CLI Team onap-discuss@lists.onap.org ->>>>>>> Migrate plugins to use info section parameters: - name: cloud-region @@ -89,7 +80,9 @@ results: http: service: - auth: none + name: so + version: v3 + auth: basic mode: direct request: uri: /ecomp/mso/infra/serviceInstances/v3 diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml index 93f2a1ed..324e4e20 100644 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml @@ -1,25 +1,12 @@ open_cli_schema_version: 1.0 name: service-delete -<<<<<<< a936ccab2b00d462f0b1f3e8318004f0414f07ef + description: Delete service instance (experimental) -======= -<<<<<<< cf220435576757be81a477d68413c0dabc592478 -description: Delete service instance ->>>>>>> Migrate plugins to use info section -version: onap-1.1 -service: - name: so - version: v3 - auth: basic - mode: direct -======= -description: Delete a service instance info: product: onap-1.1 service: so author: ONAP CLI Team onap-discuss@lists.onap.org ->>>>>>> Migrate plugins to use info section parameters: - name: service-id @@ -73,7 +60,9 @@ parameters: http: service: - auth: none + name: so + version: v3 + auth: basic mode: direct request: uri: /ecomp/mso/infra/serviceInstances/v3/${service-id} diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml new file mode 100644 index 00000000..faf9cfa4 --- /dev/null +++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml @@ -0,0 +1,121 @@ +open_cli_schema_version: 1.0 +name: vf-create +description: Create a VF +info: + product: onap-1.1 + service: so + author: ONAP CLI Team onap-discuss@lists.onap.org + + +parameters: + - name: cloud-region + description: cloud region identifier + type: string + short_option: l + long_option: cloud-region + is_optional: false + - name: tenant-id + description: openstack tenant id + type: string + short_option: z + long_option: tenant-id + is_optional: false + - name: product-family + description: service type for serivce (e.g. vLB) + type: string + short_option: w + long_option: product-family + is_optional: false + - name: instance-name + description: service instance name + type: string + short_option: o + long_option: instance-name + is_optional: false + - name: service-instance-id + description: unique id for service instance + type: string + short_option: y + long_option: service-instance-id + is_optional: false + - name: vf-model-invariant-id + description: vf model invariant id + type: string + short_option: b + long_option: vf-model-invariant-id + is_optional: false + - name: vf-model-uuid + description: model uuid for vf + type: string + short_option: c + long_option: vf-model-uuid + is_optional: false + - name: vf-model-name + description: vf model name + type: string + short_option: e + long_option: vf-model-name + is_optional: false + - name: vf-model-version + description: vf model version + type: string + short_option: g + long_option: vf-model-version + is_optional: false + - name: vf-model-customization-id + description: vf model customization id + type: string + short_option: i + long_option: vf-model-customization-id + is_optional: false + - name: service-model-invariant-id + description: model invariant id + type: string + short_option: j + long_option: service-model-invariant-id + is_optional: false + - name: service-model-uuid + description: model name version id + type: string + short_option: k + long_option: service-model-uuid + is_optional: false + - name: service-model-name + description: service model name + type: string + short_option: q + long_option: service-model-name + is_optional: false + - name: service-model-version + description: service model version + type: string + short_option: n + long_option: service-model-version + is_optional: false + + +results: + direction: portrait + attributes: + - name: vf-id + description: id for the created vnf + type: string + scope: short + +http: + service: + name: so + version: v3 + auth: basic + mode: direct + request: + uri: /ecomp/mso/infra/serviceInstances/v3/${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": {}}}' + + success_codes: + - 202 + result_map: + vf-id: $b{$.requestReferences.instanceId} + sample_response: + body: '{"requestReferences": {"instanceId": "2a152730-f6eb-4dc6-9b81-7a6f6f263d71","requestId": "6402628f-7f67-4605-9e60-0d8632616d02"}}' diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml new file mode 100644 index 00000000..c706c931 --- /dev/null +++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml @@ -0,0 +1,70 @@ +open_cli_schema_version: 1.0 +name: vf-delete +description: delete a VF (experimental) +info: + product: onap-1.1 + service: so + author: ONAP CLI Team onap-discuss@lists.onap.org + + +parameters: +- name: vf-id + description: id for vnf + type: string + short_option: x + long_option: vf-id + is_optional: false +- name: service-instance-id + description: unique id for service instance + type: string + short_option: y + long_option: service-instance-id + is_optional: false +- name: cloud-region + description: Cloud region ID + type: string + short_option: l + long_option: cloud-region + is_optional: false +- name: tenant-id + description: openstack tenant id (uuid) + type: string + short_option: z + long_option: tenant-id + is_optional: false +- name: model-invariant-id + description: model invariant id for service in SDC catalog + type: string + short_option: b + long_option: model-invariant-id + is_optional: false +- name: model-uuid + description: model uuid for service in SDC catalog + type: string + short_option: c + long_option: model-uuid + is_optional: false +- name: model-name + description: model name available in SDC catalog + type: string + short_option: e + long_option: model-name + is_optional: false +- name: model-version + description: model version of service (eg. 1.0) + type: string + short_option: g + long_option: model-version + is_optional: false +http: + service: + name: so + version: v3 + auth: basic + mode: direct + request: + uri: /ecomp/mso/infra/serviceInstances/v3/${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: + - 202
\ No newline at end of file diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml index 43e68059..9395f4a1 100644 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml @@ -61,7 +61,9 @@ results: http: service: - auth: none + name: so + version: v3 + auth: basic mode: direct request: uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml index 7c910539..013ec68a 100644 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml @@ -1,24 +1,12 @@ open_cli_schema_version: 1.0 name: vfmodule-delete -<<<<<<< a936ccab2b00d462f0b1f3e8318004f0414f07ef + description: delete a VF module (experimental) -======= -description: delete a VF module -<<<<<<< e22e4b6be3fe804a926136cf9ffd03341920ff50 ->>>>>>> Migrate plugins to use info section -version: onap-1.1 -service: - name: so - version: v3 - auth: basic - mode: direct -======= info: product: onap-1.1 service: so author: ONAP CLI Team onap-discuss@lists.onap.org ->>>>>>> Migrate plugins to use info section parameters: - name: vfmodule-id @@ -72,7 +60,9 @@ parameters: http: service: - auth: none + name: so + version: v3 + auth: basic mode: direct request: uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id} diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml new file mode 100644 index 00000000..c2537aea --- /dev/null +++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml @@ -0,0 +1,143 @@ +open_cli_schema_version: 1.0 +name: vfmodule-create +description: Create a VF module + +info: + product: onap-1.1 + service: so + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud-region + description: cloud region identifier + type: string + short_option: l + long_option: cloud-region + is_optional: false + - name: tenant-id + description: openstack tenant id + type: string + short_option: B + long_option: tenant-id + is_optional: false + - name: vfmodule-invariant-id + description: vfmodule model invariant id + type: string + short_option: b + long_option: vfmodule-invariant-id + is_optional: false + - name: vfmodule-uuid + description: model uuid for vfmodule + type: string + short_option: c + long_option: vfmodule-uuid + is_optional: false + - name: vfmodule-name + description: vfmodule model name + type: string + short_option: e + long_option: vfmodule-name + is_optional: false + - name: vfmodule-version + description: vf module version + type: string + short_option: g + long_option: vfmodule-version + is_optional: false + - name: module-name + description: vfmodule name + type: string + short_option: i + long_option: module-name + is_optional: false + - name: service-id + description: unique id for service + type: string + short_option: j + long_option: service-id + is_optional: false + - name: vf-id + description: unique id for related VF + type: string + short_option: y + long_option: vf-id + is_optional: false + - name: vf-model-invariant-id + description: vf model invariant id + type: string + short_option: k + long_option: vf-model-invariant-id + is_optional: false + - name: vf-model-uuid + description: model uuid for vf + type: string + short_option: A + long_option: vf-model-uuid + is_optional: false + - name: vf-model-name + description: vf model name + type: string + short_option: n + long_option: vf-model-name + is_optional: false + - name: vf-model-version + description: vf model version + type: string + short_option: o + long_option: vf-model-version + is_optional: false + - name: vf-model-customization-id + description: vf model customization id. This can be obtained using SDC portal (Home -> service:xxx -> Composition -> click on VF for customization id). + type: string + short_option: q + long_option: vf-model-customization-id + is_optional: false + - name: service-model-invariant-id + description: model invariant id + type: string + short_option: r + long_option: service-model-invariant-id + is_optional: false + - name: service-model-uuid + description: model name version id + type: string + short_option: w + long_option: service-model-uuid + is_optional: false + - name: service-model-name + description: service model name + type: string + short_option: x + long_option: service-model-name + is_optional: false + - name: service-model-version + description: service model version + type: string + short_option: z + long_option: service-model-version + is_optional: false + + +results: + direction: portrait + attributes: + - name: vfmodule-id + description: id for the created vnf + type: string + scope: short + +http: + service: + name: so + version: v3 + auth: basic + mode: direct + request: + uri: /ecomp/mso/infra/serviceInstances/v3/${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": []}}}' + + success_codes: + - 202 + result_map: + vfmodule-id: $b{$.requestReferences.instanceId} diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml deleted file mode 100644 index 18df0c95..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml +++ /dev/null @@ -1,76 +0,0 @@ -open_cli_schema_version: 1.0 -name: vnf-create -description: Create a VNF - -info: - product: onap-1.1 - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: lcp-cloudregion-id - description: AIC LCP node location identifier - type: string - short_option: l - long_option: lcp-cloudregion-id - is_optional: false - - name: tenant-id - description: openstack tenant id (uuid) - type: string - short_option: z - long_option: tenant-id - is_optional: false - - name: product-family-id - description: UUID for product family (named service id in AAI) - type: string - short_option: w - long_option: product-family-id - is_optional: false - - name: instance-name - description: service instance name - type: string - short_option: i - long_option: instance-name - is_optional: false - - name: supress-rollback - description: rollback changes if instantiation fails. - type: bool - short_option: r - long_option: supress-rollback - is_optional: true - - name: service-instance-id - description: unique id for service instance - type: string - short_option: y - long_option: service-instance-id - is_optional: false - - name: parenet-service-model - description: parent service model name - type: string - short_option: x - long_option: parenet-service-model - is_optional: false - -results: - direction: portrait - attribute: - - name: vnf-instance-id - description: id for the created vnf - type: string - scope: short - -http: - service: - auth: none - mode: direct - request: - uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs - method: PUT - body: '{"requestDetails":{"modelInfo":{"modelType":"vnf","modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff","modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe","modelName":"vSAMP12","modelVersion":"1.0","modelCustomizationName":"vSAMP12 1"},"cloudConfiguration":{"lcpCloudRegionId": "${lcp-cloudregion-id}","tenantId":"${tenant-id}"},"requestInfo":{"instanceName":"${instance-name}","productFamilyId":"${product-family-id}","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"}}}],"requestParameters":{}}}' - - success_codes: - - 202 - result_mpa: - vnf-instance-id: $b{$.vnfInstanceId} - sample_response: - body: '{"vnfInstanceId":"234567AB"}' diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml deleted file mode 100644 index 0c07ccbd..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml +++ /dev/null @@ -1,46 +0,0 @@ -open_cli_schema_version: 1.0 -name: vnf-delete -description: delete a VNF - -info: - product: onap-1.1 - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: vnf-instance-id - description: id for vnf - type: string - short_option: x - long_option: vnf-instace-id - is_optional: false - - name: service-instance-id - description: unique id for service instance - type: string - short_option: y - long_option: service-instace-id - is_optional: false - - name: lcp-cloudregion-id - description: AIC LCP node location identifier - type: string - short_option: l - long_option: lcp-cloudregion-id - is_optional: false - - name: tenant-id - description: openstack tenant id (uuid) - type: string - short_option: z - long_option: tenant-id - is_optional: false - -http: - service: - auth: none - mode: direct - request: - uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs - method: DELETE - body: '{"requestDetails":{"modelInfo":{"modelType":"vnf","modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff","modelName":"vSAMP12","modelVersion":"1"},"cloudConfiguration":{"lcpCloudRegionId":"mdt1","tenantId":"88a6ca3ee0394ade9403f075db23167e"},"requestInfo":{"source":"VID"},"requestParameters":{"userParams":[]}}}' - - success_codes: - - 202
\ No newline at end of file diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml index c52d8000..e8fcb0f8 100644 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml @@ -1,4 +1,4 @@ -onap_cli_sample_version: 1.0 +open_cli_sample_version: 1.0 name: service-create version: onap-1.1 diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json new file mode 100644 index 00000000..28321085 --- /dev/null +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json @@ -0,0 +1,48 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/ecomp/mso/infra/serviceInstances/v3", + "headers" : { + "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", + "X-FromAppId" : "onap-cli", + "Accept" : "application/json", + "X-TransactionId" : "req-0dc01d80-f629-4ea9-b49f-0bc45b79bfaf", + "Content-Type" : "application/json" + }, + "json" : { + "requestDetails" : { + "cloudConfiguration" : { + "lcpCloudRegionId" : "RegionOne", + "tenantId" : "onap" + }, + "modelInfo" : { + "modelType" : "service", + "modelInvariantId" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", + "modelNameVersionId" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", + "modelName" : "demoVLB", + "modelVersion" : "1.0" + }, + "subscriberInfo" : { + "globalSubscriberId" : "Demonstration" + }, + "requestInfo" : { + "instanceName" : "sample-service-onap-cli-13", + "source" : "VID", + "suppressRollback" : "false" + }, + "requestParameters" : { + "subscriptionServiceType" : "vLB" + } + } + } + }, + "response" : { + "status" : 202, + "json" : { + "requestReferences" : { + "instanceId" : "957949b4-f857-497c-81b0-832ce7bb9434", + "requestId" : "d59fc98a-b0fa-4de9-b426-6ef40dfd0812" + } + } + } +} ]
\ No newline at end of file diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml new file mode 100644 index 00000000..4815ac39 --- /dev/null +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: service-create +version: onap-1.1 +samples: + sample1: + name: service-create + input: --cloud-region RegionOne --tenant-id onap --model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --model-name demoVLB --model-version 1.0 -c Demonstration --instance-name sample-service-onap-cli-13 --service-type vLB + moco: service-create-schema-1.1-moco.json + output: | + +--------------+--------------------------------------+ + |property |value | + +--------------+--------------------------------------+ + |service-id |957949b4-f857-497c-81b0-832ce7bb9434 | + +--------------+--------------------------------------+ diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml index cc114ac0..f6fd2c77 100644 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml @@ -1,4 +1,4 @@ -onap_cli_sample_version: 1.0 +open_cli_sample_version: 1.0 name: service-delete version: onap-1.1 diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json new file mode 100644 index 00000000..0d8a97b9 --- /dev/null +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json @@ -0,0 +1,56 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/ecomp/mso/infra/serviceInstances/v3/2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee/vnfs", + "headers" : { + "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", + "X-FromAppId" : "onap-cli", + "Accept" : "application/json", + "X-TransactionId" : "req-8120ae88-0e56-4f1d-9a00-44f07e9469db", + "Content-Type" : "application/json" + }, + "json" : { + "requestDetails" : { + "modelInfo" : { + "modelType" : "vnf", + "modelInvariantId" : "cc34cd54-dd7c-44cd-8847-f9577c6f1a49", + "modelVersionId" : "8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe", + "modelName" : "847cb26a-59a6-475a-94dd", + "modelVersion" : "1.0", + "modelCustomizationId" : "cf893f5a-1bb1-4e32-a92b-2456e12178f8" + }, + "cloudConfiguration" : { + "lcpCloudRegionId" : "RegionOne", + "tenantId" : "onap" + }, + "requestInfo" : { + "instanceName" : "vlb-cli-sample-11", + "source" : "VID", + "productFamilyId" : "vLB" + }, + "relatedInstanceList" : [ { + "relatedInstance" : { + "instanceId" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee", + "modelInfo" : { + "modelType" : "service", + "modelInvariantId" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", + "modelVersionId" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", + "modelName" : "demoVLB", + "modelVersion" : "1.0" + } + } + } ], + "requestParameters" : { } + } + } + }, + "response" : { + "status" : 202, + "json" : { + "requestReferences" : { + "instanceId" : "048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d", + "requestId" : "7bbf50b3-50d9-449e-a87d-694e2f373aea" + } + } + } +} ]
\ No newline at end of file diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml new file mode 100644 index 00000000..3b31d80c --- /dev/null +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml @@ -0,0 +1,14 @@ +open_cli_sample_version: 1.0 +name: vf-create +version: onap-1.1 +samples: + sample1: + name: vf-create + input: --cloud-region RegionOne --tenant-id onap --product-family vLB --instance-name vlb-cli-sample-11 --service-instance-id 2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee --vf-model-invariant-id cc34cd54-dd7c-44cd-8847-f9577c6f1a49 --vf-model-uuid 8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe --vf-model-name 847cb26a-59a6-475a-94dd --vf-model-version 1.0 --vf-model-customization-id cf893f5a-1bb1-4e32-a92b-2456e12178f8 --service-model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --service-model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --service-model-name demoVLB --service-model-version 1.0 -m http://192.168.17.121:8080 -u InfraPortalClient -p password1$ + moco: vf-create-schema-1.1-moco.json + output: | + +--------------+--------------------------------------+ + |property |value | + +--------------+--------------------------------------+ + |vf-id |048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d | + +--------------+--------------------------------------+ diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml index b19bc54d..6ba9633b 100644 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml @@ -1,4 +1,4 @@ -onap_cli_sample_version: 1.0 +open_cli_sample_version: 1.0 name: vf-module-create version: onap-1.1 diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml index 780e69d4..36a7f150 100644 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml +++ b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml @@ -1,4 +1,4 @@ -onap_cli_sample_version: 1.0 +open_cli_sample_version: 1.0 name: vf-module-delete version: onap-1.1 diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml deleted file mode 100644 index 267d3b9c..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-create-sample-1.1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -onap_cli_sample_version: 1.0 - -name: vnf-create -version: onap-1.1 -samples: - sample1: - name: Create a vnf - input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -l region1 -t 123ABC -p a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb -i instance -r -s a445678da -m serviceA
\ No newline at end of file diff --git a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml deleted file mode 100644 index bc3e89fb..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -onap_cli_sample_version: 1.0 - -name: vnf-delete -version: onap-1.1 -samples: - sample1: - name: delete a vnf - input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -v aca51b0a-710d-4155-bc7c-7cef19d9a94e -s ff305d54-75b4-431b-adb2-eb6b9e5ff000 -l mdt1 -t 88a6ca3ee0394ade9403f075db23167e
\ No newline at end of file |