Merge changes I965829d8,I5d9f5e34,Ia1bec228,I39502dfd

* changes:
  List of vf-module
  Deletion of vf-module
  Service instance list
  Service instance deletion

4 files changed, 219 insertions, 0 deletions

diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-elalto.yaml
new file mode 100644
index 00000000..e99d1915
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-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: service-instance-delete
+description: Delete a service instance from ONAP
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: service-instance-id
+    description: Id of service-instance to be deleted (get from service-instance-list)
+    type: string
+    short_option: x
+    long_option: service-instance-id
+    is_optional: false
+  - name: resource-version
+    description: resource version of service instance to be deleted
+    type: uuid
+    short_option: y
+    long_option: resource-version
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/nodes/service-instances/service-instance/${service-instance-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/service-instance-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-elalto.yaml
new file mode 100644
index 00000000..ad14698f
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-elalto.yaml
@@ -0,0 +1,61 @@
+# 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: service-instance-list
+description: List the existing service instances
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+results:
+  direction: landscape
+  attributes:
+    - name: service-instance-name
+      description: Name of service instance
+      scope: short
+      type: string
+    - name: service-instance-id
+      description: Id of service instance
+      scope: short
+      type: string
+    - name: resource-version
+      description: resource version 
+      scope: short
+      type: string
+    - name: service-model-version-id
+      description: version id of service model
+      scope: short
+      type: string
+    - name: service-model-invariant-id
+      description: Invariant Id of service model
+      scope: short
+      type: string
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/nodes/service-instances/
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    service-instance-name: $b{service-instance.[*].service-instance-name}
+    service-instance-id: $b{service-instance.[*].service-instance-id}
+    resource-version: $b{service-instance.[*].resource-version}
+    service-model-version-id: $b{service-instance.[*].model-version-id}
+    service-model-invariant-id: $b{service-instance.[*].model-invariant-id}
diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-elalto.yaml
new file mode 100644
index 00000000..4225b041
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-elalto.yaml
@@ -0,0 +1,52 @@
+# 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: vf-module-delete
+description: Delete a VF module from Onap
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+  - name: vnf-id
+    description: Id of VNF that vf module belongs to
+    type: string
+    short_option: x
+    long_option: vnf-id
+    is_optional: false
+  - name: vf-module-id
+    description: Id of the vf module
+    type: string
+    short_option: y
+    long_option: vf-module-id
+    is_optional: false
+  - name: resource-version
+    description: resource version of vf-module
+    type: uuid
+    short_option: r
+    long_option: resource-version
+    is_optional: true
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/network/generic-vnfs/generic-vnf/${vnf-id}/vf-modules/vf-module/${vf-module-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/vf-module-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-elalto.yaml
new file mode 100644
index 00000000..b42ca961
--- /dev/null
+++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-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: vf-module-list
+description: List the VF module in a VNF instance
+
+info:
+  product: onap-elalto
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
+parameters:
+   - name: vnf-id
+     description: id of vnf instance
+     type: string
+     short_option: x
+     long_option: vnf-id
+     is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: vf-module-name
+      description: Name of the vf-module
+      scope: short
+      type: string
+    - name: vf-module-id
+      description: Id of the vf-module
+      scope: short
+      type: string
+    - name: resource-version
+      description: resource version of the vf module
+      scope: short
+      type: string
+
+http:
+  service:
+    auth: basic
+    mode: direct
+  request:
+    uri: /aai/v16/network/generic-vnfs/generic-vnf/${vnf-id}/vf-modules
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    vf-module-name: $b{vf-module.[*].vf-module-name}
+    vf-module-id: $b{vf-module.[*].vf-module-id}
+    resource-version: $b{vf-module.[*].resource-version}