From 3657ff330adc9580e1e01470d02a7d660d43701e Mon Sep 17 00:00:00 2001 From: Haibin Huang Date: Tue, 4 Jun 2019 14:36:28 +0800 Subject: Add ns termination Issue-ID: CLI-149 Change-Id: Ie82c7392570754ef30d4a234d63ffb2faf90a037 Signed-off-by: Haibin Huang --- .../nslcm/vfc-nslcm-create-schema.yaml | 15 +++++- .../nslcm/vfc-nslcm-get-schema.yaml | 10 +--- .../nslcm/vfc-nslcm-terminate-schema.yaml | 56 ++++++++++++++++++++++ 3 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml (limited to 'products/onap-dublin/features/vfc/src/main/resources/open-cli-schema') diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml index 0577d30f..efdbb88b 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-create-schema.yaml @@ -34,6 +34,18 @@ parameters: short_option: n long_option: ns-csar-name is_optional: false + - name: customer-name + description: customer name + type: string + short_option: q + long_option: customer-name + is_optional: false + - name: service-type + description: service type + type: string + short_option: S + long_option: service-type + is_optional: false results: direction: landscape @@ -52,7 +64,8 @@ http: method: POST context: remove_empty_node: true - body: '{"csarId": "${ns-csar-uuid}", "nsName": "${ns-csar-name}"}' + body: '{"context": {"globalCustomerId": ${customer-name}, "serviceType": ${service-type}}, + "csarId": "${ns-csar-uuid}", "nsName": "${ns-csar-name}"}' headers: Content-Type: application/json Accept: application/json diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml index 2983d185..d6fa4398 100644 --- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml @@ -21,14 +21,6 @@ info: service: vfc author: ONAP HPA Integration Team (haibin.huang@intel.com) -parameters: - - name: ns-instance-id - description: ns's instance id - type: string - short_option: c - long_option: ns-instance-id - is_optional: false - results: direction: landscape attributes: @@ -54,7 +46,7 @@ http: auth: none mode: direct request: - uri: /api/nslcm/v1/ns/${ns-instance-id} + uri: /api/nslcm/v1/ns method: GET context: remove_empty_node: true diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml new file mode 100644 index 00000000..19f68666 --- /dev/null +++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-terminate-schema.yaml @@ -0,0 +1,56 @@ +# 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: vfc-nslcm-terminate +description: vfc nslcm terminate ns + +info: + product: onap-dublin + service: vfc + author: ONAP HPA Integration Team (haibin.huang@intel.com) + +parameters: + - name: ns-instance-id + description: ns's instance id + type: string + short_option: i + long_option: ns-instance-id + is_optional: false + +results: + direction: landscape + attributes: + - name: job-id + description: job id + scope: short + type: string + +http: + service: + auth: none + mode: direct + request: + uri: /api/nslcm/v1/ns/${ns-instance-id}/terminate + method: POST + context: + remove_empty_node: true + body: '{}' + headers: + Content-Type: application/json + Accept: application/json + success_codes: + - 202 + result_map: + job-id: $b{$.jobId} -- cgit 1.2.3-korg