summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <mkr1481@gmail.com>2019-08-29 16:44:00 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2019-08-29 16:44:00 +0530
commit2a01da7afe881a058820ff47dfed49d4db6d5a6a (patch)
treeb08608f6b9eeff19e3209127746b99ee2114f66e
parent5f4479c7a51f36fa153789c308a3ba72de1b2076 (diff)
vf-model-certify updates
Change-Id: I304d16895c16b69e76e8ad9580285e4bd1326748 Issue-ID: CLI-166 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-moco.json36
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-sample.yaml22
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml27
3 files changed, 45 insertions, 40 deletions
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-moco.json
index 36f408cf..40118f4b 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-moco.json
@@ -1,41 +1,39 @@
[ {
"request" : {
"method" : "post",
- "uri" : "/sdc2/rest/v1/catalog/resources/b3e0f162-5356-4b43-a9c0-3ab7e66638d2/lifecycleState/certify",
+ "uri" : "/sdc2/rest/v1/catalog/resources/eeafae8a-9269-4109-b97c-63290957ae8f/lifecycleState/certify",
"headers" : {
"Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
"X-FromAppId" : "ONAP CLI",
"Accept" : "application/json",
"USER_ID" : "cs0008",
- "X-TransactionId" : "req-d77560cd-ce34-48fe-9607-327f1eab89b4",
+ "X-TransactionId" : "req-68cb2dd3-ab18-4fc5-90aa-67ca3d24903a",
"Content-Type" : "application/json"
},
"json" : {
- "userRemarks" : "cli vf certification"
+ "userRemarks" : "Created by Open Command Platform - OCOMP"
}
},
"response" : {
"status" : 200,
"json" : {
- "uniqueId" : "86e7f0b5-e93f-45d7-b279-6e8d450fb1d9",
- "name" : "cli-vf-3",
+ "uniqueId" : "b85dad49-bd5c-4036-8eb0-601778b9d6ff",
+ "name" : "vgwocompvtp Vnf",
"version" : "1.0",
"isHighestVersion" : true,
- "creationDate" : 1553125006126,
- "lastUpdateDate" : 1553125171457,
- "description" : "cli-vf-3",
+ "creationDate" : 1567068744167,
+ "lastUpdateDate" : 1567068757452,
+ "description" : "Created by Open Command Platform - OCOMP",
"lifecycleState" : "CERTIFIED",
- "tags" : [ "cli-vf-3" ],
+ "tags" : [ "CLI", "vgwocompvtp Vnf" ],
"icon" : "defaulticon",
- "normalizedName" : "clivf3",
- "systemName" : "CliVf3",
+ "normalizedName" : "vgwocompvtpvnf",
+ "systemName" : "VgwocompvtpVnf",
"contactId" : "cs0008",
"allVersions" : {
- "1.0" : "86e7f0b5-e93f-45d7-b279-6e8d450fb1d9"
+ "1.0" : "b85dad49-bd5c-4036-8eb0-601778b9d6ff"
},
- "csarUUID" : "b45a4ac88b274c179744e4a2d2d93767",
- "csarVersion" : "1.0",
- "invariantUUID" : "d0046ab0-5789-4a97-b61a-2763acddd180",
+ "invariantUUID" : "4c891c7d-3e24-49de-a81e-9b08f75027c5",
"componentType" : "RESOURCE",
"categories" : [ {
"name" : "Generic",
@@ -55,14 +53,14 @@
"lastUpdaterUserId" : "cs0008",
"lastUpdaterFullName" : "Carlos Santana",
"archiveTime" : 0,
- "vendorName" : "itohan-vendor",
+ "vendorName" : "ocompvtpvendor",
"vendorRelease" : "1.0",
"resourceVendorModelNumber" : "",
"resourceType" : "VF",
- "toscaResourceName" : "org.openecomp.resource.vf.CliVf3",
+ "toscaResourceName" : "org.openecomp.resource.vf.VgwocompvtpVnf",
"vspArchived" : false,
- "archived" : false,
- "uuid" : "1119b3ca-ba88-446e-8812-7fe8f8078aef"
+ "uuid" : "d68a7966-e850-46f2-b5e0-d819c16a27db",
+ "archived" : false
}
}
} ] \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-sample.yaml
index 8d8ac974..5fa42ffd 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vf/vf-model-certify-schema-dublin-sample.yaml
@@ -1,22 +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: -b
+name: vf-model-certify
version: onap-dublin
samples:
sample1:
- name: -b
- input: b3e0f162-5356-4b43-a9c0-3ab7e66638d2 -r cli vf certification -u cs0008 -p demo123456! -m http://10.12.6.129:30205 --debug
+ name: vf-model-certify
+ input: --format json --remarks Created by Open Command Platform - OCOMP --vf-id eeafae8a-9269-4109-b97c-63290957ae8f
moco: vf-model-certify-schema-dublin-moco.json
- output: \ No newline at end of file
+ output: |
+ {"id":"b85dad49-bd5c-4036-8eb0-601778b9d6ff","uuid":"d68a7966-e850-46f2-b5e0-d819c16a27db","version":"1.0"}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml
index f14fd6e3..90877905 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-certify-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Certify a Virtual function
info:
product: onap-dublin
- service: sdc
+ service: sdc.catalog
author: ONAP HPA Team onap-discuss@lists.onap.org
parameters:
- - name: vf-uniqueId
+ - name: vf-id
description: VF UniqueId
type: string
- long_option: vf-uniqueId
+ long_option: vf-id
short_option: b
is_optional: false
- name: remarks
@@ -36,6 +36,21 @@ parameters:
short_option: r
is_optional: true
+results:
+ direction: portrait
+ attributes:
+ - name: id
+ description: VF version unique ID
+ scope: short
+ type: string
+ - name: uuid
+ description: VF UUID
+ scope: short
+ type: uuid
+ - name: version
+ description: VF version
+ scope: short
+ type: string
http:
service:
name: sdc
@@ -43,8 +58,12 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/resources/${vf-uniqueId}/lifecycleState/certify
+ uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/certify
method: POST
body: '{"userRemarks":"${remarks}"}'
success_codes:
- 200
+ result_map:
+ id: $b{$.uniqueId}
+ uuid: $b{$.uuid}
+ version: $b{$.version}