service-model-set-property updates

Change-Id: Iaa2e99ab13c00166d69c42d79d46d83d8625f30a
Issue-ID: CLI-166
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-set-property-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-set-property-moco.json
new file mode 100644 (file)
index 0000000..8c02a73
--- /dev/null
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-set-property-moco.json
@@ -0,0 +1,145 @@
+[ {
+  "request" : {
+    "method" : "post",
+    "uri" : "/sdc2/rest/v1/catalog/services/58620731-40a9-4f8e-95db-ef9fc478a705/resourceInstance/58620731-40a9-4f8e-95db-ef9fc478a705.b85dad49-bd5c-4036-8eb0-601778b9d6ff.vgwocompvtp/inputs",
+    "headers" : {
+      "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "USER_ID" : "cs0008",
+      "X-TransactionId" : "req-c6c02420-d49b-4432-a1e3-727987223c99",
+      "Content-Type" : "application/json"
+    },
+    "json" : [ {
+      "constraints" : [ ],
+      "definition" : false,
+      "name" : "nf_type",
+      "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
+      "password" : false,
+      "required" : false,
+      "schema" : {
+        "property" : { }
+      },
+      "toscaPresentation" : {
+        "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f"
+      },
+      "type" : "string",
+      "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_type",
+      "value" : "hwvnfmdriver"
+    } ]
+  },
+  "response" : {
+    "status" : 200,
+    "json" : [ {
+      "uniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f.nf_type",
+      "type" : "string",
+      "required" : false,
+      "definition" : false,
+      "defaultValue" : null,
+      "description" : null,
+      "schema" : {
+        "derivedFrom" : null,
+        "constraints" : null,
+        "properties" : null,
+        "property" : {
+          "uniqueId" : null,
+          "type" : null,
+          "required" : false,
+          "definition" : true,
+          "defaultValue" : null,
+          "description" : null,
+          "schema" : null,
+          "password" : false,
+          "name" : null,
+          "value" : null,
+          "label" : null,
+          "hidden" : false,
+          "immutable" : false,
+          "inputPath" : null,
+          "status" : null,
+          "inputId" : null,
+          "instanceUniqueId" : null,
+          "propertyId" : null,
+          "parentPropertyType" : null,
+          "subPropertyInputPath" : null,
+          "annotations" : null,
+          "parentUniqueId" : null,
+          "getInputValues" : null,
+          "getPolicyValues" : null,
+          "schemaType" : null,
+          "schemaProperty" : null,
+          "getInputProperty" : false,
+          "version" : null,
+          "ownerId" : null,
+          "empty" : false
+        },
+        "version" : null,
+        "ownerId" : null,
+        "empty" : false,
+        "type" : null
+      },
+      "password" : false,
+      "name" : "nf_type",
+      "value" : "hwvnfmdriver",
+      "label" : null,
+      "hidden" : false,
+      "immutable" : false,
+      "inputPath" : null,
+      "status" : null,
+      "inputId" : null,
+      "instanceUniqueId" : null,
+      "propertyId" : null,
+      "parentPropertyType" : null,
+      "subPropertyInputPath" : null,
+      "annotations" : null,
+      "parentUniqueId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
+      "getInputValues" : null,
+      "getPolicyValues" : null,
+      "constraints" : [ ],
+      "inputs" : null,
+      "properties" : null,
+      "valueUniqueUid" : null,
+      "path" : null,
+      "rules" : null,
+      "componentInstanceName" : null,
+      "componentInstanceId" : null,
+      "schemaType" : null,
+      "schemaProperty" : {
+        "uniqueId" : null,
+        "type" : null,
+        "required" : false,
+        "definition" : true,
+        "defaultValue" : null,
+        "description" : null,
+        "schema" : null,
+        "password" : false,
+        "name" : null,
+        "value" : null,
+        "label" : null,
+        "hidden" : false,
+        "immutable" : false,
+        "inputPath" : null,
+        "status" : null,
+        "inputId" : null,
+        "instanceUniqueId" : null,
+        "propertyId" : null,
+        "parentPropertyType" : null,
+        "subPropertyInputPath" : null,
+        "annotations" : null,
+        "parentUniqueId" : null,
+        "getInputValues" : null,
+        "getPolicyValues" : null,
+        "schemaType" : null,
+        "schemaProperty" : null,
+        "getInputProperty" : false,
+        "version" : null,
+        "ownerId" : null,
+        "empty" : false
+      },
+      "getInputProperty" : false,
+      "version" : null,
+      "ownerId" : "b8f09d0e-dd33-46d1-bb49-434094bf632f",
+      "empty" : false
+    } ]
+  }
+} ]
\ No newline at end of file

diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-set-property-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-set-property-sample.yaml
new file mode 100644 (file)
index 0000000..8984d7c
--- /dev/null
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-set-property-sample.yaml
@@ -0,0 +1,10 @@
+open_cli_sample_version: 1.0
+name: service-model-set-property
+version: onap-dublin
+samples:
+  sample1:
+    name: service-model-set-property
+    input: --format json --input-uuid b8f09d0e-dd33-46d1-bb49-434094bf632f --service-id 58620731-40a9-4f8e-95db-ef9fc478a705 --property-name nf_type --vf-resource-id 58620731-40a9-4f8e-95db-ef9fc478a705.b85dad49-bd5c-4036-8eb0-601778b9d6ff.vgwocompvtp --property-value hwvnfmdriver --vf-id b85dad49-bd5c-4036-8eb0-601778b9d6ff
+    moco: service-model-set-property-moco.json
+    output: |
+      [{}]

diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml
index a7ea76b..d69b666 100644 (file)
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml
@@ -18,27 +18,27 @@ description: Set property to a service model
 
 info:
   product: onap-dublin
-  service: sdc
+  service: sdc.catalog
   author: ONAP HPA Team onap-discuss@lists.onap.org
 
 
 parameters:
-  - name: service-uniqueId
+  - name: service-id
     description: service UniqueId
     type: string
-    long_option: service-uniqueId
+    long_option: service-id
     short_option: x
     is_optional: false
-  - name: resource-uuid
-    description: resource uuid
+  - name: vf-resource-id
+    description: resource id provided by service ns_id.vf_id.vf_name
     type: string
-    long_option: resource-uuid
+    long_option: vf-resource-id
     short_option: y
     is_optional: false
-  - name: resource-uniqueId
-    description: resource UniqueId
+  - name: vf-id
+    description: resource id
     type: string
-    long_option: resource-uniqueId
+    long_option: vf-id
     short_option: z
     is_optional: false
   - name: property-name
@@ -53,6 +53,12 @@ parameters:
     long_option: property-value
     short_option: r
     is_optional: false
+  - name: input-uuid
+    description: VF Model Input uuid
+    type: string
+    long_option: input-uuid
+    short_option: R
+    is_optional: false
 http:
   service:
     name: sdc
@@ -60,8 +66,8 @@ http:
     auth: basic
     mode: direct
   request:
-    uri: /sdc2/rest/v1/catalog/services/${service-uniqueId}/resourceInstance/${resource-uniqueId}/properties
+    uri: /sdc2/rest/v1/catalog/services/${service-id}/resourceInstance/${vf-resource-id}/inputs
     method: POST
-    body: '[{"constraints":null,"defaultValue":null,"description":null,"name":"${property-name}","parentUniqueId":null,"password":false,"required":false,"schema":{"property":{}},"schemaType":null,"type":"string","uniqueId":"${resource-uuid}.${property-name}","value":"${property-value}","definition":false,"getInputValues":null,"parentPropertyType":null,"subPropertyInputPath":null,"toscaPresentation":{"ownerId":null},"getPolicyValues":null,"inputPath":null}]'
+    body: '[{"constraints":[],"definition":false,"name":"${property-name}","parentUniqueId":"${input-uuid}","password":false,"required":false,"schema":{"property":{}},"toscaPresentation":{"ownerId":"${input-uuid}"},"type":"string","uniqueId":"${input-uuid}.${property-name}","value":"${property-value}"}]'
   success_codes:
     - 200