diff options
Diffstat (limited to 'products/onap-dublin/features/aai/src/main')
48 files changed, 789 insertions, 398 deletions
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-dublin-moco.json new file mode 100644 index 00000000..4a50d149 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-dublin-moco.json @@ -0,0 +1,22 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v13/business/customers/customer/ovp", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-7c0cea00-bd21-4560-b31e-c03c5ad3ffa3", + "Content-Type" : "application/json" + }, + "json" : { + "global-customer-id" : "ovp", + "subscriber-name" : "ovp", + "subscriber-type" : "INFRA" + } + }, + "response" : { + "status" : 201, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-dublin-sample.yaml new file mode 100644 index 00000000..6c9904b0 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: customer-create +version: onap-dublin +samples: + sample1: + name: customer-create + input: --format json --customer-name ovp --subscriber-name ovp + moco: customer-create-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-dublin-moco.json new file mode 100644 index 00000000..2b0e8e9f --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-dublin-moco.json @@ -0,0 +1,18 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/aai/v13/business/customers/customer/ovp", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-e1e39cdd-d681-49eb-8fc3-0372fc6a6f27", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 204, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-dublin-sample.yaml new file mode 100644 index 00000000..cbbc6444 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: customer-delete +version: onap-dublin +samples: + sample1: + name: customer-delete + input: --format json --customer-id ovp --resource-version 1567068664088 + moco: customer-delete-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-dublin-moco.json new file mode 100644 index 00000000..b5dff83a --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-dublin-moco.json @@ -0,0 +1,30 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v13/business/customers", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-59c70d03-10ab-42a8-b6a7-65a0c85f22e4", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "customer" : [ { + "global-customer-id" : "Demonstration", + "subscriber-name" : "Demonstration", + "subscriber-type" : "INFRA", + "resource-version" : "1564139322133" + }, { + "global-customer-id" : "ovp", + "subscriber-name" : "ovp", + "subscriber-type" : "INFRA", + "resource-version" : "1567068664088" + } ] + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..02f0bf47 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: customer-list +version: onap-dublin +samples: + sample1: + name: customer-list + input: --format json + moco: customer-list-schema-dublin-moco.json + output: | + [{"resource-version":"1564139322133","name":"Demonstration"},{"resource-version":"1567068664088","name":"ovp"}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-dublin-moco.json new file mode 100644 index 00000000..69423848 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-dublin-moco.json @@ -0,0 +1,21 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v13/service-design-and-creation/services/service/tosca_vnf_validation", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-278f4b1f-de6f-4709-8fa2-f0d06a3e8fd7", + "Content-Type" : "application/json" + }, + "json" : { + "service-description" : "tosca_vnf_validation", + "service-id" : "tosca_vnf_validation" + } + }, + "response" : { + "status" : 201, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-dublin-sample.yaml new file mode 100644 index 00000000..afe4fc8c --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: service-type-create +version: onap-dublin +samples: + sample1: + name: service-type-create + input: --format json --service-type tosca_vnf_validation --service-type-id tosca_vnf_validation + moco: service-type-create-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-dublin-moco.json new file mode 100644 index 00000000..fe84faba --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-dublin-moco.json @@ -0,0 +1,18 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/aai/v13/service-design-and-creation/services/service/tosca_vnf_validation", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-0a160884-549b-4a63-8c26-631f1097dfa7", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 204, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-dublin-sample.yaml new file mode 100644 index 00000000..8f6ac49d --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: service-type-delete +version: onap-dublin +samples: + sample1: + name: service-type-delete + input: --format json --resource-version 1567068649380 --service-type-id tosca_vnf_validation + moco: service-type-delete-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-dublin-moco.json new file mode 100644 index 00000000..b7faf00c --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-dublin-moco.json @@ -0,0 +1,48 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v13/service-design-and-creation/services", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-75560ef7-f314-49bd-b825-4b282c49829a", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "service" : [ { + "service-id" : "e8cb8968-5411-478b-906a-f28747de72cd", + "service-description" : "vFW", + "resource-version" : "1564140431957" + }, { + "service-id" : "60330738-6cd0-4032-af2a-3088a03d4f47", + "service-description" : "vLB", + "resource-version" : "1564455509142" + }, { + "service-id" : "47412b60-6fb0-4b57-b801-77e0cbb69441", + "service-description" : "vCPE", + "resource-version" : "1564455509234" + }, { + "service-id" : "399e426b-2467-4575-8aa3-78ca766f9f37", + "service-description" : "vFWCL", + "resource-version" : "1564455509053" + }, { + "service-id" : "51afd5ba-bf2d-460c-b9a4-302fd70aec1c", + "service-description" : "vIMS", + "resource-version" : "1564455509330" + }, { + "service-id" : "tosca_vnf_validation", + "service-description" : "tosca_vnf_validation", + "resource-version" : "1567068649380" + }, { + "service-id" : "e3a3e05d-2179-4f04-b6ab-0a87909caf49", + "service-description" : "gNB", + "resource-version" : "1564455509431" + } ] + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..abd72b1d --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: service-type-list +version: onap-dublin +samples: + sample1: + name: service-type-list + input: --format json + moco: service-type-list-schema-dublin-moco.json + output: | + [{"resource-version":"1564140431957","service-type":"vFW","service-type-id":"e8cb8968-5411-478b-906a-f28747de72cd"},{"resource-version":"1564455509142","service-type":"vLB","service-type-id":"60330738-6cd0-4032-af2a-3088a03d4f47"},{"resource-version":"1564455509234","service-type":"vCPE","service-type-id":"47412b60-6fb0-4b57-b801-77e0cbb69441"},{"resource-version":"1564455509053","service-type":"vFWCL","service-type-id":"399e426b-2467-4575-8aa3-78ca766f9f37"},{"resource-version":"1564455509330","service-type":"vIMS","service-type-id":"51afd5ba-bf2d-460c-b9a4-302fd70aec1c"},{"resource-version":"1567068649380","service-type":"tosca_vnf_validation","service-type-id":"tosca_vnf_validation"},{"resource-version":"1564455509431","service-type":"gNB","service-type-id":"e3a3e05d-2179-4f04-b6ab-0a87909caf49"}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-moco.json index 1233effd..ed452105 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-moco.json +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-moco.json @@ -1,34 +1,34 @@ [ { "request" : { "method" : "put", - "uri" : "/aai/v14/business/customers/customer/hpa_cust/service-subscriptions/service-subscription/test-service", + "uri" : "/aai/v14/business/customers/customer/ovp/service-subscriptions/service-subscription/tosca_vnf_validation", "headers" : { "Authorization" : "Basic QUFJOkFBSQ==", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", - "X-TransactionId" : "req-6c818985-7492-4b34-9994-11753a1f954b", + "X-TransactionId" : "req-f3754c09-0a70-4913-b8ed-1273752ad452", "Content-Type" : "application/json" }, "json" : { - "service-type" : "test-service", + "service-type" : "tosca_vnf_validation", "relationship-list" : { "relationship" : [ { "related-to" : "tenant", "relationship-label" : "org.onap.relationships.inventory.Uses", - "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-06/tenants/tenant/709ba629fe194f8699b12f9d6ffd86a0", + "related-link" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP/tenants/tenant/6fcac72c-a2cd-4d18-9f1d-09908ca08afe", "relationship-data" : [ { "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "CloudOwner" + "relationship-value" : "OCOMP" }, { "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "ONAP-POD-01-Rail-06" + "relationship-value" : "RegionOVP" }, { "relationship-key" : "tenant.tenant-id", - "relationship-value" : "709ba629fe194f8699b12f9d6ffd86a0" + "relationship-value" : "6fcac72c-a2cd-4d18-9f1d-09908ca08afe" } ], "related-to-property" : [ { "property-key" : "tenant.tenant-name", - "property-value" : "Integration-HPA" + "property-value" : "ocomp" } ] } ] } diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-sample.yaml index f48d036b..84fc126f 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-dublin-sample.yaml @@ -1,22 +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 +open_cli_sample_version: 1.0 +name: subscription-create +version: onap-dublin +samples: + sample1: name: subscription-create - version: onap-dublin - samples: - sample1: - name: subscription-create - input: -x hpa_cust -y Integration-HPA -z CloudOwner -e test-service -c 709ba629fe194f8699b12f9d6ffd86a0 -r ONAP-POD-01-Rail-06 - moco: subscription-create-schema-dublin-moco.json - output:
\ No newline at end of file + input: --format json --service-type tosca_vnf_validation --cloud-region RegionOVP --cloud-owner OCOMP --tenant-name ocomp --customer-name ovp --cloud-tenant-id 6fcac72c-a2cd-4d18-9f1d-09908ca08afe + moco: subscription-create-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-moco.json index 3339c580..19a68782 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-moco.json +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-moco.json @@ -1,12 +1,12 @@ [ { "request" : { "method" : "delete", - "uri" : "/aai/v13/business/customers/customer/hpa_cust/service-subscriptions/service-subscription/test-service", + "uri" : "/aai/v13/business/customers/customer/ovp/service-subscriptions/service-subscription/tosca_vnf_validation", "headers" : { "Authorization" : "Basic QUFJOkFBSQ==", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", - "X-TransactionId" : "req-3a02dc1d-19b5-45d9-a34e-6d08a8b20a10", + "X-TransactionId" : "req-72799430-1922-4872-90cf-43233725a595", "Content-Type" : "application/json" }, "json" : null diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-sample.yaml index f68f46bd..90dd645b 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-dublin-sample.yaml @@ -1,22 +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: subscription-delete - version: onap-dublin - samples: - sample1: - name: subscription-delete - input: -x hpa_cust -y test-service -g 1552436359631 - moco: subscription-delete-schema-dublin-moco.json - output:
\ No newline at end of file +open_cli_sample_version: 1.0 +name: subscription-delete +version: onap-dublin +samples: + sample1: + name: subscription-delete + input: --format json --customer-name ovp --service-type tosca_vnf_validation --resource-version 1567068689784 + moco: subscription-delete-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-moco.json index 8723a866..53b63f96 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-moco.json +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-moco.json @@ -1,12 +1,12 @@ [ { "request" : { "method" : "get", - "uri" : "/aai/v13/business/customers/customer/hpa_cust/service-subscriptions", + "uri" : "/aai/v13/business/customers/customer/ovp/service-subscriptions", "headers" : { "Authorization" : "Basic QUFJOkFBSQ==", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", - "X-TransactionId" : "req-0617d23c-c9af-473a-9045-e964fd12d81f", + "X-TransactionId" : "req-46b9c555-2eef-4747-8830-8a58b6f610b3", "Content-Type" : "application/json" }, "json" : null @@ -15,62 +15,26 @@ "status" : 200, "json" : { "service-subscription" : [ { - "service-type" : "vfwhpa", - "resource-version" : "1552436330116", + "service-type" : "tosca_vnf_validation", + "resource-version" : "1567068689784", "relationship-list" : { "relationship" : [ { "related-to" : "tenant", "relationship-label" : "org.onap.relationships.inventory.Uses", - "related-link" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-06/tenants/tenant/709ba629fe194f8699b12f9d6ffd86a0", + "related-link" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP/tenants/tenant/6fcac72c-a2cd-4d18-9f1d-09908ca08afe", "relationship-data" : [ { "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "CloudOwner" + "relationship-value" : "OCOMP" }, { "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "ONAP-POD-01-Rail-06" + "relationship-value" : "RegionOVP" }, { "relationship-key" : "tenant.tenant-id", - "relationship-value" : "709ba629fe194f8699b12f9d6ffd86a0" + "relationship-value" : "6fcac72c-a2cd-4d18-9f1d-09908ca08afe" } ], "related-to-property" : [ { "property-key" : "tenant.tenant-name", - "property-value" : "Integration-HPA" - } ] - }, { - "related-to" : "tenant", - "relationship-label" : "org.onap.relationships.inventory.Uses", - "related-link" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-04/tenants/tenant/709ba629fe194f8699b12f9d6ffd86a0", - "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" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "709ba629fe194f8699b12f9d6ffd86a0" - } ], - "related-to-property" : [ { - "property-key" : "tenant.tenant-name", - "property-value" : "Integration-HPA" - } ] - }, { - "related-to" : "tenant", - "relationship-label" : "org.onap.relationships.inventory.Uses", - "related-link" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-05/tenants/tenant/709ba629fe194f8699b12f9d6ffd86a0", - "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" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "709ba629fe194f8699b12f9d6ffd86a0" - } ], - "related-to-property" : [ { - "property-key" : "tenant.tenant-name", - "property-value" : "Integration-HPA" + "property-value" : "ocomp" } ] } ] } diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-sample.yaml index 33e57b79..46a0256e 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-dublin-sample.yaml @@ -1,27 +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: subscription-list - version: onap-dublin - samples: - sample1: - name: subscription-list - input: -x hpa_cust - moco: subscription-list-schema-dublin-moco.json - output: | - +--------------+------------------+ - |service-type |resource-version | - +--------------+------------------+ - |vfwhpa |1552436330116 | - +--------------+------------------+ +open_cli_sample_version: 1.0 +name: subscription-list +version: onap-dublin +samples: + sample1: + name: subscription-list + input: --format json --customer-name ovp + moco: subscription-list-schema-dublin-moco.json + output: | + [{"resource-version":"1567068689784","service-type":"tosca_vnf_validation"}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-dublin-moco.json new file mode 100644 index 00000000..b104112a --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-dublin-moco.json @@ -0,0 +1,42 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/1e915311-1474-4ffb-8408-1183ddfcd1a8", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-97afb15a-fc8a-489d-8d1f-5506b7189bee", + "Content-Type" : "application/json" + }, + "json" : { + "vnfm-id" : "1e915311-1474-4ffb-8408-1183ddfcd1a8", + "vim-id" : "OCOMP", + "certificate-url" : "", + "esr-system-info-list" : { + "esr-system-info" : [ { + "esr-system-info-id" : "1e915311-1474-4ffb-8408-1183ddfcd1a8", + "system-name" : "OCOMP hwvnfmdriver", + "type" : "hwvnfmdriver", + "vendor" : "ocompvtpvendor", + "version" : "v1.0", + "service-url" : "http://159.138.8.8:30280", + "user-name" : "admin", + "password" : "password", + "system-type" : "vnfm", + "protocal" : "", + "ssl-cacert" : "", + "ssl-insecure" : "", + "ip-address" : "", + "port" : "", + "cloud-domain" : "", + "default-tenant" : "" + } ] + } + } + }, + "response" : { + "status" : 201, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-dublin-sample.yaml new file mode 100644 index 00000000..ec5bfc78 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: vnfm-create +version: onap-dublin +samples: + sample1: + name: vnfm-create + input: --format json --vendor ocompvtpvendor --username admin --vim-id OCOMP --name OCOMP hwvnfmdriver --url http://159.138.8.8:30280 --vnfm-id 1e915311-1474-4ffb-8408-1183ddfcd1a8 --password password --type hwvnfmdriver --vnfm-version v1.0 + moco: vnfm-create-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-dublin-moco.json new file mode 100644 index 00000000..ff7ddeab --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-dublin-moco.json @@ -0,0 +1,18 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/1e915311-1474-4ffb-8408-1183ddfcd1a8", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-a2be1777-ed4d-4cf7-8c66-d45df6baf742", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 204, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-dublin-sample.yaml new file mode 100644 index 00000000..23cefd78 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: vnfm-delete +version: onap-dublin +samples: + sample1: + name: vnfm-delete + input: --format json --vnfm-id 1e915311-1474-4ffb-8408-1183ddfcd1a8 --resource-version 1567068700278 + moco: vnfm-delete-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-dublin-moco.json new file mode 100644 index 00000000..881324f9 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-dublin-moco.json @@ -0,0 +1,25 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v13/external-system/esr-vnfm-list", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-f0d850a0-2028-404b-b7b3-6e4b306d77d9", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "esr-vnfm" : [ { + "vnfm-id" : "1e915311-1474-4ffb-8408-1183ddfcd1a8", + "vim-id" : "OCOMP", + "certificate-url" : "", + "resource-version" : "1567068700278" + } ] + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..a17cf21d --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: vnfm-list +version: onap-dublin +samples: + sample1: + name: vnfm-list + input: --format json + moco: vnfm-list-schema-dublin-moco.json + output: | + [{"certificate-url":"","resource-version":"1567068700278","vim-id":"OCOMP","vnfm-id":"1e915311-1474-4ffb-8408-1183ddfcd1a8"}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json index 6e679b4c..30569cd7 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json @@ -1,35 +1,35 @@ [ { "request" : { "method" : "put", - "uri" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-07", + "uri" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP", "headers" : { "Authorization" : "Basic QUFJOkFBSQ==", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", - "X-TransactionId" : "req-a0eb1dc2-626d-4b89-8c46-a6cb341d2810", + "X-TransactionId" : "req-0ebe379c-6ccd-4821-afaa-05e277ec3161", "Content-Type" : "application/json" }, "json" : { - "cloud-owner" : "CloudOwner", - "cloud-region-id" : "ONAP-POD-01-Rail-07", - "cloud-type" : "openstack", - "owner-defined-type" : "t1", - "cloud-region-version" : "titanium_cloud", - "complex-name" : "clli3", - "cloud-zone" : "CloudZone", + "cloud-owner" : "OCOMP", + "cloud-region-id" : "RegionOVP", + "cloud-type" : "OpenStack", + "owner-defined-type" : "ocomp", + "cloud-region-version" : "ocata", + "complex-name" : "ocomp-region", + "cloud-zone" : "az1", "sriov-automation" : "false", - "identity-url" : "url", - "cloud-extra-info" : "{\"openstack-region-id\":\"ONAP-POD-01-Rail-07\"}", + "identity-url" : "http://10.12.11.1:5000/v3", + "cloud-extra-info" : "{\"openstack-region-id\":\"RegionOVP\"}", "esr-system-info-list" : { "esr-system-info" : [ { - "esr-system-info-id" : "5c85ce1f-aa78-4ebf-8d6f-4b62773e9bce", + "esr-system-info-id" : "OCOMP", "service-url" : "http://10.12.11.1:5000/v3", - "user-name" : "cloud_username", - "password" : "cloud_password", + "user-name" : "admin", + "password" : "password", "system-type" : "VIM", "ssl-insecure" : "true", "cloud-domain" : "Default", - "default-tenant" : "Integration-HPA", + "default-tenant" : "ocomp", "system-status" : "active" } ] } @@ -39,4 +39,4 @@ "status" : 201, "json" : null } -} ] +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml index 9948815e..51e747c7 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml @@ -1,22 +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: cloud-create version: onap-dublin samples: sample1: name: cloud-create - input: -e 5c85ce1f-aa78-4ebf-8d6f-4b62773e9bce -b cloud_username -I {\"openstack-region-id\":\"ONAP-POD-01-Rail-07\"} -x CloudOwner -y ONAP-POD-01-Rail-07 -j cloud_password -w titanium_cloud -l Integration-HPA -url http://10.12.11.1:5000/v3 -n clli3 -q openstack -r t1 -Q VIM -i url -g CloudZone -z true -k active -c Default + input: --format json --username admin --complex-name ocomp-region --system-status active --ssl-insecure true --cloud-owner OCOMP --region-name RegionOVP --cloud-zone az1 --identity-url http://10.12.11.1:5000/v3 --system-type VIM --owner-type ocomp --cloud-domain Default --esr-id OCOMP --default-tenant ocomp --password password --service-url http://10.12.11.1:5000/v3 --cloud-type OpenStack --cloud-region-version ocata moco: cloud-create-schema-dublin-moco.json - output: + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-dublin-moco.json new file mode 100644 index 00000000..3d4c9222 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-dublin-moco.json @@ -0,0 +1,18 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-30772fbf-3733-4fa8-a041-7810f1e212f1", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 204, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-dublin-sample.yaml new file mode 100644 index 00000000..05f49306 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: cloud-delete +version: onap-dublin +samples: + sample1: + name: cloud-delete + input: --format json --resource-version 1567068896092 --region-name RegionOVP --cloud-name OCOMP + moco: cloud-delete-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-dublin-moco.json new file mode 100644 index 00000000..a956ad36 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-dublin-moco.json @@ -0,0 +1,63 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v13/cloud-infrastructure/cloud-regions", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-66435ecc-bdd6-41ad-8ffe-e00f7b18064a", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "cloud-region" : [ { + "cloud-owner" : "CloudOwner", + "cloud-region-id" : "RegionOne", + "cloud-type" : "SharedNode", + "owner-defined-type" : "OwnerType", + "cloud-region-version" : "v1", + "cloud-zone" : "CloudZone", + "resource-version" : "1564455111890", + "relationship-list" : { + "relationship" : [ { + "related-to" : "complex", + "relationship-label" : "org.onap.relationships.inventory.LocatedIn", + "related-link" : "/aai/v13/cloud-infrastructure/complexes/complex/clli2", + "relationship-data" : [ { + "relationship-key" : "complex.physical-location-id", + "relationship-value" : "clli2" + } ] + } ] + } + }, { + "cloud-owner" : "OCOMP", + "cloud-region-id" : "RegionOVP", + "cloud-type" : "OpenStack", + "owner-defined-type" : "ocomp", + "cloud-region-version" : "ocata", + "identity-url" : "http://10.12.11.1:5000/v3", + "cloud-zone" : "az1", + "complex-name" : "ocomp-region", + "sriov-automation" : "false", + "cloud-extra-info" : "{\"openstack-region-id\":\"RegionOVP\"}", + "resource-version" : "1567068896092" + }, { + "cloud-owner" : "OCOMP", + "cloud-region-id" : "ONAP-POD-01-Rail-05", + "cloud-type" : "OpenStack", + "owner-defined-type" : "ocomp", + "cloud-region-version" : "ocata", + "identity-url" : "http://10.12.11.1:5000/v3", + "cloud-zone" : "az1", + "complex-name" : "ocomp-cloud-complex", + "sriov-automation" : "false", + "cloud-extra-info" : "{\"openstack-region-id\":\"ONAP-POD-01-Rail-05\"}", + "resource-version" : "1566891032056" + } ] + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..69806c7e --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: cloud-list +version: onap-dublin +samples: + sample1: + name: cloud-list + input: --format json + moco: cloud-list-schema-dublin-moco.json + output: | + [{"cloud":"CloudOwner","resource-version":"1564455111890","region":"RegionOne"},{"cloud":"OCOMP","resource-version":"1567068896092","region":"RegionOVP"},{"cloud":"OCOMP","resource-version":"1566891032056","region":"ONAP-POD-01-Rail-05"}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-moco.json index 33d6378d..5f27706e 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-moco.json +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-moco.json @@ -1,20 +1,20 @@ [ { "request" : { "method" : "put", - "uri" : "/aai/v14//aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-07/relationship-list/relationship", + "uri" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP/relationship-list/relationship", "headers" : { "Authorization" : "Basic QUFJOkFBSQ==", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", - "X-TransactionId" : "req-743a8d74-cb83-458b-ace3-05b10a169c0f", + "X-TransactionId" : "req-49188d12-6a2d-4e85-90db-c004e4d542b5", "Content-Type" : "application/json" }, "json" : { "related-to" : "complex", - "related-link" : "/aai/v11/cloud-infrastructure/complexes/complex/clli3", + "related-link" : "/aai/v11/cloud-infrastructure/complexes/complex/ocomp-region", "relationship-data" : [ { "relationship-key" : "complex.physical-location-id", - "relationship-value" : "clli3" + "relationship-value" : "ocomp-region" } ] } }, diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-sample.yaml index d8f02401..7041668a 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-associate-schema-dublin-sample.yaml @@ -1,22 +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-associate - version: onap-dublin - samples: - sample1: - name: complex-associate - input: -x clli3 -y ONAP-POD-01-Rail-07 -z CloudOwner - moco: complex-associate-schema-dublin-moco.json - output:
\ No newline at end of file +open_cli_sample_version: 1.0 +name: complex-associate +version: onap-dublin +samples: + sample1: + name: complex-associate + input: --format json --cloud-region RegionOVP --cloud-owner OCOMP --complex-name ocomp-region + moco: complex-associate-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-moco.json index 350a02e0..3b4a94f5 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-moco.json +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-moco.json @@ -1,31 +1,31 @@ [ { "request" : { "method" : "put", - "uri" : "/aai/v14//aai/v14/cloud-infrastructure/complexes/complex/clli3", + "uri" : "/aai/v14/cloud-infrastructure/complexes/complex/ocomp-region", "headers" : { "Authorization" : "Basic QUFJOkFBSQ==", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", - "X-TransactionId" : "req-f84bd111-614f-4f6e-9bea-f076a8b63810", + "X-TransactionId" : "req-230ff595-12b3-480a-86c4-f5e3b1f8d5b0", "Content-Type" : "application/json" }, "json" : { - "physical-location-id" : "clli3", - "data-center-code" : "code6", - "complex-name" : "clli3", - "identity-url" : "url", + "physical-location-id" : "ocomp-region", + "data-center-code" : "ocomp", + "complex-name" : "ocomp-region", + "identity-url" : "http://10.12.11.1:5000/v3", "physical-location-type" : "phy_type", - "street1" : "street1", - "street2" : "street2", - "city" : "HIlls", - "state" : "CA", - "postal-code" : "88888", - "country" : "usa", - "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" } }, "response" : { diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-sample.yaml index 044d5f6f..c748579b 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-create-schema-dublin-sample.yaml @@ -1,22 +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-create - version: onap-dublin - samples: - sample1: - name: complex-create - input: -j street2 -r phy_type -x clli3 -y code6 -lt 10.2 -l region_val -i street1 -lo 30.8 -S CA -la lata -g HIlls -w 88888 -z clli3 -k usa -o elev -q url - moco: complex-create-schema-dublin-moco.json - output:
\ No newline at end of file +open_cli_sample_version: 1.0 +name: complex-create +version: onap-dublin +samples: + sample1: + name: complex-create + input: --format json --city ocomp-city --data-center-code ocomp --street1 ocomp-street1 --street2 ocomp-street2 --physical-location-id ocomp-region --identity-url http://10.12.11.1:5000/v3 --lata ocomp-lata --elevation ocomp-elelation --state ocomp-state --physical-location-type phy_type --longitude 1.0 --country abc --latitude 1.0 --complex-name ocomp-region --postal-code 001481 --region onap + moco: complex-create-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-moco.json index f8b238b3..ccf4446e 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-moco.json +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-moco.json @@ -1,12 +1,12 @@ [ { "request" : { "method" : "delete", - "uri" : "/aai/v14//aai/v14/cloud-infrastructure/complexes/complex/clli3", + "uri" : "/aai/v14/cloud-infrastructure/complexes/complex/ocomp-region", "headers" : { "Authorization" : "Basic QUFJOkFBSQ==", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", - "X-TransactionId" : "req-26090fb4-0d07-4272-bced-b14574420451", + "X-TransactionId" : "req-b1e0cf51-157c-40f5-a966-157ba2c88655", "Content-Type" : "application/json" }, "json" : null diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-sample.yaml index 7ba3c306..516d27c3 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-delete-schema-dublin-sample.yaml @@ -1,22 +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-delete - version: onap-dublin - samples: - sample1: - name: complex-delete - input: -x clli3 -y 1550771530582 - moco: complex-delete-schema-dublin-moco.json - output:
\ No newline at end of file +open_cli_sample_version: 1.0 +name: complex-delete +version: onap-dublin +samples: + sample1: + name: complex-delete + input: --format json --complex-name ocomp-region --resource-version 1567068618154 + moco: complex-delete-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-disassociate-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-disassociate-schema-dublin-moco.json new file mode 100644 index 00000000..5f102ff1 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-disassociate-schema-dublin-moco.json @@ -0,0 +1,25 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP/relationship-list/relationship", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-26265a69-7c6c-4315-bddb-0e9548880b15", + "Content-Type" : "application/json" + }, + "json" : { + "related-to" : "complex", + "related-link" : "/aai/v11/cloud-infrastructure/complexes/complex/ocomp-region", + "relationship-data" : [ { + "relationship-key" : "complex.physical-location-id", + "relationship-value" : "ocomp-region" + } ] + } + }, + "response" : { + "status" : 204, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-disassociate-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-disassociate-schema-dublin-sample.yaml new file mode 100644 index 00000000..3bb86584 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/complex/complex-disassociate-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: complex-disassociate +version: onap-dublin +samples: + sample1: + name: complex-disassociate + input: --format json --complex-name ocomp-region --cloud-owner OCOMP --cloud-region RegionOVP + moco: complex-disassociate-schema-dublin-moco.json + output: | + [{}] 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"}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-dublin-moco.json new file mode 100644 index 00000000..f8cb2c8b --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-dublin-moco.json @@ -0,0 +1,21 @@ +[ { + "request" : { + "method" : "put", + "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP/tenants/tenant/6fcac72c-a2cd-4d18-9f1d-09908ca08afe", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-300c4e32-4fb2-4fe8-b238-e3cb13c2a9d1", + "Content-Type" : "application/json" + }, + "json" : { + "tenant-id" : "6fcac72c-a2cd-4d18-9f1d-09908ca08afe", + "tenant-name" : "ocomp" + } + }, + "response" : { + "status" : 201, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-dublin-sample.yaml new file mode 100644 index 00000000..7e1c543e --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: tenant-create +version: onap-dublin +samples: + sample1: + name: tenant-create + input: --format json --region RegionOVP --tenant-id 6fcac72c-a2cd-4d18-9f1d-09908ca08afe --cloud OCOMP --tenant-name ocomp + moco: tenant-create-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-dublin-moco.json new file mode 100644 index 00000000..417976f5 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-dublin-moco.json @@ -0,0 +1,18 @@ +[ { + "request" : { + "method" : "delete", + "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP/tenants/tenant/6fcac72c-a2cd-4d18-9f1d-09908ca08afe", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-22a79b24-0ed5-475c-9c5e-fed1d4461bb3", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 204, + "json" : null + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-dublin-sample.yaml new file mode 100644 index 00000000..1a21b00e --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: tenant-delete +version: onap-dublin +samples: + sample1: + name: tenant-delete + input: --format json --region RegionOVP --resource-version 1567068676263 --cloud OCOMP --tenant-id 6fcac72c-a2cd-4d18-9f1d-09908ca08afe + moco: tenant-delete-schema-dublin-moco.json + output: | + [{}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-dublin-moco.json new file mode 100644 index 00000000..ea056231 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-dublin-moco.json @@ -0,0 +1,24 @@ +[ { + "request" : { + "method" : "get", + "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP/tenants", + "headers" : { + "Authorization" : "Basic QUFJOkFBSQ==", + "X-FromAppId" : "ONAP CLI", + "Accept" : "application/json", + "X-TransactionId" : "req-be21d4e6-6e82-4a13-a1fb-0a2c6766e3e4", + "Content-Type" : "application/json" + }, + "json" : null + }, + "response" : { + "status" : 200, + "json" : { + "tenant" : [ { + "tenant-id" : "6fcac72c-a2cd-4d18-9f1d-09908ca08afe", + "tenant-name" : "ocomp", + "resource-version" : "1567068676263" + } ] + } + } +} ]
\ No newline at end of file diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-dublin-sample.yaml new file mode 100644 index 00000000..c264bd0c --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-dublin-sample.yaml @@ -0,0 +1,10 @@ +open_cli_sample_version: 1.0 +name: tenant-list +version: onap-dublin +samples: + sample1: + name: tenant-list + input: --format json --region RegionOVP --cloud OCOMP + moco: tenant-list-schema-dublin-moco.json + output: | + [{"resource-version":"1567068676263","tenant-id":"6fcac72c-a2cd-4d18-9f1d-09908ca08afe","tenant-name":"ocomp"}] diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml index ad56e529..d57a1b2b 100644 --- a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml @@ -41,7 +41,7 @@ parameters: short_option: q long_option: cloud-type is_optional: false - - name: owner-defined-type + - name: owner-type description: owner defined type type: string short_option: r @@ -77,14 +77,14 @@ parameters: short_option: S long_option: sriov-automation is_optional: true - default: false + default_value: false - name: identity-url description: Onap identity-url, updated by multicloud if multicloud is used type: string short_option: i long_option: identity-url is_optional: false - - name: esr-system-info-id + - name: esr-id description: id for esr system (arbitrary UUID e.g 5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc8) type: uuid short_option: e @@ -96,11 +96,11 @@ parameters: short_option: url long_option: service-url is_optional: false - - name: user-name + - name: username description: cloud user name type: string short_option: b - long_option: user-name + long_option: username is_optional: false - name: password description: cloud password @@ -138,12 +138,6 @@ parameters: short_option: k long_option: system-status is_optional: false - - name: cloud-extra-info - description: extra info to register cloud , generally string with region id e.g {\"openstack-region-id\":\"region-id\"}, enter as {\\"openstack-region-id\\":\\"ONAP-POD-01-Rail-07\\"} with CLI - type: string - short_option: I - long_option: extra-info - is_optional: false http: service: @@ -156,19 +150,19 @@ http: "cloud-owner": "${cloud-owner}", "cloud-region-id": "${region-name}", "cloud-type": "${cloud-type}", - "owner-defined-type": "${owner-defined-type}", + "owner-defined-type": "${owner-type}", "cloud-region-version": "${cloud-region-version}", "complex-name":"${complex-name}", "cloud-zone": "${cloud-zone}", "sriov-automation": "${sriov-automation}", "identity-url": "${identity-url}", - "cloud-extra-info":"${cloud-extra-info}", + "cloud-extra-info":"{\"openstack-region-id\":\"${region-name}\"}", "esr-system-info-list": { "esr-system-info":[ { - "esr-system-info-id":"${esr-system-info-id}", + "esr-system-info-id":"${esr-id}", "service-url": "${service-url}", - "user-name":"${user-name}", + "user-name":"${username}", "password":"${password}", "system-type": "${system-type}", "ssl-insecure": "${ssl-insecure}", diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-disassociate-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-disassociate-schema-dublin.yaml new file mode 100644 index 00000000..39480c00 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/complex/complex-disassociate-schema-dublin.yaml @@ -0,0 +1,63 @@ +# 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: complex-disassociate +description: Disassociate a cloud region with a cloud complex + +info: + product: onap-dublin + service: aai + author: Intel ONAP HPA integration team (itohan.ukponmwan@intel.com) + +parameters: + - name: complex-name + description: name of cloud complex + type: string + short_option: x + long_option: complex-name + is_optional: false + - name: cloud-region + description: name of registered cloud-region + type: string + short_option: y + long_option: cloud-region + is_optional: false + - name: cloud-owner + description: name of cloud-owner + type: string + short_option: z + long_option: cloud-owner + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v14/cloud-infrastructure/cloud-regions/cloud-region/${cloud-owner}/${cloud-region}/relationship-list/relationship + method: DELETE + body: '{ + "related-to": "complex", + "related-link": "/aai/v11/cloud-infrastructure/complexes/complex/${complex-name}", + "relationship-data": [ + { + "relationship-key": "complex.physical-location-id", + "relationship-value": "${complex-name}" + }] + }' + success_codes: + - 200 + - 204 + - 404 |