aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-08-30 18:56:56 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2018-09-11 15:09:43 +0530
commit51cf5de8f04d5d70bdeb124f97d1ebff496f6082 (patch)
treef13467f123e7699b230b472b13b9da72bed102aa
parentc6950dab8f95fd64ee9a4d373054ab015a325605 (diff)
Casablanca: catalog samples and update catalog url
Issue-ID: CLI-122 Change-Id: Id4fd795b5b30c83f331c00e7082c1572d1846fd4 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json44
-rw-r--r--products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-sample.yaml40
-rw-r--r--products/onap-casablanca/catalog/src/main/resources/open-cli-schema/catalog-onap-casablanca.yaml4
3 files changed, 86 insertions, 2 deletions
diff --git a/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json b/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
new file mode 100644
index 00000000..8ed762b3
--- /dev/null
+++ b/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
@@ -0,0 +1,44 @@
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/api/microservices/v1/services/so/version/v1",
+ "headers" : {
+ "Accept" : "application/json",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "serviceName": "so",
+ "version": "v1",
+ "url": "/ecomp/mso/infra",
+ "protocol": "REST",
+ "visualRange": "1",
+ "lb_policy": "",
+ "publish_port": "",
+ "namespace": "",
+ "network_plane_type": "",
+ "host": "",
+ "path": "",
+ "enable_ssl": false,
+ "nodes": [
+ {
+ "ip": "10.0.5.1",
+ "port": "8080",
+ "checkType": "",
+ "checkUrl": "",
+ "tls_skip_verify": true,
+ "ha_role": "",
+ "nodeId": "_v1_so_10.0.5.1_8080",
+ "status": "passing"
+ }
+ ],
+ "metadata": [],
+ "labels": [],
+ "status": "1",
+ "is_manual": false
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-sample.yaml b/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-sample.yaml
new file mode 100644
index 00000000..83456e02
--- /dev/null
+++ b/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-sample.yaml
@@ -0,0 +1,40 @@
+# 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: catalog
+version: onap-casablanca
+samples:
+ sample1:
+ name: catalog
+ input: --catalog-service-name so --catalog-service-version v1 --long
+ moco: catalog-schema-moco.json
+ output: |
+ +------------+----------------+
+ |property |value |
+ +------------+----------------+
+ |name |test |
+ +------------+----------------+
+ |version |v1 |
+ +------------+----------------+
+ |url |/ecomp/mso/infra|
+ +------------+----------------+
+ |status |1 |
+ +------------+----------------+
+ |nodes |10.0.0.1:8080 |
+ +------------+----------------+
+ |enable-ssl |false |
+ +------------+----------------+
+ |path | |
+ +------------+----------------+
diff --git a/products/onap-casablanca/catalog/src/main/resources/open-cli-schema/catalog-onap-casablanca.yaml b/products/onap-casablanca/catalog/src/main/resources/open-cli-schema/catalog-onap-casablanca.yaml
index 4b13bbb3..26677d6e 100644
--- a/products/onap-casablanca/catalog/src/main/resources/open-cli-schema/catalog-onap-casablanca.yaml
+++ b/products/onap-casablanca/catalog/src/main/resources/open-cli-schema/catalog-onap-casablanca.yaml
@@ -37,7 +37,7 @@ parameters:
type: string
description: service version registered in catalog service
short_option: i
- long_option: catalog-service-version
+ long_option: catalog-service-versions
is_optional: false
results:
direction: portrait
@@ -57,7 +57,7 @@ http:
mode: direct
auth: none
request:
- uri: /services/${catalog-service-name}/version/${catalog-service-version}
+ uri: /api/microservices/v1/services/${catalog-service-name}/version/${catalog-service-version}
method: GET
success_codes:
- 201