summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKanagaraj Manickam <mkr1481@gmail.com>2019-08-29 16:43:09 +0530
committerKanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>2019-08-29 16:43:09 +0530
commit2b1fee8203030c84a84dad49a6d111697f1a6522 (patch)
treed10d7df34674deafea2b6a53ca4ee12af54dcd67
parentf07b3c64578ed7c9a7d74ef5fce72c6d7b79ff8c (diff)
complex-list updates
Change-Id: Ie7eea83e7c7d33da0f3830ac3e26c414aca2c16c Issue-ID: CLI-166 Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
-rw-r--r--products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-moco.json149
-rw-r--r--products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-sample.yaml25
2 files changed, 36 insertions, 138 deletions
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-moco.json
index 40a8d7f3..134e1ae0 100644
--- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-moco.json
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-moco.json
@@ -1,12 +1,12 @@
[ {
"request" : {
"method" : "get",
- "uri" : "/aai/v14//aai/v14/cloud-infrastructure/complexes/",
+ "uri" : "/aai/v14/cloud-infrastructure/complexes/",
"headers" : {
"Authorization" : "Basic QUFJOkFBSQ==",
"X-FromAppId" : "ONAP CLI",
"Accept" : "application/json",
- "X-TransactionId" : "req-6752433d-3b43-41a3-9547-9a58a9f0f8f5",
+ "X-TransactionId" : "req-6d8eccd5-8542-47b5-8f88-a6542e88a3ac",
"Content-Type" : "application/json"
},
"json" : null
@@ -15,72 +15,27 @@
"status" : 200,
"json" : {
"complex" : [ {
- "physical-location-id" : "clli1",
- "data-center-code" : "example-data-center-code-val-5556",
- "complex-name" : "clli1",
- "identity-url" : "example-identity-url-val-56898",
- "resource-version" : "1547842499867",
- "physical-location-type" : "example-physical-location-type-val-7608",
- "street1" : "example-street1-val-34205",
- "street2" : "example-street2-val-99210",
- "city" : "example-city-val-27150",
- "state" : "example-state-val-59487",
- "postal-code" : "00000",
- "country" : "USA",
- "region" : "example-region-val-13893",
- "latitude" : "32.89948",
- "longitude" : "97.045443",
+ "physical-location-id" : "clli2",
+ "data-center-code" : "example-data-center-code-val-6667",
+ "complex-name" : "clli2",
+ "identity-url" : "example-identity-url-val-28399",
+ "resource-version" : "1564454689109",
+ "physical-location-type" : "example-physical-location-type-val-28399",
+ "street1" : "example-street1-val-28399",
+ "street2" : "example-street2-val-28399",
+ "city" : "example-city-val-28399",
+ "state" : "example-state-val-28399",
+ "postal-code" : "example-postal-code-val-28399",
+ "country" : "example-country-val-28399",
+ "region" : "RegionOne",
+ "latitude" : "1111",
+ "longitude" : "2222",
"elevation" : "example-elevation-val-28399",
"lata" : "example-lata-val-28399",
"relationship-list" : {
"relationship" : [ {
"related-to" : "cloud-region",
"relationship-label" : "org.onap.relationships.inventory.LocatedIn",
- "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-05",
- "relationship-data" : [ {
- "relationship-key" : "cloud-region.cloud-owner",
- "relationship-value" : "CloudOwner"
- }, {
- "relationship-key" : "cloud-region.cloud-region-id",
- "relationship-value" : "ONAP-POD-01-Rail-05"
- } ],
- "related-to-property" : [ {
- "property-key" : "cloud-region.owner-defined-type",
- "property-value" : "t1"
- } ]
- }, {
- "related-to" : "cloud-region",
- "relationship-label" : "org.onap.relationships.inventory.LocatedIn",
- "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-04",
- "relationship-data" : [ {
- "relationship-key" : "cloud-region.cloud-owner",
- "relationship-value" : "CloudOwner"
- }, {
- "relationship-key" : "cloud-region.cloud-region-id",
- "relationship-value" : "ONAP-POD-01-Rail-04"
- } ],
- "related-to-property" : [ {
- "property-key" : "cloud-region.owner-defined-type",
- "property-value" : "t1"
- } ]
- }, {
- "related-to" : "cloud-region",
- "relationship-label" : "org.onap.relationships.inventory.LocatedIn",
- "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-06",
- "relationship-data" : [ {
- "relationship-key" : "cloud-region.cloud-owner",
- "relationship-value" : "CloudOwner"
- }, {
- "relationship-key" : "cloud-region.cloud-region-id",
- "relationship-value" : "ONAP-POD-01-Rail-06"
- } ],
- "related-to-property" : [ {
- "property-key" : "cloud-region.owner-defined-type",
- "property-value" : "t1"
- } ]
- }, {
- "related-to" : "cloud-region",
- "relationship-label" : "org.onap.relationships.inventory.LocatedIn",
"related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne",
"relationship-data" : [ {
"relationship-key" : "cloud-region.cloud-owner",
@@ -91,64 +46,28 @@
} ],
"related-to-property" : [ {
"property-key" : "cloud-region.owner-defined-type",
- "property-value" : "t1"
- } ]
- } ]
- }
- }, {
- "physical-location-id" : "clli2",
- "data-center-code" : "code6",
- "complex-name" : "clli2",
- "identity-url" : "url",
- "resource-version" : "1551206645488",
- "physical-location-type" : "phy_type",
- "street1" : "street1",
- "street2" : "street2",
- "city" : "HIlls",
- "state" : "OR",
- "postal-code" : "88889",
- "country" : "ENG",
- "region" : "region_val",
- "latitude" : "100.2",
- "longitude" : "30.8",
- "elevation" : "elev",
- "lata" : "lata",
- "relationship-list" : {
- "relationship" : [ {
- "related-to" : "cloud-region",
- "relationship-label" : "org.onap.relationships.inventory.LocatedIn",
- "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-07",
- "relationship-data" : [ {
- "relationship-key" : "cloud-region.cloud-owner",
- "relationship-value" : "CloudOwner"
- }, {
- "relationship-key" : "cloud-region.cloud-region-id",
- "relationship-value" : "ONAP-POD-01-Rail-07"
- } ],
- "related-to-property" : [ {
- "property-key" : "cloud-region.owner-defined-type",
- "property-value" : "t1"
+ "property-value" : "OwnerType"
} ]
} ]
}
}, {
- "physical-location-id" : "clli3",
- "data-center-code" : "code6",
- "complex-name" : "clli3",
- "identity-url" : "url",
- "resource-version" : "1552414833543",
+ "physical-location-id" : "ocomp-region",
+ "data-center-code" : "ocomp",
+ "complex-name" : "ocomp-region",
+ "identity-url" : "http://10.12.11.1:5000/v3",
+ "resource-version" : "1567068618154",
"physical-location-type" : "phy_type",
- "street1" : "street1",
- "street2" : "street2",
- "city" : "HIlls",
- "state" : "CA",
- "postal-code" : "88888",
- "country" : "NIG",
- "region" : "region_val",
- "latitude" : "10.2",
- "longitude" : "30.8",
- "elevation" : "elev",
- "lata" : "lata"
+ "street1" : "ocomp-street1",
+ "street2" : "ocomp-street2",
+ "city" : "ocomp-city",
+ "state" : "ocomp-state",
+ "postal-code" : "001481",
+ "country" : "abc",
+ "region" : "onap",
+ "latitude" : "1.0",
+ "longitude" : "1.0",
+ "elevation" : "ocomp-elelation",
+ "lata" : "ocomp-lata"
} ]
}
}
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-sample.yaml
index c8320fd5..84a1febc 100644
--- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-list-schema-dublin-sample.yaml
@@ -1,31 +1,10 @@
-# 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_sample_version: 1.0
name: complex-list
version: onap-dublin
samples:
sample1:
name: complex-list
- input:
+ input: --format json
moco: complex-list-schema-dublin-moco.json
output: |
- +--------------+------------------------------------+------------------+----------+--------------------------+----------+------------+------------------------------+
- |complex-name |data-center-code |resource-version |country |region |latitude |longitude |elevation |
- +--------------+------------------------------------+------------------+----------+--------------------------+----------+------------+------------------------------+
- |clli1 |example-data-center-code-val-5556 |1547842499867 |USA |example-region-val-13893 |32.89948 |97.045443 |example-elevation-val-28399 |
- +--------------+------------------------------------+------------------+----------+--------------------------+----------+------------+------------------------------+
- |clli2 |code6 |1551206645488 |ENG |region_val |100.2 |30.8 |elev |
- +--------------+------------------------------------+------------------+----------+--------------------------+----------+------------+------------------------------+
- |clli3 |code6 |1552414833543 |NIG |region_val |10.2 |30.8 |elev |
- +--------------+------------------------------------+------------------+----------+--------------------------+----------+------------+------------------------------+
+ [{"elevation":"example-elevation-val-28399","complex-name":"clli2","country":"example-country-val-28399","resource-version":"1564454689109","latitude":"1111","data-center-code":"example-data-center-code-val-6667","region":"RegionOne","longitude":"2222"},{"elevation":"ocomp-elelation","complex-name":"ocomp-region","country":"abc","resource-version":"1567068618154","latitude":"1.0","data-center-code":"ocomp","region":"onap","longitude":"1.0"}]