Merges from 1.1.0

Issue-Id: CLI-66

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

10 files changed, 0 insertions, 459 deletions

diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
deleted file mode 100644
index fec5938d..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-add-artifact-schema-1.1.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-add-artifact
-description: Upload the CSAR file to VSP
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: vsp-id
-    description: Onap VSP ID
-    type: string
-    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: z
-    long_option: vsp-file
-    is_optional: false
-http:
-  request:
-    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
\ No newline at end of file
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
deleted file mode 100644
index 569dd3d7..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkin-schema-1.1.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-checkin
-description: Checkin Vendor Software Product
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
-    method: PUT
-    body: '{"action": "Checkin"}'
-  success_codes:
-    - 201
-    - 200
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
deleted file mode 100644
index 82dc5c40..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-checkout-schema-1.1.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-checkout
-description: Checkout Vendor Software Product
-version: onap-1.1
-
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
-    method: PUT
-    body: '{"action": "Checkout"}'
-  success_codes:
-    - 201
-    - 200
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml
deleted file mode 100644
index 44e4651d..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-create-schema-1.1.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-create
-description: Create Vendor Software Product
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: vsp-name
-    description: Onap VSP Name
-    type: string
-    short_option: x
-    long_option: vsp-name
-    is_optional: false
-  - name: vsp-description
-    description: Description for VSP
-    type: string
-    short_option: y
-    long_option: vsp-description
-    is_optional: true
-  - name: vsp-category
-    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: vlm-version
-    description: License version
-    type: string
-    long_option: vlm-version
-    short_option: c
-    is_optional: true
-    default_value: 1.0
-  - name: vlm-vendor
-    description: License Model vendor
-    type: string
-    long_option: vlm-vendor
-    short_option: e
-    is_optional: false
-  - name: vlm-id
-    description: License Model ID
-    type: string
-    long_option: vlm-id
-    short_option: g
-    is_optional: false
-  - name: vlm-agreement-id
-    description: License Agreement ID
-    type: string
-    long_option: vlm-agreement-id
-    short_option: i
-    is_optional: false
-  - name: vlm-feature-group-id
-    description: Feature Group ID
-    type: string
-    long_option: vlm-feature-group-id
-    short_option: j
-    is_optional: false
-results:
-  direction: portrait
-  attributes:
-    - name: ID
-      description: VSP ID
-      scope: short
-      type: string
-http:
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products
-    method: POST
-    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:
-    ID: $b{$.vspId}
-  sample_response:
-    body: '{"vspId":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml
deleted file mode 100644
index a9aa8100..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-list-schema-1.1.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-list
-description: List of the Vendor Software Products
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-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:
-  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/sdc/src/main/resources/onap-cli-schema/vsp/vsp-package-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-package-schema-1.1.yaml
deleted file mode 100644
index 9f37277b..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-package-schema-1.1.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-package
-description: Package Vendor Software Product
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-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:
-  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/sdc/src/main/resources/onap-cli-schema/vsp/vsp-revert-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-revert-schema-1.1.yaml
deleted file mode 100644
index dad10aee..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-revert-schema-1.1.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-revert
-description: Revert Vendor Software Product
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-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:
-  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/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema-1.1.yaml
deleted file mode 100644
index 785368cd..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-show-schema-1.1.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-show
-description: Details of the Vendor Software Product
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: vsp-id
-    description: Onap VSP ID
-    type: string
-    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: portrait
-  attributes:
-    - name: name
-      description: VSP Name
-      scope: short
-      type: string
-    - name: ID
-      description: VSP ID
-      scope: short
-      type: string
-    - name: description
-      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:
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    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/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema-1.1.yaml
deleted file mode 100644
index ec33538c..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-submit-schema-1.1.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-submit
-description: Submit Vendor Software Product
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/versions/${vsp-version}/actions
-    method: PUT
-    body: '{"action": "Submit"}'
-  success_codes:
-    - 201
-    - 200
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-validate-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-validate-schema-1.1.yaml
deleted file mode 100644
index 243ddbb4..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/vsp/vsp-validate-schema-1.1.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-validate
-description: Validated the uploaded Vendor Software Product
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-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:
-  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}
-