diff options
8 files changed, 443 insertions, 0 deletions
diff --git a/framework/src/test/java/org/onap/cli/fw/cmd/execution/OnapCommandExceutionShowCommandTest.java b/framework/src/test/java/org/onap/cli/fw/cmd/execution/OnapCommandExceutionShowCommandTest.java new file mode 100644 index 00000000..172f7045 --- /dev/null +++ b/framework/src/test/java/org/onap/cli/fw/cmd/execution/OnapCommandExceutionShowCommandTest.java @@ -0,0 +1,51 @@ +/* + * Copyright 2019 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. + */ +package org.onap.cli.fw.cmd.execution; +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.error.OnapCommandExecutionFailed; +import org.onap.cli.fw.output.OnapCommandResultAttribute; +import org.onap.cli.fw.store.OnapCommandExecutionStoreTest; + +import java.util.List; + +import static org.junit.Assert.*; + +public class OnapCommandExceutionShowCommandTest { +@BeforeClass +public static void setUp() throws Exception { + OnapCommandExecutionStoreTest executionStoreTest= new OnapCommandExecutionStoreTest(); + executionStoreTest.setUp(); + executionStoreTest.listExecutionsTest(); + executionStoreTest.storeExectutionDebugTest(); + executionStoreTest.storeExectutionEndTest(); + executionStoreTest.storeExectutionOutputTest(); + executionStoreTest.storeExectutionProgressTest(); + executionStoreTest.storeExectutionStartTest(); +} + @Test + public void runTest() throws OnapCommandException { + OnapCommandExceutionShowCommand cmd=new OnapCommandExceutionShowCommand(); + cmd.initializeSchema("execution-show.yaml"); + cmd.getParametersMap().get("execution-id").setValue("requestId"); + cmd.getParametersMap().get("format").setValue("TEXT"); + cmd.execute(); + List<OnapCommandResultAttribute> oclipCommandResultAttributes = cmd.getResult() + .getRecords(); + assertTrue(oclipCommandResultAttributes.size() > 1); + } +}
\ No newline at end of file diff --git a/framework/src/test/java/org/onap/cli/fw/cmd/execution/OnapCommandExceutionShowDebugCommandTest.java b/framework/src/test/java/org/onap/cli/fw/cmd/execution/OnapCommandExceutionShowDebugCommandTest.java new file mode 100644 index 00000000..e31e53d5 --- /dev/null +++ b/framework/src/test/java/org/onap/cli/fw/cmd/execution/OnapCommandExceutionShowDebugCommandTest.java @@ -0,0 +1,47 @@ +/* + * Copyright 2019 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. + */ +package org.onap.cli.fw.cmd.execution; + +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.cli.fw.error.OnapCommandException; +import org.onap.cli.fw.store.OnapCommandExecutionStoreTest; + +import static org.junit.Assert.*; + +public class OnapCommandExceutionShowDebugCommandTest { + @BeforeClass + public static void setUp() throws Exception { + OnapCommandExecutionStoreTest executionStoreTest= new OnapCommandExecutionStoreTest(); + executionStoreTest.setUp(); + executionStoreTest.listExecutionsTest(); + executionStoreTest.storeExectutionDebugTest(); + executionStoreTest.storeExectutionEndTest(); + executionStoreTest.storeExectutionOutputTest(); + executionStoreTest.storeExectutionProgressTest(); + executionStoreTest.storeExectutionStartTest(); + } + @Test + public void runTest() throws OnapCommandException { + OnapCommandExceutionShowDebugCommand cmd=new OnapCommandExceutionShowDebugCommand(); + cmd.initializeSchema("execution-show-debug.yaml"); + cmd.getParametersMap().get("execution-id").setValue("requestId"); + cmd.execute(); + assertNotNull(cmd.getResult().getOutput()); + + } + +}
\ No newline at end of file diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/customer/customer-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/customer/customer-create-schema-elalto.yaml new file mode 100644 index 00000000..c87e9cb9 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/customer/customer-create-schema-elalto.yaml @@ -0,0 +1,47 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: customer-create +description: Create a customer in Onap + +info: + product: onap-elalto + 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: subscriber-name + description: Onap subscriber name + type: string + short_option: y + long_option: subscriber-name + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v16/business/customers/customer/${customer-name} + method: PUT + body: '{"global-customer-id": "${customer-name}", "subscriber-name": "${subscriber-name}", "subscriber-type": "INFRA"}' + success_codes: + - 201 diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-create-schema-elalto.yaml new file mode 100644 index 00000000..4b2766dc --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-create-schema-elalto.yaml @@ -0,0 +1,48 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: service-type-create +description: Add a service type in Onap + +info: + product: onap-elalto + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org +parameters: + - name: service-type + description: Onap service type + type: string + short_option: x + long_option: service-type + is_optional: false + - name: service-type-id + description: Onap service type uuid + type: uuid + short_option: y + long_option: service-type-id + is_optional: true + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/service-design-and-creation/services/service/${service-type-id} + method: PUT + body: '{"service-description": "${service-type}", "service-id": "${service-type-id}"}' + success_codes: + - 201 + sample_response: + body: '' diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-delete-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-delete-schema-elalto.yaml new file mode 100644 index 00000000..817f95f5 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-delete-schema-elalto.yaml @@ -0,0 +1,46 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: service-type-delete +description: Delete a service type from Onap + +info: + product: onap-elalto + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: service-type-id + description: Onap service type uuid + type: uuid + short_option: x + long_option: service-type-id + is_optional: true + - name: resource-version + description: Onap service resource version + type: uuid + short_option: y + long_option: resource-version + is_optional: true +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/service-design-and-creation/services/service/${service-type-id}?resource-version=${resource-version} + method: DELETE + success_codes: + - 204 + - 404 diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-list-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-list-schema-elalto.yaml new file mode 100644 index 00000000..938c6f2d --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/service-type/service-type-list-schema-elalto.yaml @@ -0,0 +1,52 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: service-type-list +description: List the service types configured in Onap + +info: + product: onap-elalto + service: aai + author: ONAP CLI Team onap-discuss@lists.onap.org + +results: + direction: landscape + attributes: + - name: service-type-id + description: Onap cloud service + scope: short + type: string + - name: service-type + description: Onap cloud service + scope: short + type: string + - name: resource-version + description: Onap cloud service resource version + scope: short + type: string +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v13/service-design-and-creation/services + method: GET + success_codes: + - 200 + - 404 + result_map: + service-type: $b{service.[*].service-description} + service-type-id: $b{service.[*].service-id} + resource-version: $b{service.[*].resource-version} diff --git a/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml new file mode 100644 index 00000000..a63ddd22 --- /dev/null +++ b/products/onap-elalto/features/aai/src/main/resources/open-cli-schema/business/subscription/subscription-create-schema-elalto.yaml @@ -0,0 +1,106 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_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-elalto + 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-owner + description: Onap cloud owner name + type: string + short_option: z + long_option: cloud-owner + is_optional: false + - name: cloud-region + description: Onap cloud region + type: string + short_option: r + long_option: cloud-region + is_optional: false + - name: cloud-tenant-id + description: Onap cloud tenant id + type: string + short_option: c + long_option: cloud-tenant-id + is_optional: false + - name: service-type + description: Onap service type + type: string + short_option: e + long_option: service-type + is_optional: false + - name: tenant-name + description: name of tenant to use in the cloud region + type: string + short_option: y + long_option: tenant-name + is_optional: false + +http: + service: + auth: basic + mode: direct + request: + uri: /aai/v16/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type} + method: PUT + context: + remove_empty_node: true + body: '{ + "service-type": "${service-type}", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/${cloud-owner}/${cloud-region}/tenants/tenant/${cloud-tenant-id}", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "${cloud-owner}" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "${cloud-region}" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "${cloud-tenant-id}" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "${tenant-name}" + } + ] + } + ] + } }' + success_codes: + - 200 + - 201 + sample_response: + body: '' diff --git a/products/onap-elalto/features/multicloud/src/main/resources/open-cli-schema/multicloud-register-cloud-schema.yaml b/products/onap-elalto/features/multicloud/src/main/resources/open-cli-schema/multicloud-register-cloud-schema.yaml new file mode 100644 index 00000000..eba73df5 --- /dev/null +++ b/products/onap-elalto/features/multicloud/src/main/resources/open-cli-schema/multicloud-register-cloud-schema.yaml @@ -0,0 +1,46 @@ +# Copyright 2019 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +open_cli_schema_version: 1.0 +name: multicloud-register-cloud +description: Register a cloud region with multicloud plugin + +info: + product: onap-elalto + service: multicloud + author: ONAP CLI Team onap-discuss@lists.onap.org + +parameters: + - name: cloud-region + description: Onap Cloud region name + type: string + short_option: x + long_option: cloud-region + is_optional: false + - name: cloud-owner + description: Onap Cloud Owner name + type: string + short_option: y + long_option: cloud-owner + is_optional: false + +http: + service: + auth: none + mode: direct + request: + uri: /api/multicloud/v0/${cloud-owner}_${cloud-region}/registry + method: POST + success_codes: + - 202 |