diff options
20 files changed, 43 insertions, 172 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 deleted file mode 100644 index bc5d0b97..00000000 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-key-group-create-schema-1.1.yaml +++ /dev/null @@ -1,56 +0,0 @@ -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-show-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema-1.1.yaml deleted file mode 100644 index 8e4c27b5..00000000 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-show-schema-1.1.yaml +++ /dev/null @@ -1,45 +0,0 @@ -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-entitlement-pool-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-create-schema.yaml index db0af2b6..db0af2b6 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-entitlement-pool-create-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-create-schema.yaml diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-entitlement-pool-show-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-show-schema.yaml index 93968407..93968407 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-entitlement-pool-show-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-entitlement-pool-show-schema.yaml diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-group-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-create-schema.yaml index bd9b8a23..bd9b8a23 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-group-create-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-create-schema.yaml diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-group-show-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-show-schema.yaml index 3b93d9e2..3b93d9e2 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-group-show-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-group-show-schema.yaml diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-create-schema.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-create-schema.yaml index 58a8681a..58a8681a 100644 --- a/plugins/sdc/src/main/resources/onap-cli-schema/license-models/license-model-create-schema.yaml +++ b/plugins/sdc/src/main/resources/onap-cli-schema/vlm/license-model-create-schema.yaml 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/vlm/license-model-show-schema.yaml index 52803f7f..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/vlm/license-model-show-schema.yaml 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/vlm/vlm-create-schema-1.1.yaml index 504af072..6fe6f575 100644 --- 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/vlm/vlm-create-schema-1.1.yaml @@ -1,5 +1,5 @@ open_cli_schema_version: 1.0 -name: license-model-create +name: vlm-create description: Create License Model version: onap-1.1 service: @@ -15,11 +15,11 @@ parameters: short_option: x long_option: vendor-name is_optional: false - - name: license-model-description + - name: description description: Description for License Model type: string short_option: y - long_option: license-model-description + long_option: description is_optional: true results: direction: portrait @@ -32,7 +32,7 @@ http: request: uri: /onboarding-api/v1.0/vendor-license-models method: POST - body: '{"vendorName": "${vendor-name}", "description": "${license-model-description}", "iconRef": "icon"}' + body: '{"vendorName": "${vendor-name}", "description": "${description}", "iconRef": "icon"}' success_codes: - 200 result_map: 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 deleted file mode 100644 index ff4b37bd..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-key-group-create-schema-1.1.yaml +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index b00686a9..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-create-schema-1.1.yaml +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 9bba4d61..00000000 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-show-schema-1.1.yaml +++ /dev/null @@ -1,37 +0,0 @@ -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 diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-entitlement-pool-create-schema.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-create-schema.yaml index 2b1d78d9..2b1d78d9 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-entitlement-pool-create-schema.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-create-schema.yaml diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-entitlement-pool-show-schema.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-show-schema.yaml index 244c1d66..244c1d66 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-entitlement-pool-show-schema.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-entitlement-pool-show-schema.yaml diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-group-create-schema.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-create-schema.yaml index 21ab46d2..21ab46d2 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-group-create-schema.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-create-schema.yaml diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-group-show-schema.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-show-schema.yaml index b927cd97..b927cd97 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-group-show-schema.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-group-show-schema.yaml diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-create-schema.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-create-schema.yaml index 10fc0510..10fc0510 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-create-schema.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-create-schema.yaml diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-show-schema.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-show-schema.yaml index 18e4c297..18e4c297 100644 --- a/plugins/sdc/src/test/resources/onap-cli-sample/license-models/license-model-show-schema.yaml +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/license-model-show-schema.yaml diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-moco.json b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-moco.json new file mode 100644 index 00000000..57445daf --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-moco.json @@ -0,0 +1,25 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/onboarding-api/v1.0/vendor-license-models", + "headers" : { + "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", + "X-FromAppId" : "onap-cli", + "Accept" : "application/json", + "USER_ID" : "cs0008", + "X-TransactionId" : "req-dfe8f907-9276-45ad-8fa8-ff557d61f661", + "Content-Type" : "application/json" + }, + "json" : { + "vendorName" : "kanag-cli", + "description" : "First License created from CLI", + "iconRef" : "icon" + } + }, + "response" : { + "status" : 200, + "json" : { + "value" : "cf2d907d998e44698ce3b4cded5f66a7" + } + } +} ]
\ No newline at end of file diff --git a/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml new file mode 100644 index 00000000..c80ff044 --- /dev/null +++ b/plugins/sdc/src/test/resources/onap-cli-sample/vlm/vlm-create-schema-1.1-sample.yaml @@ -0,0 +1,14 @@ +onap_cli_sample_version: 1.0 +name: vlm-create +version: onap-1.1 +samples: + sample1: + name: vlm-create + input: --vendor-name kanag-cli --description First License created from CLI + moco: vlm-create-schema-1.1-moco.json + ouput:| + +----------+----------------------------------+ + |property |value | + +----------+----------------------------------+ + |ID |cf2d907d998e44698ce3b4cded5f66a7 | + +----------+----------------------------------+ |