From 989678694e5960cb43ea5c0d37052b736b639423 Mon Sep 17 00:00:00 2001 From: Itohan Date: Wed, 22 May 2019 18:07:33 +0000 Subject: 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 Change-Id: I4f9a80751d19d31db8e8a23dbaa42161b9de38c2 --- .../service-delete-schema-dublin.yaml | 113 --------------------- ...ce-show-resource-module-name-schema-dublin.yaml | 61 ----------- .../vf-module-delete-schema-dublin.yaml | 103 ------------------- .../open-cli-schema/vnf-delete-schema-dublin.yaml | 106 ------------------- 4 files changed, 383 deletions(-) delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-delete-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-resource-module-name-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-delete-schema-dublin.yaml delete mode 100644 products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-delete-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-delete-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-delete-schema-dublin.yaml deleted file mode 100644 index 5bade839..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-delete-schema-dublin.yaml +++ /dev/null @@ -1,113 +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-delete - -description: Delete a service instance using SO - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: service-id - description: unique id for service instance - type: string - short_option: x - long_option: service-instace-id - is_optional: false - - name: model-invariant-id - description: model invariant id for service in SDC catalog - type: string - short_option: b - long_option: model-invariant-id - is_optional: false - - name: model-uuid - description: model uuid for service in SDC catalog - type: string - short_option: i - long_option: model-uuid - is_optional: false - - name: model-name - description: model name available in SDC catalog - type: string - short_option: e - long_option: model-name - is_optional: false - - name: model-version - description: model version of service (eg. 1.0) - type: string - short_option: g - long_option: model-version - is_optional: false - - name: customer-name - description: unique id for customer - type: string - short_option: c - long_option: customer-name - is_optional: false - - name: cloud-region - description: cloud region id - type: string - short_option: j - long_option: cloud-region - is_optional: false - - name: tenant-id - description: tenant id - type: string - short_option: k - long_option: tenant-id - is_optional: false - - name: requestor-id - description: requestor ID - type: string - short_option: r - long_option: requestor-id - is_optional: false - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${service-id} - method: DELETE - body: '{ - "requestDetails":{ - "modelInfo":{ - "modelType":"service", - "modelInvariantId":"${model-invariant-id}", - "modelVersionId":"${model-uuid}", - "modelName":"${model-name}", - "modelVersion":"${model-version}" - }, - "cloudConfiguration":{ - "lcpCloudRegionId":"${cloud-region}", - "tenantId":"${tenant-id}" - }, - "subscriberInfo":{ - "globalSubscriberId":"${customer-name}" - }, - "requestInfo":{ - "requestorId":"${requestor-id}", - "source":"CLI" - } - } - }' - success_codes: - - 202 diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-resource-module-name-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-resource-module-name-schema-dublin.yaml deleted file mode 100644 index f190f064..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/service-show-resource-module-name-schema-dublin.yaml +++ /dev/null @@ -1,61 +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-show-resource-module-name -description: Show a resource module name from SO - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: -- name: service-id - description: unique id for service instance - type: string - short_option: s - long_option: service-instace-id - is_optional: false - -results: - direction: landscape - attributes: - - name: name - description: Onap resource module name - scope: short - type: string - - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${service-id} - method: GET - success_codes: - - 201 - - 200 - result_map: - name: $b{$.[*].serviceName} - 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-delete-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-delete-schema-dublin.yaml deleted file mode 100644 index 81b7fada..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vf-module-delete-schema-dublin.yaml +++ /dev/null @@ -1,103 +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: vfmodule-delete - -description: delete a VF module (experimental) - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: - - name: vfmodule-id - description: VF module Id - type: string - short_option: x - long_option: vfmodule-id - is_optional: false - - name: service-id - description: unique id for service - type: string - short_option: j - long_option: service-id - is_optional: false - - name: vf-id - description: unique id for related VF - type: string - short_option: y - long_option: vf-id - is_optional: false - - name: vf-model-invariant-id - description: vf model invariant id - type: string - short_option: k - long_option: vf-model-invariant-id - is_optional: false - - name: vfmodule-name - description: vfmodule model name - type: string - short_option: e - long_option: vfmodule-name - is_optional: false - - name: vfmodule-version - description: vf module version - type: string - short_option: g - long_option: vfmodule-version - is_optional: false - - 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 - long_option: tenant-id - short_option: z - is_optional: false - -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id} - method: DELETE - body: '{ - "requestDetails":{ - "modelInfo":{ - "modelType":"vfModule", - "modelInvariantId":"${vf-model-invariant-id}", - "modelName":"${vfmodule-name}", - "modelVersion":"${vfmodule-version}" - }, - "cloudConfiguration":{ - "lcpCloudRegionId":"${cloud-region}", - "tenantId":"${tenant-id}" - }, - "requestInfo":{ - "source":"VID" - } - } - }' - - success_codes: - - 202 \ No newline at end of file diff --git a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-delete-schema-dublin.yaml b/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-delete-schema-dublin.yaml deleted file mode 100644 index 439dfd57..00000000 --- a/products/onap-dublin/features/so/src/main/resources/open-cli-schema/vnf-delete-schema-dublin.yaml +++ /dev/null @@ -1,106 +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-delete -description: Delete a VNF - -info: - product: onap-dublin - service: so - author: ONAP CLI Team onap-discuss@lists.onap.org - -parameters: -- name: vf-id - description: id for vnf - type: string - short_option: x - long_option: vf-id - 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: cloud-region - description: Cloud region ID - type: string - short_option: l - long_option: cloud-region - is_optional: false -- name: tenant-id - description: openstack tenant id (uuid) - type: string - short_option: z - long_option: tenant-id - is_optional: false -- name: model-invariant-id - description: model invariant id for service in SDC catalog - type: string - short_option: b - long_option: model-invariant-id - is_optional: false -- name: model-uuid - description: model uuid for service in SDC catalog - type: string - short_option: c - long_option: model-uuid - is_optional: false -- name: model-name - description: model name available in SDC catalog - type: string - short_option: e - long_option: model-name - is_optional: false -- name: model-version - description: model version of service (eg. 1.0) - type: string - short_option: g - long_option: model-version - is_optional: false -http: - service: - name: so - version: v6 - auth: basic - mode: direct - request: - uri: /onap/so/infra/serviceInstances/v6/${service-instance-id}/vnfs/${vf-id} - method: DELETE - body: '{ - "requestDetails":{ - "modelInfo":{ - "modelType":"vnf", - "modelInvariantId":"${model-invariant-id}", - "modelVersionId":"${model-uuid}", - "modelName":"${model-name}", - "modelVersion":"${model-version}" - }, - "cloudConfiguration":{ - "lcpCloudRegionId":"${cloud-region}", - "tenantId":"${tenant-id}" - }, - "requestInfo":{ - "source":"VID" - }, - "requestParameters":{ - "userParams":[ - - ] - } - } - }' - success_codes: - - 202 \ No newline at end of file -- cgit 1.2.3-korg