diff options
author | Kanagaraj Manickam <kanagaraj.manickam@huawei.com> | 2017-10-16 06:04:48 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-10-16 06:04:48 +0000 |
commit | 878e79ea47fe7500982c9703bcd253aa5a512d69 (patch) | |
tree | 10da955250b0e9eb2177e0b686f3ed87090c9cba /plugins | |
parent | dd0f4438e8dea6ef68a043488545e3efcb3fa78a (diff) | |
parent | 2970a94f5eadaed71e33f8a955c559d32515751a (diff) |
Merge changes I12c3d643,Ief5364ab,Ifd108587,I3cecf6b6
* changes:
Implement command for license-key-group
Add CLI cmd for license model create v1.1
Fix url for license-model-show v1.0
Impement CMD yaml for fetching license
Diffstat (limited to 'plugins')
10 files changed, 278 insertions, 1 deletions
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-key-group-create-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-key-group-create-schema-1.1.yaml new file mode 100644 index 00000000..bc5d0b97 --- /dev/null +++ b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-key-group-create-schema-1.1.yaml @@ -0,0 +1,56 @@ +open_cli_schema_version: 1.0 +name: license-key-group-create +description: Create License Key Group +version: onap-1.1 +service: + name: sdc + version: v1.0 + auth: basic + mode: direct + +parameters: + - name: license-model-id + description: License Model Id + type: uuid + short_option: c + long_option: license-model-id + is_optional: false + - name: name + description: name + type: string + short_option: x + long_option: name + is_optional: false + - name: type + description: type of group (Universal, unique, one-time) + type: string + short_option: y + long_option: type + is_optional: false + - name: description + description: Description for License Key Group + type: string + short_option: z + long_option: description + is_optional: true + - name: operational-scope + description: Operational Scope + type: string + long_option: operational-scope + is_optional: true +results: + direction: portrait + attributes: + - name: ID + description: License Model ID + scope: short + type: string +http: + request: + uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id}/versions/0.1/license-key-groups + method: POST + body: '{"description": "${description}","name": "${name}","operationalScope": {"choices": ["${operational-scope}"],"other": ""},"type": "${type}"}' + success_codes: + - 200 + result_map: + ID: $b{$.value}
\ No newline at end of file diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-create-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-create-schema-1.1.yaml new file mode 100644 index 00000000..504af072 --- /dev/null +++ b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-create-schema-1.1.yaml @@ -0,0 +1,39 @@ +open_cli_schema_version: 1.0 +name: license-model-create +description: Create License Model +version: onap-1.1 +service: + name: sdc + version: v1.0 + auth: basic + mode: direct + +parameters: + - name: vendor-name + description: vendor name + type: string + short_option: x + long_option: vendor-name + is_optional: false + - name: license-model-description + description: Description for License Model + type: string + short_option: y + long_option: license-model-description + is_optional: true +results: + direction: portrait + attributes: + - name: ID + description: License Model ID + scope: short + type: uuid +http: + request: + uri: /onboarding-api/v1.0/vendor-license-models + method: POST + body: '{"vendorName": "${vendor-name}", "description": "${license-model-description}", "iconRef": "icon"}' + success_codes: + - 200 + result_map: + ID: $b{$.value}
\ No newline at end of file diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema-1.1.yaml new file mode 100644 index 00000000..8e4c27b5 --- /dev/null +++ b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema-1.1.yaml @@ -0,0 +1,45 @@ +open_cli_schema_version: 1.0 +name: license-model-show +description: List License Model +version: onap-1.1 +service: + name: sdc + version: v1.0 + auth: basic + mode: direct + +results: + direction: landscape + attributes: + - name: id + description: License ID + scope: short + type: uuid + - name: vendor-name + description: Vendor Name + scope: short + type: string + - name: icon-ref + description: icon ref + scope: long + type: string + - name: status + description: status + scope: short + type: string + - name: description + description: License description + scope: long + type: string +http: + request: + uri: /onboarding-api/v1.0/vendor-license-models + method: GET + success_codes: + - 200 + result_map: + id: $b{$.results.[*].id} + vendor-name: $b{$.results.[*].vendorName} + icon-ref: $b{$.results.[*].iconRef} + status: $b{$.results.[*].status} + description: $b{$.results.[*].description}
\ No newline at end of file diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema.yaml index 8214c19c..52803f7f 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema.yaml @@ -37,7 +37,7 @@ results: type: string http: request: - uri: /onboarding-api/v1.0/vendor-software-products/${license-model-id} + uri: /onboarding-api/v1.0/vendor-license-models/${license-model-id} method: GET success_codes: - 200 diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-1.1-moco.json new file mode 100644 index 00000000..ee1c073d --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/license-key-group-create-1.1-moco.json @@ -0,0 +1,16 @@ +[{ + "request" : + { + "method" : "post", + "uri" : "onboarding-api/v1.0/vendor-license-models", + "headers" : { + "USER_ID": "cs0008", + "content-type" : "application/json" + }, + "json" : {"description": "test","name": "htipl-key-grp","operationalScope": {"choices": ["Tenant"],"other": ""},"type": "Universal"} + }, + "response" : + { + "json" : {"value":"81997d7d4795485daea7418fae26c5d0"} + } +}]
\ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-1.1-moco.json new file mode 100644 index 00000000..2970e34e --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-create-schema-1.1-moco.json @@ -0,0 +1,15 @@ +[{ + "request" : + { + "method" : "post", + "uri" : "/onboarding-api/v1.0/vendor-license-models", + "headers" : { + "USER_ID": "cs0008", + "content-type" : "application/json" + }, + "json" : {"vendorName": "htipl-sample", "description": "sample model", "iconRef": "icon"} + }, + "response" : { + "json" : {"value":"2366699475c943bdb283fc0b9106579c"} + } +}]
\ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-1.1-moco.json new file mode 100644 index 00000000..08493faf --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/license-model-show-schema-1.1-moco.json @@ -0,0 +1,39 @@ +[{ + "request" : + { + "method" : "get", + "uri" : "onboarding-api/v1.0/vendor-license-models", + "headers" : { + "USER_ID": "cs0008", + "content-type" : "application/json" + } + }, + "response" : + { + "listCount": 1, + "results": [ + { + "vendorName": "856acdac-40ef-4482-9981", + "description": "vendor license model", + "iconRef": "icon", + "id": "214fa77b19bb4253a35df7882562f2d0", + "version": { + "id": "1.0", + "label": "1.0" + }, + "status": "Final", + "viewableVersions": [ + { + "id": "1.0", + "label": "1.0" + } + ], + "finalVersions": [ + { + "id": "1.0", + "label": "1.0" + } + ] + }] + } +}]
\ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-key-group-create-schema-1.1.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-key-group-create-schema-1.1.yaml new file mode 100644 index 00000000..ff4b37bd --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-key-group-create-schema-1.1.yaml @@ -0,0 +1,15 @@ +onap_cli_sample_version: 1.0 + +name: license-key-group-create +version: onap-1.1 +samples: + sample1: + name: create license key group + input: --license-model-id 2366699475c943bdb283fc0b9106579c -x htipl-key-grp -y Universal -z test --operational-scope Tenant -u cs0008 -p demo123456! -m http://192.168.17.126:8080 + moco: license-key-group-create-1.1-moco.json + output: | + +----------+----------------------------------+ + |property |value | + +----------+----------------------------------+ + |ID |81997d7d4795485daea7418fae26c5d0 | + +----------+----------------------------------+
\ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-create-schema-1.1.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-create-schema-1.1.yaml new file mode 100644 index 00000000..b00686a9 --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-create-schema-1.1.yaml @@ -0,0 +1,15 @@ +onap_cli_sample_version: 1.0 + +name: license-model-create +version: onap-1.1 +samples: + sample1: + name: create license model + input: -x htipl -y "sample model" -u cs0008 -p demo123456! -m http://192.168.17.126:8080 + moco: license-model-create-schema-1.1-moco.json + output: | + +----------+----------------------------------+ + |property |value | + +----------+----------------------------------+ + |ID |2366699475c943bdb283fc0b9106579c | + +----------+----------------------------------+
\ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-show-schema-1.1.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-show-schema-1.1.yaml new file mode 100644 index 00000000..9bba4d61 --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-show-schema-1.1.yaml @@ -0,0 +1,37 @@ +onap_cli_sample_version: 1.0 + +name: license-model-show +version: onap-1.1 +samples: + sample1: + name: list license models + input: -u cs0008 -p demo123456! -m http://192.168.17.126:8080 --long + moco: license-model-show-schema-1.1-moco.json + output: | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |id |vendor-name |icon-ref |status |description | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |214fa77b19bb4253a35df7882562f2d0 |856acdac-40ef-4482-9981 |icon |Final |vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |4c292ccadd65463eb13eee6599454a1d |e719888c-0239-4dca-be7d |icon |Final |vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |29d0695d8aec4ee583123fe0d1851b4f |ee7ab025-6c58-433d-bd0d |icon |Final |vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |2744ca76b4ac4888b620c05ae91556f6 |ciLicense21435036 |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |030a59bde96f430b95465b007a9b3cdd |ciLicensefe30858a |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |950e25392f754522be7c3eb3de12bcf9 |ciLicense751898ab |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |8e8175bfff7849479f0073d198c63f53 |ciLicense28ebe623 |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |e05042b6f04d4b7a9ec75cf96bc6e470 |ciLicense90306c63 |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |39ea2c9a76f24e5fb8c384028cbd8f15 |ciLicenseed4a6e3f |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |a0edbf2e71734b1985cd92dcc77c1b4d |ciLicenseb0467328 |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |55f9d6352935440ea9c75aebe2cca80d |ciLicensef4044f13 |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+ + |182c1888c32e427698c621b9fb0987a5 |ciLicensec8ab4c16 |icon |Final |new vendor license model | + +----------------------------------+--------------------------+----------+--------+--------------------------+
\ No newline at end of file |