From 5f428243d6a97f733a6c527484ca64f2a219ea6a Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Thu, 30 Aug 2018 19:02:27 +0530 Subject: Casablanca: MSB service create Issue-ID: CLI-122 Change-Id: Ie3eba0ddb0c8b6b4c83acdecb565707c0415b6ae Signed-off-by: Kanagaraj Manickam k00365106 --- .../microservice-create-schema-moco.json | 55 ++++++++++ .../microservice-create-schema-sample.yaml | 34 ++++++ .../microservice-create-schema.yaml | 121 +++++++++++++++++++++ 3 files changed, 210 insertions(+) create mode 100644 products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-moco.json create mode 100644 products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-sample.yaml create mode 100644 products/onap-casablanca/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml diff --git a/products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-moco.json b/products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-moco.json new file mode 100644 index 00000000..d2b703d0 --- /dev/null +++ b/products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-moco.json @@ -0,0 +1,55 @@ +[ { + "request" : { + "method" : "post", + "uri" : "/api/microservices/v1/services", + "headers" : { + "Accept" : "application/json", + "Content-Type" : "application/json" + }, + "json" : { + "serviceName" : "test", + "version" : "v1", + "path" : "/test", + "url" : "/test", + "protocol" : "REST", + "enable_ssl" : "", + "visualRange" : "1", + "lb_policy" : "ip_hash", + "nodes" : [ { + "ip" : "10.0.0.1", + "port" : "8080", + "ttl" : 0 + } ] + } + }, + "response" : { + "status" : 201, + "json" : { + "serviceName" : "test", + "version" : "v1", + "url" : "/test", + "protocol" : "REST", + "visualRange" : "1", + "lb_policy" : "ip_hash", + "publish_port" : "", + "namespace" : "", + "network_plane_type" : "", + "host" : "", + "path" : "/test", + "enable_ssl" : false, + "nodes" : [ { + "ip" : "10.0.0.1", + "port" : "8080", + "checkType" : "", + "checkUrl" : "", + "ha_role" : "", + "nodeId" : "_test_10.0.0.1_8080", + "status" : "passing" + } ], + "metadata" : [ ], + "labels" : [ ], + "status" : "1", + "is_manual" : false + } + } +} ] \ No newline at end of file diff --git a/products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-sample.yaml b/products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-sample.yaml new file mode 100644 index 00000000..4c302df8 --- /dev/null +++ b/products/onap-casablanca/features/msb/src/main/resources/open-cli-sample/microservice-create-schema-sample.yaml @@ -0,0 +1,34 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# 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_sample_version: 1.0 +name: microservice-create +version: onap-casablanca +samples: + sample1: + name: microservice-create + input: --service-name test --service-version v1 --service-url /test --path /test 10.0.0.1 8080 + moco: microservice-create-schema-moco.json + output: | + +----------+--------------+ + |property |value | + +----------+--------------+ + |name |test | + +----------+--------------+ + |version |v1 | + +----------+--------------+ + |url |/test | + +----------+--------------+ + |status |1 | + +----------+--------------+ diff --git a/products/onap-casablanca/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml b/products/onap-casablanca/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml new file mode 100644 index 00000000..9b897287 --- /dev/null +++ b/products/onap-casablanca/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml @@ -0,0 +1,121 @@ +# Copyright 2018 Huawei Technologies Co., Ltd. +# +# 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: microservice-create +description: Register microservice into Onap + +info: + product: onap-casablanca + service: msb + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: service-name + description: Onap service name + type: string + short_option: x + long_option: service-name + is_optional: false + - name: service-version + description: Onap service version + type: string + short_option: y + long_option: service-version + is_optional: false + - name: service-url + description: Onap service base url + type: url + short_option: r + long_option: service-url + is_optional: false + - name: enable-ssl + description: Onap service is enabled with https or not + type: string + short_option: b + long_option: enable-ssl + is_optional: true + default: false + - name: path + description: Onap service path + type: string + short_option: c + long_option: path + is_optional: true + - name: node-ip + description: Onap service running node IP + type: string + - name: node-port + description: Onap service running node port + type: string + - name: create-or-update + description: Onap service create or update + type: bool + default_value: true +results: + direction: portrait + 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: string + - 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: + auth: none + mode: direct + request: + uri: /api/microservices/v1/services + method: POST + body: '{"serviceName":"${service-name}","version":"${service-version}","path":"${path}","url":"${service-url}","protocol":"REST", "enable_ssl":"${enable-ssl}", "visualRange":"1","lb_policy":"ip_hash","nodes":[{"ip":"${node-ip}","port":"${node-port}","ttl":0}]}' + headers: + queries: + createOrUpdate: ${create-or-update} + 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: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}' -- cgit 1.2.3-korg