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-list-schema-dublin.yaml | 83 --------- .../vf-module-list-schema-dublin.yaml | 143 ---------------- .../open-cli-schema/vnf-list-schema-dublin.yaml | 185 --------------------- 3 files changed, 411 deletions(-) delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml (limited to 'products/onap-dublin/features/so') diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml deleted file mode 100644 index 912016f7..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-list-schema-dublin.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# 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-list -description: List all service instances from SO - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -results: - direction: landscape - attributes: - - name: name - description: Onap service name - scope: short - type: string - - name: version - description: Onap service version - scope: short - type: string - - name: url - description: Onap service base url - scope: short - type: url - - name: status - description: Onap service status - scope: short - type: digit - - name: nodes - description: Onap service running nodes - scope: long - type: json - - name: enable-ssl - description: Onap service is enabled with https or not - scope: long - type: string - - name: path - description: Onap service path - scope: long - type: string - - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6 - method: GET - success_codes: - - 201 - - 200 - result_map: - name: $b{$.[*].serviceName} - version: $b{$.[*].version} - url: $b{$.[*].url} - status: $b{$.[*].status} - enable-ssl: $b{$.[*].enable_ssl} - path: $b{$.[*].path} - nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port} - sample_response: - body: '{ - "requestReferences":{ - "instanceId":"${instance-id}", - "requestId":"375ba428-65e7-4f2b-afb9-74735ac6bfd0" - } - }' diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml deleted file mode 100644 index e9d1ca73..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-list-schema-dublin.yaml +++ /dev/null @@ -1,143 +0,0 @@ -# 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 all VF Modules - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: lcp-cloudregion-id - description: AIC LCP node location identifier - type: string - short_option: l - long_option: lcp-cloudregion-id - is_optional: false - - name: tenant-id - description: openstack tenant id (uuid) - type: string - short_option: w - long_option: tenant-id - is_optional: false - - name: vnf-instance-id - description: vnf instance id - type: string - short_option: y - long_option: vnf-instace-id - is_optional: false - - name: service-instance-id - description: unique id for service instance - type: string - short_option: x - long_option: service-instace-id - is_optional: false - - name: parenet-service-model - description: parent service model name - type: string - short_option: z - long_option: parenet-service-model - is_optional: false - - name: supress-rollback - description: rollback changes if instantiation fails. - type: bool - short_option: r - long_option: supress-rollback - is_optional: true - - name: instance-name - description: service instance name - type: string - short_option: i - long_option: instance-name - is_optional: false - -results: - direction: portrait - attribute: - - name: vf-instance-id - description: id for the created vf - type: string - scope: short - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules - method: PUT - body: '{ - "requestDetails":{ - "modelInfo":{ - "modelType":"vfModule", - "modelInvariantId":"ff5256d2-5a33-55df-13ab-12abad84e7ff", - "modelNameVersionId":"fe6478e5-ea33-3346-ac12-ab121484a3fe", - "modelName":"vSAMP12..base..module-0", - "modelVersion":"1" - }, - "cloudConfiguration":{ - "lcpCloudRegionId":"${lcp-cloudregion-id}", - "tenantId":"${tenant-id}" - }, - "requestInfo":{ - "instanceName":"${instance-name}", - "source":"VID", - "suppressRollback":"${supress-rollback}" - }, - "relatedInstanceList":[ - { - "relatedInstance":{ - "instanceId":"${service-instance-id}", - "modelInfo":{ - "modelType":"service", - "modelInvariantId":"ff3514e3-5a33-55df-13ab-12abad84e7ff", - "modelNameVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe", - "modelName":"${parenet-service-model}", - "modelVersion":"1.0" - } - } - }, - { - "relatedInstance":{ - "instanceId":"${vnf-instance-id}", - "modelInfo":{ - "modelType":"vnf", - "modelInvariantId":"ff5256d1-5a33-55df-13ab-12abad84e7ff", - "modelNameVersionId":"fe6478e4-ea33-3346-ac12-ab121484a3fe", - "modelName":"vSAMP12", - "modelVersion":"1.0", - "modelCustomizationName":"vSAMP12 1" - } - } - } - ], - "requestParameters":{ - "userParams":[ - - ] - } - } - }' - - success_codes: - - 202 - result_mpa: - vf-instance-id: $b{$.vfInstanceId} - sample_response: - body: '{ "vfInstanceId" : "234567AB" }' diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml deleted file mode 100644 index 51b00312..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-list-schema-dublin.yaml +++ /dev/null @@ -1,185 +0,0 @@ -# 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 VNFs - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - - -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 - - name: requestor-id - description: requestor ID - type: string - short_option: r - long_option: requestor-id - is_optional: false - - -results: - direction: portrait - attributes: - - name: vf-id - description: id for the created vnf - type: string - scope: short - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${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":{ - "requestorId":"${requestor-id}", - "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" - } - }' -- cgit 1.2.3-korg