From c60433598b1b3ed5ac5b147720a70ee82a68cfee Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam <mkr1481@gmail.com>
Date: Thu, 29 Aug 2019 16:44:02 +0530
Subject: vf-model-create updates

Change-Id: Ib29c2c02bb4c2c6786fb799afc1302aaaff70f55
Issue-ID: CLI-166
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 .../vf/vf-model-create-schema-dublin.yaml          | 65 ++++++----------------
 1 file changed, 18 insertions(+), 47 deletions(-)

(limited to 'products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml')

diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml
index 5a542ba2..5fa4cbaa 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/vf/vf-model-create-schema-dublin.yaml
@@ -18,7 +18,7 @@ description: Create Virtual function from Vendor Software Product
 
 info:
   product: onap-dublin
-  service: sdc
+  service: sdc.catalog
   author: ONAP HPA Team onap-discuss@lists.onap.org
 
 
@@ -46,21 +46,29 @@ parameters:
     type: string
     long_option: vsp-id
     short_option: b
-    is_optional: false
+    is_optional: true
   - name: vsp-version
     description: VSP version
     type: string
     long_option: vsp-version
     short_option: g
-    is_optional: false
+    is_optional: true
 
 results:
   direction: portrait
   attributes:
-    - name: ID
+    - name: id
       description: VF ID
       scope: short
       type: string
+    - name: uuid
+      description: VF UUID
+      scope: short
+      type: string
+    - name: inputs
+      description: VNF Input ids
+      scope: short
+      type: string
 http:
   service:
     name: sdc
@@ -70,49 +78,12 @@ http:
   request:
     uri: /sdc2/rest/v1/catalog/resources
     method: POST
-    body: '{
-           "artifacts":{},
-           "toscaArtifacts":{},
-           "contactId":"${host-username}",
-           "categories":[{
-               "name":"Generic",
-               "normalizedName":"generic",
-               "uniqueId":"resourceNewCategory.generic",
-               "icons": null,
-               "subcategories":[{
-                   "name":"Abstract",
-                   "normalizedName":"abstract",
-                   "uniqueId":"resourceNewCategory.generic.abstract",
-                   "groupings":null,
-                   "version":null,
-                   "ownerId":null,
-                   "icons":["abstract"],
-                   "empty":false,
-                   "type":null }],
-            "version":null,
-            "ownerId":null,
-            "empty":false,
-            "type":null }],
-            "description":"${description}",
-            "icon":"defaulticon",
-            "componentInstancesProperties":{},
-            "componentInstancesAttributes":{},
-            "name":"${name}",
-            "tags":["${name}"],
-            "capabilities":{},
-            "requirements":{},
-            "deploymentArtifacts":{},
-            "componentType":"RESOURCE",
-            "vendorName":"${vendor-name}",
-            "vendorRelease":"1.0",
-            "componentInstances":[],
-            "properties":[],
-            "attributes":[],
-            "resourceType":"VF",
-            "csarUUID":"${vsp-id}",
-            "csarVersion":"1.0"
-           }'
+    body: '{"contactId": "${host-username}", "vendorRelease": "1.0", "requirements": {}, "artifacts": {}, "capabilities": {}, "componentInstancesProperties": {}, "deploymentArtifacts": {}, "icon": "defaulticon", "vendorName": "${vendor-name}", "description": "${description}", "tags": ["CLI", "${name}"], "properties": [], "categories": [{"subcategories": [{"normalizedName": "abstract", "name": "Abstract", "uniqueId": "resourceNewCategory.generic.abstract", "icons": ["database"]}], "normalizedName": "generic", "name": "Generic", "uniqueId": "resourceNewCategory.generic"}], "name": "${name}", "toscaArtifacts": {}, "csarUUID": "${vsp-id}", "resourceType": "VF", "csarVersion": "${vsp-version}", "componentType": "RESOURCE", "componentInstancesAttributes": {}, "attributes": [], "componentInstances": []}'
+    context:
+      remove_empty_node: true
   success_codes:
     - 201
   result_map:
-    ID: $b{$.uniqueId}
+    id: $b{$.uniqueId}
+    uuid: $b{$.uuid}
+    inputs: $b{$.inputs.[*].uniqueId}
\ No newline at end of file
-- 
cgit 1.2.3-korg