Fixed bugs in CLI commands

-Fixed bug in get-resoure-module-name
-Changed vf-module-delete, vnf-delete and
 service-instance-delete to use AAI API instead of SO
-Delete vf-module-delete, vnf-delete and
 service-instance-delete amd service-show-resource-module-name
 files from SO directory

Issue-ID: CLI-163
Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>
Change-Id: I4f9a80751d19d31db8e8a23dbaa42161b9de38c2

9 files changed, 225 insertions, 0 deletions

diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-moco.json
new file mode 100644
index 00000000..ac6afd41
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v14/nodes/service-instances/service-instance/27f8ce0d-5906-46d9-bfb6-3b5664d889bf",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-d7a8f93f-ee5c-40b9-bc5e-71dacc7843da",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-sample.yaml
new file mode 100644
index 00000000..8b98823a
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/service-instance-delete-schema-dublin-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: -x
+version: onap-dublin
+samples:
+  sample1:
+    name: -x
+    input: 27f8ce0d-5906-46d9-bfb6-3b5664d889bf -y 1558550362930 -u AAI -p AAI -m https://10.12.5.23:30233
+    moco: service-instance-delete-schema-dublin-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-moco.json
new file mode 100644
index 00000000..dfb50ec6
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v14/network/generic-vnfs/generic-vnf/9c003710-73f8-4df9-b63b-2c42af20059f/vf-modules/vf-module/bd45e41e-5190-48d7-87f4-81d53da87452",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-7f7f246d-0b15-4954-8f59-547f78563463",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-sample.yaml
new file mode 100644
index 00000000..562c0f1e
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vf-module-delete-schema-dublin-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: -x
+version: onap-dublin
+samples:
+  sample1:
+    name: -x
+    input: 9c003710-73f8-4df9-b63b-2c42af20059f -y bd45e41e-5190-48d7-87f4-81d53da87452 -r 1558557415544 -u AAI -p AAI -m https://10.12.5.23:30233
+    moco: vf-module-delete-schema-dublin-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-moco.json
new file mode 100644
index 00000000..3d7a596a
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v14/network/generic-vnfs/generic-vnf/cc4b6782-4c65-4d42-b015-513a7eb1af4c",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-693f0342-1ad5-417c-a972-28cd41112d93",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-sample.yaml
new file mode 100644
index 00000000..b658db16
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/so-components/vnf-delete-schema-dublin-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: -x
+version: onap-dublin
+samples:
+  sample1:
+    name: -x
+    input: cc4b6782-4c65-4d42-b015-513a7eb1af4c -y 1558558004300 -u AAI -p AAI -m https://10.12.5.23:30233
+    moco: vnf-delete-schema-dublin-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-dublin.yaml
new file mode 100644
index 00000000..c960fd50
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-delete-schema-dublin.yaml
@@ -0,0 +1,46 @@
+#  Copyright © Intel Corporation 2019
+#
+# 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-dublin
+  service: aai
+  author: ONAP HPA Integration 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/v14/nodes/service-instances/service-instance/${service-instance-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-dublin.yaml
new file mode 100644
index 00000000..904d57b0
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-delete-schema-dublin.yaml
@@ -0,0 +1,52 @@
+#  Copyright © Intel Corporation 2019
+#
+# 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-dublin
+  service: aai
+  author: ONAP HPA Integration 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/v14/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-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-dublin.yaml
new file mode 100644
index 00000000..d49310e2
--- /dev/null
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-delete-schema-dublin.yaml
@@ -0,0 +1,46 @@
+#  Copyright © Intel Corporation 2019
+#
+# 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-dublin
+  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/v14/network/generic-vnfs/generic-vnf/${vnf-id}?resource-version=${resource-version}
+    method: DELETE
+  success_codes:
+    - 204
+    - 404