Bug Fixes in ONAP CLI

-Fixed Bugs
-Added some required descriptions

Change-Id: I93506078ee0ac4336374cd8d19d7459e9acf4015
Issue-ID: CLI-163
Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>

6 files changed, 24 insertions, 19 deletions

diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
index 01e0cad3..908dd068 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
@@ -25,7 +25,7 @@ info:
 results:
   direction: landscape
   attributes:
-    - name: service-model-vsp
+    - name: service-model-name
       description: name of vsp in service model
       type: string
       scope: short
@@ -46,5 +46,5 @@ http:
   success_codes:
     - 200
   result_map:
-    service-model-vsp: $b{resources.[*].name}
-    resource-module-name: $b{resources.[*].systemName}
+    service-model-name: $b{services.[*].name}
+    resource-module-name: $b{services.[*].systemName}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml
index 44a85914..63454976 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml
@@ -29,14 +29,14 @@ parameters:
     short_option: x
     long_option: service-model-id
     is_optional: false
-  - name: vf-id
-    description: VF ID
+  - name: vf-uniqueId
+    description: VF Unique ID
     type: string
     short_option: y
-    long_option: vf-id
+    long_option: vf-uniqueId
     is_optional: true
   - name: vf-name
-    description: VF ID
+    description: VF Name
     type: string
     short_option: z
     long_option: vf-name
@@ -64,7 +64,7 @@ http:
   request:
     uri: /sdc2/rest/v1/catalog/services/${service-model-id}/resourceInstance
     method: POST
-    body: '{"name": "${vf-name}", "componentVersion": "${vf-version}", "posY": 248, "posX": 406, "uniqueId": "${service-model-id}-${vf-id}", "originType": "VF", "componentUid": "${vf-id}", "icon": "defaulticon"}'
+    body: '{"name": "${vf-name}", "componentVersion": "${vf-version}", "posY": 248, "posX": 406, "uniqueId": "${service-model-id}-${vf-uniqueId}", "originType": "VF", "componentUid": "${vf-uniqueId}", "icon": "defaulticon"}'
   success_codes:
     - 201
   result_map:
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
index 40317323..5b39b846 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
@@ -23,10 +23,10 @@ info:
 
 
 parameters:
-  - name: service-model-uuid
-    description: Service model UUID (can be found by running service-model-list)
+  - name: service-model-uniqueId
+    description: Service model UniqueId (can be found by running service-model-list)
     type: string
-    long_option: service-model-uuid
+    long_option: service-model-uniqueId
     short_option: b
     is_optional: false
   - name: remarks
@@ -43,7 +43,7 @@ http:
     auth: basic
     mode: direct
   request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/distribution-state/approve
+    uri: /sdc2/rest/v1/catalog/services/${service-model-uniqueId}/distribution-state/approve
     method: POST
     body: '{"userRemarks": "${remarks}"}'
   success_codes:
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml
index 238cd79f..cf981b71 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml
@@ -23,10 +23,10 @@ info:
 
 
 parameters:
-  - name: service-model-uuid
+  - name: service-model-uniqueId
     description: Service model UUID (can be found from service-model-list)
     type: string
-    long_option: service-model-uuid
+    long_option: service-model-uniqueId
     short_option: b
     is_optional: true
 
@@ -37,7 +37,7 @@ http:
     auth: basic
     mode: direct
   request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/distribution/PROD/activate
+    uri: /sdc2/rest/v1/catalog/services/${service-model-uniqueId}/distribution/PROD/activate
     method: POST
     body: '{}'
   success_codes:
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
index 41b56556..87ccf7c8 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
@@ -29,6 +29,10 @@ results:
       description: UUID
       type: string
       scope: short
+    - name: uniqueId
+      description: uniqueId
+      type: string
+      scope: short
     - name: invariant-uuid
       description: Invariant UUID
       type: string
@@ -67,6 +71,7 @@ http:
     - 200
   result_map:
     uuid: $b{services.[*].uuid}
+    uniqueId: $b{services.[*].uniqueId}
     invariant-uuid: $b{services.[*].invariantUUID}
     version: $b{services.[*].version}
     name: $b{services.[*].name}
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 ce9ba283..f14fd6e3 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
@@ -23,10 +23,10 @@ info:
 
 
 parameters:
-  - name: vf-id
-    description: VF ID
+  - name: vf-uniqueId
+    description: VF UniqueId
     type: string
-    long_option: vf-id
+    long_option: vf-uniqueId
     short_option: b
     is_optional: false
   - name: remarks
@@ -43,7 +43,7 @@ http:
     auth: basic
     mode: direct
   request:
-    uri: /sdc2/rest/v1/catalog/resources/${vf-id}/lifecycleState/certify
+    uri: /sdc2/rest/v1/catalog/resources/${vf-uniqueId}/lifecycleState/certify
     method: POST
     body: '{"userRemarks":"${remarks}"}'
   success_codes: