From b69ed9bc0ad7cdedee57df63e94d3767ccd173b7 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Wed, 6 Dec 2017 13:09:45 +0530 Subject: Rename product names to use amsterdam Issue-ID: CLI-66 Change-Id: Ief9c03adec45f037baea82d344addb1c6b538bd9 Signed-off-by: Kanagaraj Manickam k00365106 --- .../services/service-create-schema-1.1.yaml | 97 -------------- .../services/service-delete-schema-1.1.yaml | 73 ----------- .../services/vf-create-schema-1.1.yaml | 121 ----------------- .../services/vf-delete-schema-1.1.yaml | 70 ---------- .../services/vf-module-create-schema-1.1.yaml | 78 ----------- .../services/vf-module-delete-schema-1.1.yaml | 73 ----------- .../services/vfmodule-create-schema-1.1.yaml | 143 --------------------- .../services/service-create-sample-1.1.yaml | 8 -- .../services/service-create-schema-1.1-moco.json | 48 ------- .../services/service-create-schema-1.1-sample.yaml | 14 -- .../services/service-delete-sample-1.1.yaml | 8 -- .../services/vf-create-schema-1.1-moco.json | 56 -------- .../services/vf-create-schema-1.1-sample.yaml | 14 -- .../services/vf-module-create-sample-1.1.yaml | 8 -- .../services/vf-module-delete-sample-1.1.yaml | 8 -- 15 files changed, 819 deletions(-) delete mode 100644 plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml (limited to 'plugins/onap-1.1/features/so/src') 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 deleted file mode 100644 index c9b1d7ac..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml +++ /dev/null @@ -1,97 +0,0 @@ -open_cli_schema_version: 1.0 -name: service-create -description: Create a service instance using MSO - -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: tenant id - type: string - short_option: b - long_option: tenant-id - is_optional: false - - name: model-invariant-id - description: model invariant id generated by ASDC. - type: string - short_option: e - long_option: model-invariant-id - is_optional: false - - name: model-uuid - description: model uuid generated by ASDC. - type: string - short_option: g - long_option: model-uuid - is_optional: false - - name: model-name - description: model name as provided in ASDC design time. - type: string - short_option: i - long_option: model-name - is_optional: false - - name: model-version - description: model-version - type: string - short_option: j - long_option: model-version - is_optional: false - - name: customer - description: unique id for customer - type: string - short_option: c - long_option: customer - is_optional: false - - name: instance-name - description: service instance name - type: string - short_option: k - 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-type - description: subscription service type - type: string - short_option: w - long_option: service-type - is_optional: false - -results: - direction: portrait - attributes: - - name: service-id - description: instance id for the created service. - type: string - scope: short - - -http: - service: - name: so - version: v3 - auth: basic - mode: direct - request: - uri: /ecomp/mso/infra/serviceInstances/v3 - 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}"}}}' - - success_codes: - - 202 - result_map: - service-id: $b{$.requestReferences.instanceId} - sample_response: - body: '{"requestReferences":{"instanceId":"${instance-id}","requestId":"375ba428-65e7-4f2b-afb9-74735ac6bfd0"}}' 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 deleted file mode 100644 index 324e4e20..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml +++ /dev/null @@ -1,73 +0,0 @@ -open_cli_schema_version: 1.0 -name: service-delete - -description: Delete service instance (experimental) - -info: - product: onap-1.1 - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: service-id - description: unique id for service instance - type: string - short_option: x - long_option: service-instace-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: i - 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 - - name: customer-name - description: unique id for customer - type: string - short_option: c - long_option: customer-name - is_optional: false - - name: cloud-region - description: cloud region id - type: string - short_option: j - long_option: cloud-region - is_optional: false - - name: tenant-id - description: tenant id - type: string - short_option: k - long_option: tenant-id - is_optional: false - -http: - service: - name: so - version: v3 - auth: basic - mode: direct - request: - uri: /ecomp/mso/infra/serviceInstances/v3/${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"}}}' - - 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-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 deleted file mode 100644 index faf9cfa4..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-create-schema-1.1.yaml +++ /dev/null @@ -1,121 +0,0 @@ -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 deleted file mode 100644 index c706c931..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-delete-schema-1.1.yaml +++ /dev/null @@ -1,70 +0,0 @@ -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 deleted file mode 100644 index 9395f4a1..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml +++ /dev/null @@ -1,78 +0,0 @@ -open_cli_schema_version: 1.0 -name: vf-module-create -description: Create a VF Module - -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: w - long_option: tenant-id - is_optional: false - - name: vnf-instance-id - description: vnf instance id - type: string - short_option: y - long_option: vnf-instace-id - is_optional: false - - name: service-instance-id - description: unique id for service instance - type: string - short_option: x - long_option: service-instace-id - is_optional: false - - name: parenet-service-model - description: parent service model name - type: string - short_option: z - long_option: parenet-service-model - 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: instance-name - description: service instance name - type: string - short_option: i - long_option: instance-name - is_optional: false - -results: - direction: portrait - attribute: - - name: vf-instance-id - description: id for the created vf - type: string - scope: short - -http: - service: - name: so - version: v3 - auth: basic - mode: direct - request: - uri: ecomp/mso/infra/serviceInstances/v2/${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":[]}}}' - - success_codes: - - 202 - result_mpa: - vf-instance-id: $b{$.vfInstanceId} - sample_response: - body: '{"vfInstanceId":"234567AB"}' 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 deleted file mode 100644 index 013ec68a..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml +++ /dev/null @@ -1,73 +0,0 @@ -open_cli_schema_version: 1.0 -name: vfmodule-delete - -description: delete a VF module (experimental) - -info: - product: onap-1.1 - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: vfmodule-id - description: VF module Id - type: string - short_option: x - long_option: vfmodule-id - 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: 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: 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 - long_option: tenant-id - short_option: z - is_optional: false - -http: - service: - name: so - version: v3 - auth: basic - mode: direct - request: - uri: /ecomp/mso/infra/serviceInstances/v3/${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"}}}' - - 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/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 deleted file mode 100644 index c2537aea..00000000 --- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vfmodule-create-schema-1.1.yaml +++ /dev/null @@ -1,143 +0,0 @@ -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/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 deleted file mode 100644 index e8fcb0f8..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-sample-1.1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -open_cli_sample_version: 1.0 - -name: service-create -version: onap-1.1 -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/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 deleted file mode 100644 index 28321085..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json +++ /dev/null @@ -1,48 +0,0 @@ -[ { - "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 deleted file mode 100644 index 4815ac39..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index f6fd2c77..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-delete-sample-1.1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -open_cli_sample_version: 1.0 - -name: service-delete -version: onap-1.1 -samples: - sample1: - name: delete a service instance - input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -s 56AA445 \ 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-moco.json b/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json deleted file mode 100644 index 0d8a97b9..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json +++ /dev/null @@ -1,56 +0,0 @@ -[ { - "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 deleted file mode 100644 index 3b31d80c..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 6ba9633b..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-create-sample-1.1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -open_cli_sample_version: 1.0 - -name: vf-module-create -version: onap-1.1 -samples: - sample1: - name: Create a vnf - input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -l region1 -t 123ABC -v b123-45565678da -s a445678-24da -m a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb -r -i instance \ No newline at end of file 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 deleted file mode 100644 index 36a7f150..00000000 --- a/plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-module-delete-sample-1.1.yaml +++ /dev/null @@ -1,8 +0,0 @@ -open_cli_sample_version: 1.0 - -name: vf-module-delete -version: onap-1.1 -samples: - sample1: - name: delete a vf module - input: -h https://locahost:8080 -u InfraPortalClient -p password1$ -s aca51b0a-710d-4155-bc7c-7cef19d9a94e -v aca45a67123-710d-4155-bc7c-7cef19d9a94e -m ccb52b09-710d-4155-bc7c-7cef19d9a94e -l mdt1 -t 88a6ca3ee0394ade9403f075db23167e \ No newline at end of file -- cgit 1.2.3-korg