summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <mkr1481@gmail.com>2019-08-29 16:03:25 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2019-08-29 16:03:25 +0530
commit343affd4836a1e6a8e8336039e1eaab00f9e9502 (patch)
treec7195ffdca4721333a99bfcc08890f5cf90b1760
parentd5edf67b914052da0fa3c5011a46a34641d4a542 (diff)
VLM Agreement creation updates
Issue-ID: CLI-166 Change-Id: Ia1476c6189206e1b967d69e5598f9ebde39ce3a2 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-moco.json11
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-sample.yaml25
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml16
3 files changed, 13 insertions, 39 deletions
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-moco.json
index ba537d69..9c250c4f 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-moco.json
@@ -1,29 +1,28 @@
[ {
"request" : {
"method" : "post",
- "uri" : "/onboarding-api/v1.0/vendor-license-models/6b33c26b3a924b2789fa17fabd4a292d/versions/2b683bedebeb4874a9c2a82939c77f0d/license-agreements",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models/d572f583bf224b4c93b99105cd35b0a9/versions/496cc167b6cf44c3b7818c95a1d9e036/license-agreements",
"headers" : {
"Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
"X-FromAppId" : "ONAP CLI",
"Accept" : "application/json",
"USER_ID" : "cs0008",
- "X-TransactionId" : "req-43cc944d-8da7-41f3-95c7-59baf629cbd4",
+ "X-TransactionId" : "req-ea614e07-bd30-414b-aeaa-d0d517c0010d",
"Content-Type" : "application/json"
},
"json" : {
- "addedFeatureGroupsIds" : [ "457e9905f32544cca5351e86cc2e7958" ],
- "description" : "philip-aggrement",
+ "addedFeatureGroupsIds" : [ "880c355b9b374ec08db60906f86a7c15" ],
"licenseTerm" : {
"choice" : "Fixed_Term",
"other" : ""
},
- "name" : "philip-agreement"
+ "name" : "ocompvtpvendor Agreement"
}
},
"response" : {
"status" : 200,
"json" : {
- "value" : "ad7e38cbd8d94b0a8705b58a461e6b70"
+ "value" : "d53857e1d3df472cadd3ac72dfd83a6f"
}
}
} ] \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-sample.yaml
index 4838044e..a3cdd17f 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-dublin-sample.yaml
@@ -1,27 +1,10 @@
-# Copyright © Intel Corporation 2019
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
open_cli_sample_version: 1.0
-name: -x
+name: vlm-aggreement-create
version: onap-dublin
samples:
sample1:
- name: -x
- input: philip-agreement -y 6b33c26b3a924b2789fa17fabd4a292d -e 2b683bedebeb4874a9c2a82939c77f0d -z philip-aggrement -g 457e9905f32544cca5351e86cc2e7958 -u cs0008 -p demo123456! -m http://10.43.107.110:8081
+ name: vlm-aggreement-create
+ input: --format json --vlm-id d572f583bf224b4c93b99105cd35b0a9 --vlm-feature-group-id 880c355b9b374ec08db60906f86a7c15 --name ocompvtpvendor Agreement --vlm-version 496cc167b6cf44c3b7818c95a1d9e036
moco: vlm-aggreement-create-schema-dublin-moco.json
output: |
- +----------+----------------------------------+
- |property |value |
- +----------+----------------------------------+
- |ID |ad7e38cbd8d94b0a8705b58a461e6b70 |
- +----------+----------------------------------+
+ {"id":"d53857e1d3df472cadd3ac72dfd83a6f"}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml
index d320848f..7d95c4a3 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vlm/vlm-aggreement-create-schema-dublin.yaml
@@ -18,7 +18,7 @@ description: Create license aggreement
info:
product: onap-dublin
- service: sdc
+ service: sdc.onboarding
author: ONAP CLI Team onap-discuss@lists.onap.org
parameters:
@@ -40,12 +40,6 @@ parameters:
short_option: e
long_option: vlm-version
is_optional: false
- - name: description
- description: Description for aggreement
- type: string
- short_option: z
- long_option: description
- is_optional: false
- name: vlm-feature-group-id
description: VLM feature group
type: string
@@ -56,7 +50,7 @@ parameters:
results:
direction: portrait
attributes:
- - name: ID
+ - name: id
description: aggreement ID
scope: short
type: string
@@ -69,10 +63,8 @@ http:
request:
uri: /onboarding-api/v1.0/vendor-license-models/${vlm-id}/versions/${vlm-version}/license-agreements
method: POST
- body: '{"addedFeatureGroupsIds": ["${vlm-feature-group-id}"], "description": "${description}", "licenseTerm": {"choice": "Fixed_Term", "other": ""}, "name": "${name}"}'
+ body: '{"addedFeatureGroupsIds": ["${vlm-feature-group-id}"], "licenseTerm": {"choice": "Fixed_Term", "other": ""}, "name": "${name}"}'
success_codes:
- 200
result_map:
- ID: $b{$.value}
- sample_response:
- body: '{"value":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
+ id: $b{$.value}