Merges from 1.1.0

Issue-Id: CLI-66

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

12 files changed, 0 insertions, 436 deletions

diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
deleted file mode 100644
index 7179b460..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-add-vf-schema-1.1.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-add-vf
-description: Helps to add VF into service models in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Onap Service Name
-    type: string
-    short_option: x
-    long_option: service-model-id
-    is_optional: false
-  - name: vf-id
-    description: VF ID
-    type: string
-    short_option: y
-    long_option: vf-id
-    is_optional: true
-  - name: vf-name
-    description: VF ID
-    type: string
-    short_option: z
-    long_option: vf-name
-    is_optional: true
-  - name: vf-version
-    description: VF version
-    type: string
-    long_option: vf-version
-    short_option: b
-    is_optional: true
-
-results:
-  direction: portrait
-  attributes:
-    - name: ID
-      description: Service ID
-      scope: short
-      type: string
-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"}'
-  success_codes:
-    - 201
-  result_map:
-    ID: $b{$.uniqueId}
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-approve-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-approve-schema-1.1.yaml
deleted file mode 100644
index 59b39864..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-approve-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-approve
-description: Approves the Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/distribution-state/approve
-    method: POST
-    body: '{"userRemarks": "Approves service model via CLI"}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
deleted file mode 100644
index 3402d673..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-complete-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-certify-complete
-description: Completes the certification of Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certify
-    method: POST
-    body: '{"userRemarks": "Completing certification via CLI"}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
deleted file mode 100644
index 2c437e51..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-request-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-certify-request
-description: Request the certification of Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certificationRequest
-    method: POST
-    body: '{"userRemarks": "Requesting certification via CLI"}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
deleted file mode 100644
index 05c056d1..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-certify-start-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-certify-start
-description: Starts the certification of Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/startCertification
-    method: POST
-    body: '{}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkin-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
deleted file mode 100644
index d5900fec..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkin-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-checkin
-description: Checkin Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/checkin
-    method: POST
-    body: '{"userRemarks": "Checked in via CLI"}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkout-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
deleted file mode 100644
index 26c31ac4..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-checkout-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-revert
-description: Checkout Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/checkout
-    method: POST
-    body: '{"userRemarks": "Checked out via CLI"}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-create-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-create-schema-1.1.yaml
deleted file mode 100644
index 17811ee4..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-create-schema-1.1.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-create
-description: Create Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: name
-    description: Onap Service Name
-    type: string
-    short_option: x
-    long_option: name
-    is_optional: false
-  - name: description
-    description: Description for Service
-    type: string
-    short_option: y
-    long_option: description
-    is_optional: true
-  - name: project-code
-    description: Project code
-    type: string
-    long_option: project-code
-    short_option: z
-    is_optional: true
-  - name: category
-    description: Service category
-    type: string
-    short_option: b
-    long_option: category
-    is_optional: true
-    default_value: network l1-3
-  - name: category-display-name
-    description: Service category display name
-    type: string
-    short_option: c
-    long_option: category-display-name
-    is_optional: true
-    default_value: Network L1-3
-  - name: icon-id
-    description: Service Icon id
-    type: string
-    short_option: e
-    long_option: icon-id
-    default_value: defaulticon
-    is_optional: true
-
-results:
-  direction: portrait
-  attributes:
-    - name: ID
-      description: Service ID
-      scope: short
-      type: string
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services
-    method: POST
-    body: '{"componentType": "SERVICE", "properties": [], "requirements": {}, "toscaArtifacts": {}, "tags": ["CLI", "${name}"], "artifacts": {}, "description": "${description}", "serviceApiArtifacts": {}, "capabilities": {}, "name": "${name}", "componentInstancesProperties": {}, "componentInstancesAttributes": {}, "contactId": "${onap-username}", "groups": [], "projectCode": "${project-code}", "deploymentArtifacts": {}, "attributes": [], "componentInstances": [], "categories": [{"normalizedName": "${category}", "name": "${category-display-name}", "uniqueId": "serviceNewCategory.${category}", "icons": ["${icon-id}"]}], "icon": "${icon-id}"}'
-  success_codes:
-    - 200
-    - 201
-  result_map:
-    ID: $b{$.uniqueId}
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-distribute-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
deleted file mode 100644
index f88925d4..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-distribute-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-distribute
-description: Distributes the Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/distribution/PROD/activate
-    method: POST
-    body: '{}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml
deleted file mode 100644
index 315f800f..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-list-schema-1.1.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-list
-description: List the service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-results:
-  direction: landscape
-  attributes:
-    - name: uuid
-      description: UUID
-      type: string
-      scope: short
-    - name: invariant-uuid
-      description: Invariant UUID
-      type: string
-      scope: short
-    - name: name
-      description: Name
-      type: string
-      scope: short
-    - name: version
-      description: version
-      type: string
-      scope: short
-    - name: status
-      description: status
-      type: string
-      scope: short
-    - name: distribution-status
-      description: status
-      type: string
-      scope: short
-    - name: description
-      description: description
-      type: string
-      scope: long
-
-http:
-  request:
-    uri: /sdc2/rest/v1/followed
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    uuid: $b{services.[*].uniqueId}
-    invariant-uuid: $b{services.[*].invariantUUID}
-    version: $b{services.[*].version}
-    name: $b{services.[*].name}
-    status: $b{services.[*].lifecycleState}
-    description: $b{services.[*].description}
-    distribution-status: $b{services.[*].distributionStatus}
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-revert-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-revert-schema-1.1.yaml
deleted file mode 100644
index fe78241e..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service-model-revert-schema-1.1.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-model-checkout
-description: Checkout Service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model ID
-    type: string
-    long_option: service-model-id
-    short_option: b
-    is_optional: true
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/UNDOCHECKOUT
-    method: POST
-    body: '{"userRemarks": "Checked out via CLI"}'
-  success_codes:
-    - 200
-
diff --git a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml b/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
deleted file mode 100644
index 26d7cd62..00000000
--- a/plugins/sdc/src/main/resources/onap-cli-schema/service-model/service2vf-model-list-schema-1.1.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-open_cli_schema_version: 1.0
-name: service2vf-model-list
-description: List the VF in a given service model in SDC
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: service-model-id
-    description: Service model uuid
-    type: string
-    short_option: z
-    long_option: service-model-id
-    is_optional: false
-
-results:
-  direction: landscape
-  attributes:
-    - name: vf-uuid
-      description: UUID
-      type: string
-      scope: short
-    - name: vf-name
-      description: name
-      type: string
-      scope: short
-    - name: vf-customization-uuid
-      description: customization UUID
-      type: string
-      scope: short
-    - name: vf-version
-      description: version
-      type: string
-      scope: short
-
-http:
-  request:
-    uri: /sdc2/rest/v1/catalog/services/${service-model-id}
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    vf-uuid: $b{componentInstances.[*].componentUid}
-    vf-name: $b{componentInstances.[*].componentName}
-    vf-version: $b{componentInstances.[*].componentVersion}
-    vf-customization-uuid: $b{componentInstances.[*].customizationUUID}