diff options
50 files changed, 1525 insertions, 56 deletions
@@ -1,21 +1,8 @@ -# 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. - --- project: 'cli' project_creation_date: '2017-06-22' lifecycle_state: 'Incubation' +project_category: '' project_lead: &onap_releng_ptl name: 'Kanagaraj Manickam' email: 'kanagaraj.manickam@huawei.com' @@ -27,25 +14,32 @@ issue_tracking: type: 'jira' url: 'https://jira.onap.org/projects/CLI' key: 'CLI' +mailing_list: + type: 'groups.io' + url: 'lists.onap.org' + tag: '<[sub-project_name]>' +realtime_discussion: '' meetings: - type: 'zoom' - agenda: 'https://wiki.onap.org/display/DW/CLI+meetings' - url: 'https://wiki.onap.org/display/DW/CLI+meetings' - server: 'n/a' - channel: 'n/a' - repeats: 'weekly' - time: '13:00 UTC' + agenda: 'https://wiki.onap.org/display/DW/CLI+meetings' + url: 'https://wiki.onap.org/display/DW/CLI+meetings' + server: 'n/a' + channel: 'n/a' + repeats: 'weekly' + time: '13:00 UTC' +repositories: + - 'cli' committers: - <<: *onap_releng_ptl - name: 'Subhash Kumar' - email: 'subhash.kumar.singh@huawei.com' - company: 'Huawei' - id: 'subhash_singh' - timezone: 'India/Bangalore' + email: 'subhash.kumar.singh@huawei.com' + company: 'Huawei' + id: 'subhash_singh' + timezone: 'India/Bangalore' - name: 'Manoop Talasila' - email: 'talasila@research.att.com' - company: 'ATT' - id: 'talasila' - timezone: 'America/New York' + email: 'talasila@research.att.com' + company: 'ATT' + id: 'talasila' + timezone: 'America/New York' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' diff --git a/deployment/docker/pom.xml b/deployment/docker/pom.xml index 89868f41..e9bc3b70 100644 --- a/deployment/docker/pom.xml +++ b/deployment/docker/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-deployment</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-docker</artifactId> diff --git a/deployment/pom.xml b/deployment/pom.xml index 22f0e16e..46c6f5a4 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-deployment</artifactId> diff --git a/deployment/zip/pom.xml b/deployment/zip/pom.xml index 00a92f86..f9b244c7 100644 --- a/deployment/zip/pom.xml +++ b/deployment/zip/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-deployment</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-zip</artifactId> diff --git a/framework/pom.xml b/framework/pom.xml index 88b727b4..36a87d61 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-framework</artifactId> diff --git a/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java b/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java index 8cbfa36c..010cdc19 100644 --- a/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java +++ b/framework/src/main/java/org/onap/cli/fw/cmd/product/OnapServiceListCommand.java @@ -72,7 +72,7 @@ public class OnapServiceListCommand extends OnapCommand { } } - for (String service : rslt.get(product)) { + for (String service : rslt.getOrDefault(product, new HashSet<String>())) { this.getResult().getRecordsMap().get("service").getValues().add(service); this.getResult().getRecordsMap().get("description").getValues().add( serviceDescs.containsKey(service) ? serviceDescs.get(service) : ""); diff --git a/grpc/grpc-server/pom.xml b/grpc/grpc-server/pom.xml index db164ba7..e4d1a288 100644 --- a/grpc/grpc-server/pom.xml +++ b/grpc/grpc-server/pom.xml @@ -32,7 +32,7 @@ <dependency> <groupId>org.onap.cli</groupId> <artifactId>cli-main</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </dependency> </dependencies> <build> diff --git a/grpc/pom.xml b/grpc/pom.xml index 8bdbcc16..4924ac72 100644 --- a/grpc/pom.xml +++ b/grpc/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <version>1.0.3</version> <artifactId>oclip-grpc</artifactId> diff --git a/main/pom.xml b/main/pom.xml index f664bf17..466df77a 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-main</artifactId> @@ -25,7 +25,7 @@ <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> <packaging>pom</packaging> <name>cli</name> diff --git a/products/onap-casablanca/auth/pom.xml b/products/onap-casablanca/auth/pom.xml index a9196aef..860d0fd1 100644 --- a/products/onap-casablanca/auth/pom.xml +++ b/products/onap-casablanca/auth/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products-onap-casablanca</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca-auth</artifactId> diff --git a/products/onap-casablanca/catalog/pom.xml b/products/onap-casablanca/catalog/pom.xml index dbbb5965..573a0757 100644 --- a/products/onap-casablanca/catalog/pom.xml +++ b/products/onap-casablanca/catalog/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products-onap-casablanca</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca-catalog</artifactId> diff --git a/products/onap-casablanca/features/aai/pom.xml b/products/onap-casablanca/features/aai/pom.xml index c0bc4951..5efb84c8 100644 --- a/products/onap-casablanca/features/aai/pom.xml +++ b/products/onap-casablanca/features/aai/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products-onap-casablanca-features</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca-features-aai</artifactId> diff --git a/products/onap-casablanca/features/msb/pom.xml b/products/onap-casablanca/features/msb/pom.xml index b3cdf1c6..bc7f3ebf 100644 --- a/products/onap-casablanca/features/msb/pom.xml +++ b/products/onap-casablanca/features/msb/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products-onap-casablanca-features</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca-features-msb</artifactId> diff --git a/products/onap-casablanca/features/pom.xml b/products/onap-casablanca/features/pom.xml index 917851b9..e8e35b6d 100644 --- a/products/onap-casablanca/features/pom.xml +++ b/products/onap-casablanca/features/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products-onap-casablanca</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca-features</artifactId> diff --git a/products/onap-casablanca/features/sdc/pom.xml b/products/onap-casablanca/features/sdc/pom.xml index eecdad7d..2e05adcc 100644 --- a/products/onap-casablanca/features/sdc/pom.xml +++ b/products/onap-casablanca/features/sdc/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products-onap-casablanca-features</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca-features-sdc</artifactId> diff --git a/products/onap-casablanca/features/vnfsdk/pom.xml b/products/onap-casablanca/features/vnfsdk/pom.xml index 22cb74ae..eb85afb6 100644 --- a/products/onap-casablanca/features/vnfsdk/pom.xml +++ b/products/onap-casablanca/features/vnfsdk/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products-onap-casablanca-features</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca-features-vnfsdk</artifactId> diff --git a/products/onap-casablanca/pom.xml b/products/onap-casablanca/pom.xml index fba2a9ca..ef75c8e6 100644 --- a/products/onap-casablanca/pom.xml +++ b/products/onap-casablanca/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-onap-casablanca</artifactId> diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-dublin.yaml new file mode 100644 index 00000000..19f144d2 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-dublin.yaml @@ -0,0 +1,70 @@ +# 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: subscription-create +description: Create a subscription of a customer for given service in specific cloud region in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + - name: cloud-name + description: Onap cloud name + type: string + short_option: z + long_option: cloud-name + is_optional: true + - name: cloud-region + description: Onap cloud region + type: string + short_option: r + long_option: cloud-region + is_optional: true + - name: cloud-tenant-id + description: Onap cloud tenant id + type: string + short_option: c + long_option: cloud-tenant-id + is_optional: true + - name: service-type + description: Onap service type + type: string + short_option: e + long_option: service-type + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type} + method: PUT + context: + remove_empty_node: true + body: '{"service-type":"${service-type}"}' + success_codes: + - 200 + - 201 + sample_response: + body: '' diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-delete-schema-dublin.yaml new file mode 100644 index 00000000..7db30b6c --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-delete-schema-dublin.yaml @@ -0,0 +1,55 @@ +# 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: subscription-delete +description: Delete the subscription for a given customer in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + - name: service-type + description: Onap subscribtion id + type: string + short_option: y + long_option: service-type + is_optional: false + - name: resource-version + description: Onap subscription resource version + type: string + short_option: g + long_option: resource-version + is_optional: true +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}?resource-version=${resource-version} + method: DELETE + success_codes: + - 204 + - 404 + + + diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-list-schema-dublin.yaml new file mode 100644 index 00000000..de54bc58 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-list-schema-dublin.yaml @@ -0,0 +1,77 @@ +# 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: subscription-list +description: Lists the subscription for a given customer in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: customer-name + description: Onap customer name + type: string + short_option: x + long_option: customer-name + is_optional: false + +results: + direction: landscape + attributes: + - name: service-type + description: Onap service type + scope: short + type: string + - name: resource-version + description: Onap subscription resource version + scope: short + type: string + - name: tenant + description: Onap tenant name + scope: long + type: string + - name: region + description: Onap region name + scope: long + type: string + - name: cloud + description: Onap cloud name + scope: long + type: string +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/business/customers/customer/${customer-name}/service-subscriptions + method: GET + success_codes: + - 200 + - 404 + result_map: + service-type: $b{$.service-subscription.[*].service-type} + resource-version: $b{$.service-subscription.[*].resource-version} + tenant: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'tenant.tenant-id')].relationship-value} + region: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'cloud-region.cloud-region-id')].relationship-value} + cloud: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'cloud-region.cloud-owner')].relationship-value} + + sample_response: + body: '{"service-subscription":[{"service-type":"vTest","resource-version":"1504091375183","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/26ab7af6-96cc-4c4e-814a-e533af4ef9f6","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"att-aic"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"AAIAIC25"},{"relationship-key":"tenant.tenant-id","relationship-value":"26ab7af6-96cc-4c4e-814a-e533af4ef9f6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"test"}]}]}}]}' + + + + diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-dublin.yaml new file mode 100644 index 00000000..4f1d8d59 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-dublin.yaml @@ -0,0 +1,92 @@ +# 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: ems-create + +description: Register a EMS in Onap + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: ems-id + description: Onap EMS unique id + type: uuid + short_option: z + long_option: ems-id + is_optional: false + - name: name + description: Onap EMS name + type: string + short_option: b + long_option: name + is_optional: false + - name: type + description: Onap EMS type + type: string + short_option: c + long_option: type + is_optional: false + - name: vendor + description: Onap EMS vendor + type: string + short_option: e + long_option: vendor + is_optional: false + - name: ems-version + description: Onap EMS version + type: string + short_option: q + long_option: ems-version + is_optional: false + - name: url + description: Onap EMS URL + type: string + short_option: g + long_option: url + is_optional: false + - name: username + description: Onap EMS username + type: string + short_option: i + long_option: username + is_optional: false + - name: password + description: Onap EMS password + type: string + short_option: j + long_option: password + is_optional: false + - name: remote-path + description: Onap EMS remote-path + type: string + short_option: x + long_option: remote-path + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-ems-list/esr-ems/${ems-id} + method: PUT + body: '{"ems-id":"${ems-id}","passive":true,"remote-path":"${remote-path}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${ems-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${ems-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"ems","protocal":"","ssl-cacert":"","ssl-insecure":"","ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}' + success_codes: + - 201 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-dublin.yaml new file mode 100644 index 00000000..8e1cec8e --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-dublin.yaml @@ -0,0 +1,50 @@ +# 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: ems-delete + +description: Un-register a EMS in Onap + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: ems-id + description: Onap EMS unique id + type: uuid + short_option: x + long_option: ems-id + is_optional: false + - name: resource-version + description: Onap EMS resource version + type: string + short_option: y + long_option: resource-version + is_optional: true +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-ems-list/esr-ems/${ems-id}?resource-version=${resource-version} + method: DELETE + + success_codes: + - 204 + - 404 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-dublin.yaml new file mode 100644 index 00000000..5e256e03 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-dublin.yaml @@ -0,0 +1,49 @@ +# 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: ems-list + +description: List the configured ems + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: landscape + attributes: + - name: ems-id + description: Onap ems id + scope: short + type: string + - name: resource-version + description: Onap ems resource version + scope: short + type: string + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-ems-list + method: GET + success_codes: + - 200 + result_map: + ems-id: $b{$.esr-ems.[*].ems-id} + resource-version: $b{$.esr-ems.[*].resource-version} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-dublin.yaml new file mode 100644 index 00000000..b6d03ebe --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-dublin.yaml @@ -0,0 +1,78 @@ +# 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: ems-show + +description: Show the details of configured ems + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: ems-id + description: Onap EMS unique id + type: uuid + short_option: x + long_option: ems-id + is_optional: false + +results: + direction: landscape + attributes: + - name: name + description: Onap ems name + scope: short + type: string + - name: type + description: Onap ems type + scope: short + type: string + - name: vendor + description: Onap ems vendor + scope: short + type: string + - name: version + description: Onap ems version + scope: short + type: string + - name: url + description: Onap ems url + scope: short + type: string + - name: username + description: Onap ems username + scope: long + type: string + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-ems-list/esr-ems/${ems-id}/esr-system-info-list/esr-system-info/${ems-id} + method: GET + success_codes: + - 200 + result_map: + name: $b{$.system-name} + type: $b{$.type} + vendor: $b{$.vendor} + version: $b{$.version} + url: $b{$.service-url} + username: $b{$.user-name} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-dublin.yaml new file mode 100644 index 00000000..c925e9d8 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-dublin.yaml @@ -0,0 +1,122 @@ +# 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: vim-create +description: Register a VIM under a given cloud region in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud-name + description: Onap cloud name + type: string + short_option: x + long_option: cloud-name + is_optional: false + - name: region-name + description: Onap region name + type: string + short_option: y + long_option: region-name + is_optional: false + - name: vim-id + description: Onap VIM unique id + type: uuid + short_option: z + long_option: vim-id + is_optional: false + - name: name + description: Onap VIM name + type: string + short_option: b + long_option: name + is_optional: false + - name: type + description: Onap VIM type + type: string + short_option: c + long_option: type + is_optional: false + - name: vendor + description: Onap VIM vendor + type: string + short_option: e + long_option: vendor + is_optional: false + - name: vim-version + description: Onap VIM version + type: string + short_option: q + long_option: vim-version + is_optional: false + - name: url + description: Onap VIM URL + type: string + short_option: g + long_option: url + is_optional: false + - name: username + description: Onap VIM username + type: string + short_option: i + long_option: username + is_optional: false + - name: password + description: Onap VIM password + type: string + short_option: j + long_option: password + is_optional: false + - name: ssl-cacert + description: Onap VIM SSL certificate + type: text + short_option: k + long_option: ssl-cacert + is_optional: true + - name: ssl-insecure + description: Onap VIM insecure + type: bool + short_option: l + long_option: ssl-insecure + is_optional: true + default: false + - name: cloud-domain + description: Onap VIM cloud domain + type: string + short_option: n + long_option: cloud-domain + is_optional: false + default: default + - name: default-tenant + description: Onap VIM default tenant + type: string + short_option: o + long_option: default-tenant + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id} + method: PUT + body: '{"esr-system-info-id":"${vim-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${vim-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"vim","protocal":"","ssl-cacert":"${ssl-cacert}","ssl-insecure":"${ssl-insecure}","ip-address":"","port":"","cloud-domain":"${cloud-domain}","default-tenant":"${default-tenant}"}' + success_codes: + - 201 + diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-dublin.yaml new file mode 100644 index 00000000..d5b76a1e --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-dublin.yaml @@ -0,0 +1,66 @@ +# 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: vim-delete + +description: Un-register a VIM under from cloud region in Onap + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud-name + description: Onap cloud name + type: string + short_option: x + long_option: cloud-name + is_optional: false + - name: region-name + description: Onap region name + type: string + short_option: y + long_option: region-name + is_optional: false + - name: vim-id + description: Onap VIM unique id + type: uuid + short_option: z + long_option: vim-id + is_optional: false + - name: resource-version + description: Onap vim resource version + type: string + short_option: b + long_option: resource-version + is_optional: true + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id}?resource-version=${resource-version} + method: DELETE + + success_codes: + - 204 + - 404 + + sample_response: + body: '' diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-dublin.yaml new file mode 100644 index 00000000..9ac1cf91 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-dublin.yaml @@ -0,0 +1,104 @@ +# 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: vim-list + +description: List the configured vims + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud-name + description: Onap cloud name + type: string + short_option: x + long_option: cloud-name + is_optional: false + - name: region-name + description: Onap region name + type: string + short_option: y + long_option: region-name + is_optional: false + +results: + direction: landscape + attributes: + - name: vim-id + description: Onap vim id + scope: short + type: string + - name: name + description: Onap vim name + scope: short + type: string + - name: type + description: Onap vim type + scope: long + type: string + - name: vendor + description: Onap vim vendor + scope: short + type: string + - name: version + description: Onap vim version + scope: long + type: string + - name: url + description: Onap vim url + scope: long + type: string + - name: username + description: Onap vim username + scope: long + type: string + - name: cloud-domain + description: Onap vim cloud domain + scope: long + type: string + - name: default-tenant + description: Onap vim tenant + scope: short + type: string + - name: resource-version + description: Onap vim resource version + scope: short + type: string + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list + method: GET + success_codes: + - 200 + result_map: + vim-id: $b{$.esr-system-info.[*].esr-system-info-id} + name: $b{$.esr-system-info.[*].system-name} + type: $b{$.esr-system-info.[*].type} + vendor: $b{$.esr-system-info.[*].vendor} + version: $b{$.esr-system-info.[*].version} + url: $b{$.esr-system-info.[*].service-url} + username: $b{$.esr-system-info.[*].user-name} + cloud-domain: $b{$.esr-system-info.[*].cloud-domain} + default-tenant: $b{$.esr-system-info.[*].default-tenant} + resource-version: $b{$.esr-system-info.[*].resource-version} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-dublin.yaml new file mode 100644 index 00000000..772062ec --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-dublin.yaml @@ -0,0 +1,98 @@ +# 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: vnfm-create + +description: Register a VNFM in Onap + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vim-id + description: Onap VIM unique id + type: uuid + short_option: x + long_option: vim-id + is_optional: false + - name: vnfm-id + description: Onap VNFM unique id + type: uuid + short_option: y + long_option: vnfm-id + is_optional: false + - name: name + description: Onap VNFM name + type: string + short_option: b + long_option: name + is_optional: false + - name: type + description: Onap VNFM type + type: string + short_option: c + long_option: type + is_optional: false + - name: vendor + description: Onap VNFM vendor + type: string + short_option: e + long_option: vendor + is_optional: false + - name: vnfm-version + description: Onap VNFM version + type: string + short_option: q + long_option: vnfm-version + is_optional: false + - name: url + description: Onap VNFM URL + type: string + short_option: g + long_option: url + is_optional: false + - name: username + description: Onap VNFM username + type: string + short_option: i + long_option: username + is_optional: false + - name: password + description: Onap VNFM password + type: string + short_option: j + long_option: password + is_optional: false + - name: certificate-url + description: Onap VNFM certificate-url + type: string + short_option: z + long_option: certificate-url + is_optional: true + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id} + method: PUT + body: '{"vnfm-id":"${vnfm-id}","vim-id":"${vim-id}","certificate-url":"${certificate-url}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${vnfm-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${vnfm-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"vnfm","protocal":"","ssl-cacert":"","ssl-insecure":"","ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}' + success_codes: + - 201 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-dublin.yaml new file mode 100644 index 00000000..8e9e2afa --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-dublin.yaml @@ -0,0 +1,50 @@ +# 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: vnfm-delete + +description: Un-register a VNFM in Onap + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vnfm-id + description: Onap VNFM unique id + type: uuid + short_option: x + long_option: vnfm-id + is_optional: false + - name: resource-version + description: Onap vim resource version + type: string + short_option: y + long_option: resource-version + is_optional: true +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}?resource-version=${resource-version} + method: DELETE + + success_codes: + - 204 + - 404 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-dublin.yaml new file mode 100644 index 00000000..05cd3b29 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-dublin.yaml @@ -0,0 +1,60 @@ +# 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: vnfm-list + +description: List the configured vnfm + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: landscape + attributes: + - name: vnfm-id + description: Onap vnfm id + scope: short + type: string + - name: vim-id + description: Onap vnfm id + scope: short + type: string + - name: certificate-url + description: Onap vnfm certificate-url + scope: short + type: string + - name: resource-version + description: Onap vnfm resource version + scope: short + type: string + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-vnfm-list + method: GET + success_codes: + - 200 + result_map: + vnfm-id: $b{$.esr-vnfm.[*].vnfm-id} + vim-id: $b{$.esr-vnfm.[*].vim-id} + certificate-url: $b{$.esr-vnfm.[*].certificate-url} + resource-version: $b{$.esr-vnfm.[*].resource-version} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-dublin.yaml new file mode 100644 index 00000000..0ae7a946 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-dublin.yaml @@ -0,0 +1,79 @@ +# 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: vnfm-show + +description: Show the VNFM in Onap + + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: vnfm-id + description: Onap VNFM unique id + type: uuid + short_option: x + long_option: vnfm-id + is_optional: false + +results: + direction: portrait + attributes: + - name: name + description: Onap vnfm name + scope: short + type: string + - name: type + description: Onap vnfm type + scope: short + type: string + - name: vendor + description: Onap vnfm vendor + scope: short + type: string + - name: version + description: Onap vnfm version + scope: short + type: string + - name: url + description: Onap vnfm url + scope: short + type: string + - name: username + description: Onap vnfm username + scope: long + type: string + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}/esr-system-info-list/esr-system-info/${vnfm-id} + method: GET + + success_codes: + - 200 + result_map: + name: $b{$.system-name} + type: $b{$.type} + vendor: $b{$.vendor} + version: $b{$.version} + url: $b{$.service-url} + username: $b{$.user-name} 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 new file mode 100644 index 00000000..f46bebde --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml @@ -0,0 +1,48 @@ +# 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: cloud-create +description: Create a cloud region in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + + +parameters: + - name: cloud-name + description: Onap cloud name + type: string + short_option: x + long_option: cloud-name + is_optional: false + - name: region-name + description: Onap region name + type: string + short_option: y + long_option: region-name + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name} + method: PUT + body: '{"sriov-automation": false, "cloud-region-id": "${region-name}", "cloud-owner": "${cloud-name}", "new-attribute-for-demo": "blah", "number-attribute-for-demo": 1 }' + success_codes: + - 201 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-delete-schema-dublin.yaml new file mode 100644 index 00000000..25822a84 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-delete-schema-dublin.yaml @@ -0,0 +1,52 @@ +# 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: cloud-delete +description: Delete a cloud region from Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud-name + description: Onap cloud name + type: string + short_option: x + long_option: cloud-name + is_optional: false + - name: region-name + description: Onap cloud region name + type: string + short_option: y + long_option: region-name + is_optional: false + - name: resource-version + description: Onap cloud region version + type: uuid + short_option: z + long_option: resource-version + is_optional: true +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}?resource-version=${resource-version} + method: DELETE + success_codes: + - 204 + - 404 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-list-schema-dublin.yaml new file mode 100644 index 00000000..deb2d48a --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-list-schema-dublin.yaml @@ -0,0 +1,71 @@ +# 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: cloud-list +description: List the configured clouds and Onap service subscriptions + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: landscape + attributes: + - name: cloud + description: Onap cloud + scope: short + type: string + - name: region + description: Onap cloud region + scope: short + type: string + - name: tenant + description: Onap cloud tenat + scope: long + type: string + - name: tenant-id + description: Onap cloud tenat id + scope: long + type: string + - name: customer + description: Onap cloud customer + scope: long + type: string + - name: service + description: Onap cloud service + scope: long + type: string + - name: resource-version + description: Onap cloud resource version + scope: short + type: string +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions + method: GET + success_codes: + - 200 + result_map: + cloud: $b{cloud-region.[*].cloud-owner} + region: $b{cloud-region.[*].cloud-region-id} + resource-version: $b{cloud-region.[*].resource-version} + tenant: $b{cloud-region.[*].tenants.tenant.[*].tenant-name} + tenant-id: $b{cloud-region.[*].tenants.tenant.[*].tenant-id} + customer: $b{cloud-region.[*].tenants.tenant.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'customer.global-customer-id')].relationship-value} + service: $b{cloud-region.[*].tenants.tenant.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'service-subscription.service-type')].relationship-value} diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-create-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-create-schema-dublin.yaml new file mode 100644 index 00000000..914d248e --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-create-schema-dublin.yaml @@ -0,0 +1,60 @@ +# 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: tenant-create +description: Create a tenant under given cloud region in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud + description: Onap cloud + type: string + short_option: x + long_option: cloud + is_optional: false + - name: region + description: Onap cloud region + type: string + short_option: y + long_option: region + is_optional: false + - name: tenant-id + description: Onap cloud tenant id + type: uuid + short_option: z + long_option: tenant-id + is_optional: false + - name: tenant-name + description: Onap cloud tenant name + type: string + short_option: r + long_option: tenant-name + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id} + method: PUT + body: '{"tenant-id": "${tenant-id}", "tenant-name": "${tenant-name}"}' + success_codes: + - 200 + - 201 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-delete-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-delete-schema-dublin.yaml new file mode 100644 index 00000000..e77d13fc --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-delete-schema-dublin.yaml @@ -0,0 +1,59 @@ +# 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: tenant-delete +description: Delete tenant under given cloud region in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud + description: Onap cloud + type: string + short_option: x + long_option: cloud + is_optional: false + - name: region + description: Onap cloud region + type: string + short_option: y + long_option: region + is_optional: false + - name: tenant-id + description: Onap cloud tenant id + type: string + short_option: z + long_option: tenant-id + is_optional: false + - name: resource-version + description: Onap cloud tenant version + type: uuid + short_option: r + long_option: resource-version + is_optional: true + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}?resource-version=${resource-version} + method: DELETE + success_codes: + - 204 + - 404 diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-list-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-list-schema-dublin.yaml new file mode 100644 index 00000000..5fdefaa8 --- /dev/null +++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/tenant/tenant-list-schema-dublin.yaml @@ -0,0 +1,65 @@ +# 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: tenant-list +description: Lists the tenants under given cloud region in Onap + +info: + product: onap-dublin + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud + description: Onap cloud + type: string + short_option: x + long_option: cloud + is_optional: false + - name: region + description: Onap cloud region + type: string + short_option: y + long_option: region + is_optional: false + +results: + direction: landscape + attributes: + - name: tenant-id + description: Onap tenant-id + scope: short + type: string + - name: tenant-name + description: Onap tenant name + scope: short + type: string + - name: resource-version + description: Onap tenant resource version + scope: short + type: string +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants + method: GET + success_codes: + - 200 + result_map: + tenant-id: $b{$.tenant.[*].tenant-id} + tenant-name: $b{$.tenant.[*].tenant-name} + resource-version: $b{$.tenant.[*].resource-version} diff --git a/products/onap-dublin/pom.xml b/products/onap-dublin/pom.xml new file mode 100644 index 00000000..4d33e770 --- /dev/null +++ b/products/onap-dublin/pom.xml @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + 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. + --> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 + http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.cli</groupId> + <artifactId>cli-products</artifactId> + <version>2.0.6</version> + </parent> + + <artifactId>cli-products-onap-dublin</artifactId> + <name>cli/products/onap-dublin</name> + <packaging>pom</packaging> + + <modules> + <module>auth</module> + <module>catalog</module> + <module>features</module> + </modules> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-artifact</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>${project.artifactId}</artifactId> + <version>${project.version}</version> + <type>${project.packaging}</type> + </artifactItem> + </artifactItems> + <!-- copy to products dependencies --> + <outputDirectory>../../../products/target/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> diff --git a/products/pom.xml b/products/pom.xml index 585ac4ad..136ef981 100644 --- a/products/pom.xml +++ b/products/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products</artifactId> diff --git a/products/sample/pom.xml b/products/sample/pom.xml index a3e3cc8f..e0dd362d 100644 --- a/products/sample/pom.xml +++ b/products/sample/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-products</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-products-sample</artifactId> diff --git a/profiles/command/pom.xml b/profiles/command/pom.xml index 673cd985..b40cf3e1 100644 --- a/profiles/command/pom.xml +++ b/profiles/command/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-profiles</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-profiles-command</artifactId> diff --git a/profiles/http/pom.xml b/profiles/http/pom.xml index e6d2bd71..edd00648 100644 --- a/profiles/http/pom.xml +++ b/profiles/http/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-profiles</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-profiles-http</artifactId> diff --git a/profiles/pom.xml b/profiles/pom.xml index dac4b47a..b457aebf 100644 --- a/profiles/pom.xml +++ b/profiles/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-profiles</artifactId> diff --git a/profiles/snmp/pom.xml b/profiles/snmp/pom.xml index cfd5f228..48698580 100644 --- a/profiles/snmp/pom.xml +++ b/profiles/snmp/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-profiles</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-profiles-snmp</artifactId> diff --git a/validate/pom.xml b/validate/pom.xml index 8f763900..603394e2 100644 --- a/validate/pom.xml +++ b/validate/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-validate</artifactId> diff --git a/validate/sample-mock-generator/pom.xml b/validate/sample-mock-generator/pom.xml index 7c684753..bd963304 100644 --- a/validate/sample-mock-generator/pom.xml +++ b/validate/sample-mock-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-validate</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-sample-mock-generator</artifactId> diff --git a/validate/sample-yaml-generator/pom.xml b/validate/sample-yaml-generator/pom.xml index 552b7d5b..d54459af 100644 --- a/validate/sample-yaml-generator/pom.xml +++ b/validate/sample-yaml-generator/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-validate</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-sample-yaml-generator</artifactId> diff --git a/validate/validation/pom.xml b/validate/validation/pom.xml index 8b01ed22..9ac3ee9f 100644 --- a/validate/validation/pom.xml +++ b/validate/validation/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.cli</groupId> <artifactId>cli-validate</artifactId> - <version>2.0.5</version> + <version>2.0.6</version> </parent> <artifactId>cli-validation</artifactId> diff --git a/version.properties b/version.properties index 6848e3e2..77e2b345 100644 --- a/version.properties +++ b/version.properties @@ -16,7 +16,7 @@ major=2 minor=0 -patch=5 +patch=6 base_version=${major}.${minor}.${patch} |