From 952b99423d2e548527215a12450adb378f01a6c9 Mon Sep 17 00:00:00 2001 From: Itohan Date: Tue, 14 May 2019 23:07:54 +0000 Subject: Bug Fixes in ONAP CLI -Modified the service-instance-list vnf-list and vf-module-list commands to use AAI API instead of SO -Deleted Commands in SO Change-Id: If680711d056e7f50e074efb91bb2e352b8d735aa Issue-ID: CLI-163 Signed-off-by: Itohan Ukponmwan --- .../service-instance-list-schema-dublin.yaml | 61 ++++++++++++++ .../vf-module-list-schema-dublin.yaml | 60 ++++++++++++++ .../so-components/vnf-list-schema-dublin.yaml | 93 ++++++++++++++++++++++ 3 files changed, 214 insertions(+) create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml create mode 100644 products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml (limited to 'products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components') diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml new file mode 100644 index 00000000..511affc6 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/service-instance-list-schema-dublin.yaml @@ -0,0 +1,61 @@ +# 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-list +description: List the existing service instances + +info: + product: onap-dublin + 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/v14/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-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml new file mode 100644 index 00000000..046ca7b8 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vf-module-list-schema-dublin.yaml @@ -0,0 +1,60 @@ +# 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-list +description: List the VF module in a VNF instance + +info: + product: onap-dublin + 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/v14/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} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml new file mode 100644 index 00000000..f49390d4 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/so-components/vnf-list-schema-dublin.yaml @@ -0,0 +1,93 @@ +# 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-list +description: List all the generic vnfs + +info: + product: onap-dublin + 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/v14/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} -- cgit 1.2.3-korg