From 9a7c3f58efc9a4fcff5052700457cf6f7565cf39 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Tue, 14 Nov 2017 11:50:31 +0530 Subject: Merges from 1.1.0 Issue-Id: CLI-66 Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6 Signed-off-by: Kanagaraj Manickam k00365106 --- .../services/service-create-sample-1.1.yaml | 2 +- .../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 | 2 +- .../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 | 2 +- .../services/vf-module-delete-sample-1.1.yaml | 2 +- .../services/vnf-create-sample-1.1.yaml | 8 ---- .../services/vnf-delete-sample-1.1.yaml | 8 ---- 10 files changed, 136 insertions(+), 20 deletions(-) create mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-moco.json create mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/service-create-schema-1.1-sample.yaml create mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vf-create-schema-1.1-moco.json create 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/vnf-create-sample-1.1.yaml delete mode 100644 plugins/onap-1.1/features/so/src/test/resources/open-cli-sample/services/vnf-delete-sample-1.1.yaml (limited to 'plugins/onap-1.1/features/so/src/test') 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 -- cgit 1.2.3-korg