aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--products/onap-beijing/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-beijing.yaml4
-rw-r--r--products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-moco.json34
-rw-r--r--products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml30
3 files changed, 2 insertions, 66 deletions
diff --git a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-beijing.yaml b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-beijing.yaml
index 4da0661d..7e8b64c2 100644
--- a/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-beijing.yaml
+++ b/products/onap-beijing/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-beijing.yaml
@@ -1,4 +1,4 @@
-# Copyright 2017-18 Huawei Technologies Co., Ltd.
+# 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.
@@ -57,7 +57,7 @@ http:
auth: basic
mode: direct
request:
- uri: /aai/v12/cloud-infrastructure/cloud-regions
+ uri: /aai/v11/cloud-infrastructure/cloud-regions
method: GET
success_codes:
- 200
diff --git a/products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-moco.json b/products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-moco.json
deleted file mode 100644
index 9162bb59..00000000
--- a/products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-moco.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v12/cloud-infrastructure/cloud-regions",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "onap-cli",
- "Accept" : "application/json",
- "X-TransactionId" : "req-77c08aa0-662e-4d32-9206-bd569c3bf61b",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "cloud-region" : [ {
- "cloud-owner" : "huawei-cloud",
- "cloud-region-id" : "bangalore",
- "sriov-automation" : false,
- "resource-version" : "1509027332165"
- }, {
- "cloud-owner" : "Rackspace",
- "cloud-region-id" : "RegionOne",
- "cloud-type" : "SharedNode",
- "owner-defined-type" : "OwnerType",
- "cloud-region-version" : "v1",
- "cloud-zone" : "CloudZone",
- "sriov-automation" : false,
- "resource-version" : "1508827902543"
- } ]
- }
- }
-} ] \ No newline at end of file
diff --git a/products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml b/products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml
deleted file mode 100644
index 21ce62f3..00000000
--- a/products/onap-beijing/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-beijing-sample.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2017-18 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: cloud-list
-version: onap-amsterdam
-samples:
- sample1:
- name: cloud-list
- input:
- moco: cloud-list-schema-beijing-moco.json
- output: |
- +--------------+------------+------------------+
- |cloud |region |resource-version |
- +--------------+------------+------------------+
- |huawei-cloud |bangalore |1509027332165 |
- +--------------+------------+------------------+
- |Rackspace |RegionOne |1508827902543 |
- +--------------+------------+------------------+