From ed712bd8434d3497b0f25134de6ef1b3e47d872e Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Tue, 31 Oct 2017 18:28:29 +0530 Subject: Add license version into vsp-list CLI-57 Change-Id: Ifbed9863d0527f6e22441f0840de912b05cd4252 Signed-off-by: Kanagaraj Manickam k00365106 --- .../main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml | 7 +++++-- .../resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml index 8f7d239d..a9aa8100 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml @@ -35,6 +35,10 @@ results: description: license aggreement scope: long type: string + - name: license-version + description: license version + scope: long + type: string http: request: uri: /onboarding-api/v1.0/vendor-software-products @@ -48,5 +52,4 @@ http: version: $b{results.[*].version.id} status: $b{results.[*].status} license-id: $b{results.[*].licensingData.licenseAgreement} - sample_response: - body: '{"results":[{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"},{"name":"test-vsp","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"2DEB6CB4B082415BB7A697C9CD1273BA","version":"1.0","viewableVersions":["1.0"],"finalVersions":["1.0"],"status":"Final"}],"listCount":2}' + license-version: $b{results.[*].licensingVersion.id} diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml index cbaec6ef..90ad152b 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vsp/vsp-list-schema-1.1-sample.yaml @@ -7,6 +7,7 @@ samples: input: -d moco: vsp-list-schema-1.1-moco.json ouput: | + +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+ |ID |name |vendor-name |version |status |license-id | +----------------------------------+--------------------------------------+--------------------------+----------+--------+----------------------------------+ |8f08a17b9a4c4538b51a3064468baec0 |test-vsp |test-vendor |0.3 |Locked |0a12d68750704a54a7e9974595d7e951 | -- cgit 1.2.3-korg