Merges from 1.1.0

Issue-Id: CLI-66

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

7 files changed, 0 insertions, 453 deletions

diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml
deleted file mode 100644
index 7b008e28..00000000
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vf-create-schema-1.1.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-open_cli_schema_version: 1.0
-name: vf-create
-description: Create a VF
-version: onap-1.1
-service:
-  name: so
-  version: v3
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: cloud-region
-    description: cloud region identifier
-    type: string
-    short_option: l
-    long_option: cloud-region
-    is_optional: false
-  - name: tenant-id
-    description: openstack tenant id
-    type: string
-    short_option: z
-    long_option: tenant-id
-    is_optional: false
-  - name: product-family
-    description: service type for serivce (e.g. vLB)
-    type: string
-    short_option: w
-    long_option: product-family
-    is_optional: false
-  - name: instance-name
-    description: service instance name
-    type: string
-    short_option: o
-    long_option: instance-name
-    is_optional: false
-  - name: service-instance-id
-    description: unique id for service instance
-    type: string
-    short_option: y
-    long_option: service-instance-id
-    is_optional: false
-  - name: vf-model-invariant-id
-    description: vf model invariant id
-    type: string
-    short_option: b
-    long_option: vf-model-invariant-id
-    is_optional: false
-  - name: vf-model-uuid
-    description: model uuid for vf
-    type: string
-    short_option: c
-    long_option: vf-model-uuid
-    is_optional: false
-  - name: vf-model-name
-    description: vf model name
-    type: string
-    short_option: e
-    long_option: vf-model-name
-    is_optional: false
-  - name: vf-model-version
-    description: vf model version
-    type: string
-    short_option: g
-    long_option: vf-model-version
-    is_optional: false
-  - name: vf-model-customization-id
-    description: vf model customization id
-    type: string
-    short_option: i
-    long_option: vf-model-customization-id
-    is_optional: false
-  - name: service-model-invariant-id
-    description: model invariant id
-    type: string
-    short_option: j
-    long_option: service-model-invariant-id
-    is_optional: false
-  - name: service-model-uuid
-    description: model name version id
-    type: string
-    short_option: k
-    long_option: service-model-uuid
-    is_optional: false
-  - name: service-model-name
-    description: service model name
-    type: string
-    short_option: q
-    long_option: service-model-name
-    is_optional: false
-  - name: service-model-version
-    description: service model version
-    type: string
-    short_option: n
-    long_option: service-model-version
-    is_optional: false
-
-
-results:
-  direction: portrait
-  attributes:
-    - name: vf-id
-      description: id for the created vnf
-      type: string
-      scope: short
-
-http:
-  request:
-    uri: /ecomp/mso/infra/serviceInstances/v3/${service-instance-id}/vnfs
-    method: POST
-    body: '{"requestDetails": {"modelInfo": {"modelType": "vnf","modelInvariantId": "${vf-model-invariant-id}","modelVersionId": "${vf-model-uuid}","modelName": "${vf-model-name}","modelVersion": "${vf-model-version}","modelCustomizationId": "${vf-model-customization-id}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"requestInfo": {"instanceName": "${instance-name}","source": "VID","productFamilyId": "${product-family}" },"relatedInstanceList": [{"relatedInstance": {"instanceId": "${service-instance-id}","modelInfo": {"modelType": "service","modelInvariantId": "${service-model-invariant-id}","modelVersionId": "${service-model-uuid}","modelName": "${service-model-name}","modelVersion": "${service-model-version}"}}}],"requestParameters": {}}}'
-
-  success_codes:
-    - 202
-  result_map:
-    vf-id: $b{$.requestReferences.instanceId}
-  sample_response:
-    body: '{"requestReferences": {"instanceId": "2a152730-f6eb-4dc6-9b81-7a6f6f263d71","requestId": "6402628f-7f67-4605-9e60-0d8632616d02"}}'
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml
deleted file mode 100644
index ff5304ff..00000000
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vf-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-open_cli_schema_version: 1.0
-name: vf-delete
-description: delete a VF (experimental)
-version: onap-1.1
-service:
-  name: so
-  version: v3
-  auth: basic
-  mode: direct
-parameters:
-- name: vf-id
-  description: id for vnf
-  type: string
-  short_option: x
-  long_option: vf-id
-  is_optional: false
-- name: service-instance-id
-  description: unique id for service instance
-  type: string
-  short_option: y
-  long_option: service-instance-id
-  is_optional: false
-- name: cloud-region
-  description: Cloud region ID
-  type: string
-  short_option: l
-  long_option: cloud-region
-  is_optional: false
-- name: tenant-id
-  description: openstack tenant id (uuid)
-  type: string
-  short_option: z
-  long_option: tenant-id
-  is_optional: false
-- name: model-invariant-id
-  description: model invariant id for service in SDC catalog
-  type: string
-  short_option: b
-  long_option: model-invariant-id
-  is_optional: false
-- name: model-uuid
-  description: model uuid for service in SDC catalog
-  type: string
-  short_option: c
-  long_option: model-uuid
-  is_optional: false
-- name: model-name
-  description: model name available in SDC catalog
-  type: string
-  short_option: e
-  long_option: model-name
-  is_optional: false
-- name: model-version
-  description: model version of service (eg. 1.0)
-  type: string
-  short_option: g
-  long_option: model-version
-  is_optional: false
-http:
-  request:
-    uri: /ecomp/mso/infra/serviceInstances/v3/${service-instance-id}/vnfs/${vf-id}
-    method: DELETE
-    body: '{"requestDetails": {"modelInfo": {"modelType": "vnf","modelInvariantId":"${model-invariant-id}","modelVersionId": "${model-uuid}","modelName": "${model-name}","modelVersion":"${model-version}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId":"${tenant-id}"},"requestInfo": {"source": "VID"},"requestParameters": {"userParams":[]}}}'
-  success_codes:
-  - 202
\ No newline at end of file
diff --git a/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml b/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml
deleted file mode 100644
index 52303e4e..00000000
--- a/plugins/so/src/main/resources/onap-cli-schema/services/vfmodule-create-schema-1.1.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-open_cli_schema_version: 1.0
-name: vfmodule-create
-description: Create a VF module
-version: onap-1.1
-service:
-  name: so
-  version: v3
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: cloud-region
-    description: cloud region identifier
-    type: string
-    short_option: l
-    long_option: cloud-region
-    is_optional: false
-  - name: tenant-id
-    description: openstack tenant id
-    type: string
-    short_option: B
-    long_option: tenant-id
-    is_optional: false
-  - name: vfmodule-invariant-id
-    description: vfmodule model invariant id
-    type: string
-    short_option: b
-    long_option: vfmodule-invariant-id
-    is_optional: false
-  - name: vfmodule-uuid
-    description: model uuid for vfmodule
-    type: string
-    short_option: c
-    long_option: vfmodule-uuid
-    is_optional: false
-  - name: vfmodule-name
-    description: vfmodule model name
-    type: string
-    short_option: e
-    long_option: vfmodule-name
-    is_optional: false
-  - name: vfmodule-version
-    description: vf module version
-    type: string
-    short_option: g
-    long_option: vfmodule-version
-    is_optional: false
-  - name: module-name
-    description: vfmodule name
-    type: string
-    short_option: i
-    long_option: module-name
-    is_optional: false
-  - name: service-id
-    description: unique id for service
-    type: string
-    short_option: j
-    long_option: service-id
-    is_optional: false
-  - name: vf-id
-    description: unique id for related VF
-    type: string
-    short_option: y
-    long_option: vf-id
-    is_optional: false
-  - name: vf-model-invariant-id
-    description: vf model invariant id
-    type: string
-    short_option: k
-    long_option: vf-model-invariant-id
-    is_optional: false
-  - name: vf-model-uuid
-    description: model uuid for vf
-    type: string
-    short_option: A
-    long_option: vf-model-uuid
-    is_optional: false
-  - name: vf-model-name
-    description: vf model name
-    type: string
-    short_option: n
-    long_option: vf-model-name
-    is_optional: false
-  - name: vf-model-version
-    description: vf model version
-    type: string
-    short_option: o
-    long_option: vf-model-version
-    is_optional: false
-  - name: vf-model-customization-id
-    description: vf model customization id. This can be obtained using SDC portal (Home -> service:xxx -> Composition -> click on VF for customization id).
-    type: string
-    short_option: q
-    long_option: vf-model-customization-id
-    is_optional: false
-  - name: service-model-invariant-id
-    description: model invariant id
-    type: string
-    short_option: r
-    long_option: service-model-invariant-id
-    is_optional: false
-  - name: service-model-uuid
-    description: model name version id
-    type: string
-    short_option: w
-    long_option: service-model-uuid
-    is_optional: false
-  - name: service-model-name
-    description: service model name
-    type: string
-    short_option: x
-    long_option: service-model-name
-    is_optional: false
-  - name: service-model-version
-    description: service model version
-    type: string
-    short_option: z
-    long_option: service-model-version
-    is_optional: false
-
-
-results:
-  direction: portrait
-  attributes:
-    - name: vfmodule-id
-      description: id for the created vnf
-      type: string
-      scope: short
-
-http:
-  request:
-    uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules
-    method: POST
-    body: '{"requestDetails": {"modelInfo": {"modelType": "vfModule","modelInvariantId": "${vfmodule-invariant-id}","modelNameVersionId": "${vfmodule-uuid}","modelName": "${vfmodule-name}","modelVersion": "${vfmodule-version}"},"cloudConfiguration": {"lcpCloudRegionId": "${cloud-region}","tenantId": "${tenant-id}"},"requestInfo": {"instanceName": "${module-name}","source": "VID"},"relatedInstanceList": [{"relatedInstance": {"instanceId": "${service-id}","modelInfo": {"modelType": "service","modelInvariantId": "${service-model-invariant-id}","modelNameVersionId": "${service-model-uuid}","modelName": "${service-model-name}","modelVersion": "${service-model-version}"}}},{"relatedInstance": {"instanceId": "${vf-id}","modelInfo": {"modelType": "vnf","modelInvariantId": "${vf-model-invariant-id}","modelNameVersionId": "${vf-model-uuid}","modelName": "${vf-model-name}","modelVersion": "${vf-model-version}","modelCustomizationName": "${vf-model-customization-id}"}}}],"requestParameters": {"userParams": []}}}'
-
-  success_codes:
-    - 202
-  result_map:
-    vfmodule-id: $b{$.requestReferences.instanceId}
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-moco.json b/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-moco.json
deleted file mode 100644
index 28321085..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-moco.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[ {
-  "request" : {
-    "method" : "post",
-    "uri" : "/ecomp/mso/infra/serviceInstances/v3",
-    "headers" : {
-      "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-      "X-FromAppId" : "onap-cli",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-0dc01d80-f629-4ea9-b49f-0bc45b79bfaf",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "requestDetails" : {
-        "cloudConfiguration" : {
-          "lcpCloudRegionId" : "RegionOne",
-          "tenantId" : "onap"
-        },
-        "modelInfo" : {
-          "modelType" : "service",
-          "modelInvariantId" : "1de901ed-17af-4b03-bc1f-41659cfa27cb",
-          "modelNameVersionId" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
-          "modelName" : "demoVLB",
-          "modelVersion" : "1.0"
-        },
-        "subscriberInfo" : {
-          "globalSubscriberId" : "Demonstration"
-        },
-        "requestInfo" : {
-          "instanceName" : "sample-service-onap-cli-13",
-          "source" : "VID",
-          "suppressRollback" : "false"
-        },
-        "requestParameters" : {
-          "subscriptionServiceType" : "vLB"
-        }
-      }
-    }
-  },
-  "response" : {
-    "status" : 202,
-    "json" : {
-      "requestReferences" : {
-        "instanceId" : "957949b4-f857-497c-81b0-832ce7bb9434",
-        "requestId" : "d59fc98a-b0fa-4de9-b426-6ef40dfd0812"
-      }
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-sample.yaml b/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-sample.yaml
deleted file mode 100644
index ea32791a..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/service-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-name: service-create
-version: onap-1.1
-samples:
-  sample1:
-    name: service-create
-    input: --cloud-region RegionOne --tenant-id onap --model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --model-name demoVLB --model-version 1.0 -c Demonstration --instance-name sample-service-onap-cli-13 --service-type vLB
-    moco: service-create-schema-1.1-moco.json
-    output: |
-      +--------------+--------------------------------------+
-      |property      |value                                 |
-      +--------------+--------------------------------------+
-      |service-id    |957949b4-f857-497c-81b0-832ce7bb9434  |
-      +--------------+--------------------------------------+
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-moco.json b/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-moco.json
deleted file mode 100644
index 0d8a97b9..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-moco.json
+++ /dev/null
@@ -1,56 +0,0 @@
-[ {
-  "request" : {
-    "method" : "post",
-    "uri" : "/ecomp/mso/infra/serviceInstances/v3/2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee/vnfs",
-    "headers" : {
-      "Authorization" : "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-      "X-FromAppId" : "onap-cli",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-8120ae88-0e56-4f1d-9a00-44f07e9469db",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "requestDetails" : {
-        "modelInfo" : {
-          "modelType" : "vnf",
-          "modelInvariantId" : "cc34cd54-dd7c-44cd-8847-f9577c6f1a49",
-          "modelVersionId" : "8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe",
-          "modelName" : "847cb26a-59a6-475a-94dd",
-          "modelVersion" : "1.0",
-          "modelCustomizationId" : "cf893f5a-1bb1-4e32-a92b-2456e12178f8"
-        },
-        "cloudConfiguration" : {
-          "lcpCloudRegionId" : "RegionOne",
-          "tenantId" : "onap"
-        },
-        "requestInfo" : {
-          "instanceName" : "vlb-cli-sample-11",
-          "source" : "VID",
-          "productFamilyId" : "vLB"
-        },
-        "relatedInstanceList" : [ {
-          "relatedInstance" : {
-            "instanceId" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee",
-            "modelInfo" : {
-              "modelType" : "service",
-              "modelInvariantId" : "1de901ed-17af-4b03-bc1f-41659cfa27cb",
-              "modelVersionId" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0",
-              "modelName" : "demoVLB",
-              "modelVersion" : "1.0"
-            }
-          }
-        } ],
-        "requestParameters" : { }
-      }
-    }
-  },
-  "response" : {
-    "status" : 202,
-    "json" : {
-      "requestReferences" : {
-        "instanceId" : "048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d",
-        "requestId" : "7bbf50b3-50d9-449e-a87d-694e2f373aea"
-      }
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-sample.yaml b/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-sample.yaml
deleted file mode 100644
index 0293b2ad..00000000
--- a/plugins/so/src/test/resources/onap-cli-sample/services/vf-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-name: vf-create
-version: onap-1.1
-samples:
-  sample1:
-    name: vf-create
-    input: --cloud-region RegionOne --tenant-id onap --product-family vLB --instance-name vlb-cli-sample-11 --service-instance-id 2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee --vf-model-invariant-id cc34cd54-dd7c-44cd-8847-f9577c6f1a49 --vf-model-uuid 8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe --vf-model-name 847cb26a-59a6-475a-94dd --vf-model-version 1.0 --vf-model-customization-id cf893f5a-1bb1-4e32-a92b-2456e12178f8 --service-model-invariant-id 1de901ed-17af-4b03-bc1f-41659cfa27cb --service-model-uuid ace39141-09ec-4068-b06d-ac6b23bdc6e0 --service-model-name demoVLB --service-model-version 1.0 -m http://192.168.17.121:8080 -u InfraPortalClient -p password1$
-    moco: vf-create-schema-1.1-moco.json
-    output: |
-      +--------------+--------------------------------------+
-      |property      |value                                 |
-      +--------------+--------------------------------------+
-      |vf-id         |048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d  |
-      +--------------+--------------------------------------+