Merge changes I5bd73cfe,I16193def,I3b5e4f6f,Ibb8cfa87,I600cc8ed

* changes:
  Added tenant list schema command
  Added tenant delete schema command
  Added tenant create schema command
  Added vnf delete schema command
  Added vnf list schema command

5 files changed, 323 insertions, 0 deletions

diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-create-schema-elalto.yaml
new file mode 100644
index 00000000..430506db
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-create-schema-elalto.yaml
@@ -0,0 +1,60 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: tenant-create
+description: Create a tenant under given cloud region in Onap
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: cloud
+    description: Onap cloud
+    type: string
+    short_option: x
+    long_option: cloud
+    is_optional: false
+  - name: region
+    description: Onap cloud region
+    type: string
+    short_option: y
+    long_option: region
+    is_optional: false
+  - name: tenant-id
+    description: Onap cloud tenant id
+    type: uuid
+    short_option: z
+    long_option: tenant-id
+    is_optional: false
+  - name: tenant-name
+    description: Onap cloud tenant name
+    type: string
+    short_option: r
+    long_option: tenant-name
+    is_optional: false
+
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}
+    method: PUT
+    body: '{"tenant-id": "${tenant-id}", "tenant-name": "${tenant-name}"}'
+  success_codes:
+    - 200
+    - 201
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-delete-schema-elalto.yaml
new file mode 100644
index 00000000..8c6d9b97
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-delete-schema-elalto.yaml
@@ -0,0 +1,59 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: tenant-delete
+description: Delete tenant under given cloud region in Onap
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: cloud
+    description: Onap cloud
+    type: string
+    short_option: x
+    long_option: cloud
+    is_optional: false
+  - name: region
+    description: Onap cloud region
+    type: string
+    short_option: y
+    long_option: region
+    is_optional: false
+  - name: tenant-id
+    description: Onap cloud tenant id
+    type: string
+    short_option: z
+    long_option: tenant-id
+    is_optional: false
+  - name: resource-version
+    description: Onap cloud tenant version
+    type: uuid
+    short_option: r
+    long_option: resource-version
+    is_optional: true
+
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-list-schema-elalto.yaml
new file mode 100644
index 00000000..2faec9d7
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-list-schema-elalto.yaml
@@ -0,0 +1,65 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: tenant-list
+description: Lists the tenants under given cloud region in Onap
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: cloud
+    description: Onap cloud
+    type: string
+    short_option: x
+    long_option: cloud
+    is_optional: false
+  - name: region
+    description: Onap cloud region
+    type: string
+    short_option: y
+    long_option: region
+    is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: tenant-id
+      description: Onap tenant-id
+      scope: short
+      type: string
+    - name: tenant-name
+      description: Onap tenant name
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap tenant resource version
+      scope: short
+      type: string
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    tenant-id: $b{$.tenant.[*].tenant-id}
+    tenant-name: $b{$.tenant.[*].tenant-name}
+    resource-version: $b{$.tenant.[*].resource-version}
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-elalto.yaml
new file mode 100644
index 00000000..4abc798b
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-elalto.yaml
@@ -0,0 +1,46 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: vnf-delete
+description: Delete a VNF instancefrom Onap
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP HPA Integration Team (onap-discuss@lists.onap.org)
+
+parameters:
+  - name: vnf-id
+    description: Id of VNF to be deleted (get from vnf-list)
+    type: string
+    short_option: x
+    long_option: vnf-id
+    is_optional: false
+  - name: resource-version
+    description: resource version of vnf
+    type: uuid
+    short_option: y
+    long_option: resource-version
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/network/generic-vnfs/generic-vnf/${vnf-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-elalto.yaml
new file mode 100644
index 00000000..dadf8fa5
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-elalto.yaml
@@ -0,0 +1,93 @@
+# Copyright 2019 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+open_cli_schema_version: 1.0
+name: vnf-list
+description: List all the generic vnfs
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+  direction: landscape
+  attributes:
+    - name: vnf-name
+      description: Name of VNF
+      scope: short
+      type: string
+    - name: vnf-id
+      description: Id of VNF
+      scope: short
+      type: string
+    - name: vnf-type
+      description: Type of VNF (composed of the service model name and the vf model name)
+      scope: short
+      type: string
+    - name: resource-version
+      description: resource version of VNF
+      scope: short
+      type: string
+    - name: vf-model-version-id
+      description: Version Id of its VF model
+      scope: long
+      type: string
+    - name: vf-model-invariant-id
+      description: Invariant Id of its VF model
+      scope: long
+      type: string
+    - name: vf-model-customization-id
+      description: Customization Id of its VF model
+      scope: long
+      type: string
+    - name: service-instance-name
+      description: Name of its service instance
+      scope: short
+      type: string
+    - name: service-instance-id
+      description: Id of its service instance
+      scope: short
+      type: string
+    - name: service-type
+      description: subsription service type
+      scope: long
+      type: string
+    - name: customer-name
+      description: global customer id
+      scope: long
+      type: string
+
+
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/network/generic-vnfs/
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    vnf-name: $b{generic-vnf.[*].vnf-name}
+    vnf-id: $b{generic-vnf.[*].vnf-id}
+    vnf-type: $b{generic-vnf.[*].vnf-type}
+    resource-version: $b{generic-vnf.[*].resource-version}
+    service-instance-name: $b{generic-vnf.[*].relationship-list.relationship.[*].related-to-property.[?(@.property-key == 'service-instance.service-instance-name')].property-value}
+    service-instance-id: $b{generic-vnf.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'service-instance.service-instance-id')].relationship-value}
+    service-type: $b{generic-vnf.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'service-subscription.service-type')].relationship-value}
+    customer-name: $b{generic-vnf.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'customer.global-customer-id')].relationship-value}
+    vf-model-version-id: $b{generic-vnf.[*].model-version-id}
+    vf-model-invariant-id: $b{generic-vnf.[*].model-invariant-id}
+    vf-model-customization-id: $b{generic-vnf.[*].model-customization-id}