Merges from 1.1.0

Issue-Id: CLI-66

Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

11 files changed, 283 insertions, 77 deletions

diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
index fda1144f..6822ef90 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
@@ -1,5 +1,5 @@
 open_cli_schema_version: 1.0
-name: vsp-upload
+name: vsp-add-artifact
 description: Upload the CSAR file to VSP
 
 info:
@@ -14,22 +14,23 @@ parameters:
     short_option: x
     long_option: vsp-id
     is_optional: false
+  - name: vsp-version
+    description: Onap VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
   - name: vsp-file
     description: CSAR File path
     type: binary
-    short_option: y
+    short_option: z
     long_option: vsp-file
     is_optional: false
 http:
-  service:
-    auth: none
-    mode: direct
   request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/upload
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/orchestration-template-candidate
     method: POST
     body: ${vsp-file}
     multipart_entity_name: upload
   success_codes:
-    - 200
-  sample_response:
-    body: ''
+    - 200
\ No newline at end of file
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
index acb6a076..cdafa2c7 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
@@ -14,16 +14,22 @@ parameters:
     short_option: x
     long_option: vsp-id
     is_optional: false
+  - name: vsp-version
+    description: VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
 http:
   service:
-    auth: none
+    name: sdc
+    version: v1.0
+    auth: basic
     mode: direct
   request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
     method: PUT
     body: '{"action": "Checkin"}'
   success_codes:
     - 201
     - 200
-  sample_response:
-    body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
index 033b9374..9e221b7f 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
@@ -14,19 +14,22 @@ parameters:
     short_option: x
     long_option: vsp-id
     is_optional: false
+  - name: vsp-version
+    description: VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
 http:
   service:
-    auth: none
-    mode: direct
-  service:
-    auth: none
+    name: sdc
+    version: v1.0
+    auth: basic
     mode: direct
   request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
     method: PUT
     body: '{"action": "Checkout"}'
   success_codes:
     - 201
     - 200
-  sample_response:
-    body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml
index 690ecabf..e4cd8bd3 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema-1.1.yaml
@@ -24,39 +24,46 @@ parameters:
     description: Category of the VSP
     type: string
     long_option: vsp-category
+    short_option: z
     is_optional: true
     default_value: resourceNewCategory.generic
   - name: vsp-subcategory
     description: Sub Category of VSP
     type: string
     long_option: vsp-subcategory
+    short_option: b
     is_optional: true
     default_value: resourceNewCategory.generic.abstract
-  - name: vsp-license-version
+  - name: vlm-version
     description: License version
     type: string
-    long_option: vsp-license-version
+    long_option: vlm-version
+    short_option: c
     is_optional: true
     default_value: 1.0
-  - name: vsp-vendor-name
-    description: License Model Name
+  - name: vlm-vendor
+    description: License Model vendor
     type: string
-    long_option: vsp-vendor-name
+    long_option: vlm-vendor
+    short_option: e
     is_optional: false
-  - name: vsp-vendor-id
+  - name: vlm-id
     description: License Model ID
     type: string
-    long_option: vsp-vendor-id
+    long_option: vlm-id
+    short_option: g
     is_optional: false
-  - name: license-agreement-id
+  - name: vlm-agreement-id
     description: License Agreement ID
     type: string
-    long_option: license-agreement-id
+    long_option: vlm-agreement-id
+    short_option: i
     is_optional: false
-  - name: feature-group-id
+  - name: vlm-feature-group-id
     description: Feature Group ID
     type: string
-    long_option: feature-group-id
+    long_option: vlm-feature-group-id
+    short_option: j
     is_optional: false
 results:
   direction: portrait
@@ -67,12 +74,14 @@ results:
       type: string
 http:
   service:
-    auth: none
+    name: sdc
+    version: v1.0
+    auth: basic
     mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products
     method: POST
-    body: '{"name": "${vsp-name}", "description": "${vsp-description}",  "category": "${vsp-category}",  "subCategory": "${vsp-subcategory}",  "licensingVersion": "${vsp-license-version}",  "vendorName": "${vsp-vendor-name}",  "vendorId": "${vsp-vendor-id}",  "icon": "icon",  "licensingData": { "licenseAgreement": "${license-agreement-id}",    "featureGroups": [ "${feature-group-id}"  ]}}'
+    body: '{"category": "${vsp-category}", "vendorId": "${vlm-id}", "subCategory": "${vsp-subcategory}", "description": "${vsp-description}", "licensingVersion": {"id": "${vlm-version}", "label": "${vlm-version}"}, "licensingData": {"featureGroups": ["${vlm-feature-group-id}"], "licenseAgreement": "${vlm-agreement-id}"}, "icon": "icon", "onboardingMethod": "NetworkPackage", "vendorName": "${vlm-vendor}", "name": "${vsp-name}"}'
   success_codes:
     - 200
   result_map:
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml
new file mode 100644
index 00000000..8271f9de
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema-1.1.yaml
@@ -0,0 +1,59 @@
+open_cli_schema_version: 1.0
+name: vsp-list
+description: List of the Vendor Software Products
+
+info:
+  product: onap-1.1
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+  direction: landscape
+  attributes:
+    - name: ID
+      description: VSP ID
+      scope: short
+      type: string
+    - name: name
+      description: VSP Name
+      scope: short
+      type: string
+    - name: vendor-name
+      description: Vendor name
+      scope: long
+      type: string
+    - name: version
+      description: Version
+      scope: short
+      type: string
+    - name: status
+      description: status
+      scope: short
+      type: string
+    - name: license-id
+      description: license aggreement
+      scope: long
+      type: string
+    - name: license-version
+      description: license version
+      scope: long
+      type: string
+http:
+  service:
+    name: sdc
+    version: v1.0
+    auth: basic
+    mode: direct
+  request:
+    uri: /onboarding-api/v1.0/vendor-software-products
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    ID: $b{results.[*].id}
+    name: $b{results.[*].name}
+    vendor-name: $b{results.[*].vendorName}
+    version: $b{results.[*].version.id}
+    status: $b{results.[*].status}
+    license-id: $b{results.[*].licensingData.licenseAgreement}
+    license-version: $b{results.[*].licensingVersion.id}
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
deleted file mode 100644
index 77fda362..00000000
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-list
-description: List of the Vendor Software Products
-
-info:
-  product: onap-1.1
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
-  direction: landscape
-  attributes:
-    - name: ID
-      description: VSP ID
-      scope: short
-      type: string
-    - name: name
-      description: VSP Name
-      scope: short
-      type: string
-http:
-  service:
-    auth: none
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    name: $b{results.[*].name}
-    ID: $b{results.[*].id}
-  sample_response:
-    body: '{"results":[{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"},{"name":"test-vsp","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"2DEB6CB4B082415BB7A697C9CD1273BA","version":"1.0","viewableVersions":["1.0"],"finalVersions":["1.0"],"status":"Final"}],"listCount":2}'
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml
new file mode 100644
index 00000000..01833844
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-package-schema-1.1.yaml
@@ -0,0 +1,37 @@
+open_cli_schema_version: 1.0
+name: vsp-package
+description: Package Vendor Software Product
+
+info:
+  product: onap-1.1
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: vsp-id
+    description: Onap VSP ID
+    type: string
+    short_option: x
+    long_option: vsp-id
+    is_optional: false
+  - name: vsp-version
+    description: VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
+http:
+  service:
+    name: sdc
+    version: v1.0
+    auth: basic
+    mode: direct
+  request:
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
+    method: PUT
+    body: '{"action": "Create_Package"}'
+  success_codes:
+    - 201
+    - 200
+  sample_response:
+    body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml
new file mode 100644
index 00000000..f5796520
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-revert-schema-1.1.yaml
@@ -0,0 +1,35 @@
+open_cli_schema_version: 1.0
+name: vsp-revert
+description: Revert Vendor Software Product
+
+info:
+  product: onap-1.1
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: vsp-id
+    description: Onap VSP ID
+    type: string
+    short_option: x
+    long_option: vsp-id
+    is_optional: false
+  - name: vsp-version
+    description: VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
+http:
+  service:
+    name: sdc
+    version: v1.0
+    auth: basic
+    mode: direct
+  request:
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
+    method: PUT
+    body: '{"action": "Undo_Checkout"}'
+  success_codes:
+    - 201
+    - 200
\ No newline at end of file
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml
index 9310275d..dea07300 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema-1.1.yaml
@@ -14,9 +14,14 @@ parameters:
     short_option: x
     long_option: vsp-id
     is_optional: false
-
+  - name: vsp-version
+    description: Onap VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
 results:
-  direction: landscape
+  direction: portrait
   attributes:
     - name: name
       description: VSP Name
@@ -30,18 +35,45 @@ results:
       description: Description for the VSP
       scope: short
       type: string
+    - name: vendor-name
+      description: Vendor name
+      scope: long
+      type: string
+    - name: vendor-id
+      description: Vendor id
+      scope: long
+      type: string
+    - name: version
+      description: Version
+      scope: short
+      type: string
+    - name: status
+      description: status
+      scope: short
+      type: string
+    - name: license-id
+      description: license aggreement
+      scope: long
+      type: string
 http:
   service:
-    auth: none
+    name: sdc
+    version: v1.0
+    auth: basic
     mode: direct
   request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}
     method: GET
   success_codes:
     - 200
   result_map:
-    name: $b{$.name}
     ID: $b{$.id}
+    name: $b{$.name}
     description: $b{$.description}
+    vendor-name: $b{$.vendorName}
+    vendor-id: $b{$.vendorId}
+    version: $b{$.version.id}
+    status: $b{$.status}
+    license-id: $b{$.licensingData.licenseAgreement}
   sample_response:
     body: '{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"}'
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml
index 029fd123..6529b9a3 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema-1.1.yaml
@@ -14,16 +14,22 @@ parameters:
     short_option: x
     long_option: vsp-id
     is_optional: false
+  - name: vsp-version
+    description: VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
 http:
   service:
-    auth: none
-    mode: directs
+    name: sdc
+    version: v1.0
+    auth: basic
+    mode: direct
   request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
     method: PUT
     body: '{"action": "Submit"}'
   success_codes:
     - 201
     - 200
-  sample_response:
-    body: ''
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml
new file mode 100644
index 00000000..42364cc3
--- /dev/null
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-validate-schema-1.1.yaml
@@ -0,0 +1,52 @@
+open_cli_schema_version: 1.0
+name: vsp-validate
+description: Validated the uploaded Vendor Software Product
+
+info:
+  product: onap-1.1
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: vsp-id
+    description: Onap VSP ID
+    type: string
+    short_option: x
+    long_option: vsp-id
+    is_optional: false
+  - name: vsp-version
+    description: VSP version
+    type: string
+    short_option: y
+    long_option: vsp-version
+    is_optional: false
+
+results:
+  direction: portrait
+  attributes:
+    - name: status
+      description: Validation status
+      scope: short
+      type: string
+    - name: errors
+      description: Validation messages
+      scope: short
+      type: json
+
+http:
+  service:
+    name: sdc
+    version: v1.0
+    auth: basic
+    mode: direct
+  request:
+    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/orchestration-template-candidate/process
+    method: PUT
+    body: '{}'
+  success_codes:
+    - 201
+    - 200
+  result_map:
+    status: $b{$.status}
+    errors: $b{$.errors}
+