From d0cbdfcdb2eb51a8cb962a109d8e14c93525e12b Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Thu, 14 Mar 2019 09:44:32 +0800 Subject: Add VVP deployment in VTP scripts Issue-ID: VNFSDK-352 Change-Id: I606263a1df9739e1dff809523006bf82c384657c Signed-off-by: Kanagaraj Manickam k00365106 --- .../open-cli-schema/scenario-1-registry.yaml | 31 ------------- .../scenario-1/testsuite-1/s1.ts1.testcase-1.yaml | 52 ---------------------- .../scenario-1/testsuite-1/s1.ts1.testcase-2.yaml | 52 ---------------------- .../scenario-1/testsuite-1/s1.ts1.testcase-3.yaml | 31 ------------- .../scenario-1/testsuite-2/s1.ts2.testcase-1.yaml | 52 ---------------------- .../scenario-1/testsuite-2/s1.ts2.testcase-2.yaml | 52 ---------------------- .../open-cli-schema/scenario-2-registry.yaml | 33 -------------- .../scenario-2/scenario-1-registry.yaml | 31 ------------- .../scenario-2/testsuite-1/s2.ts1.testcase-1.yaml | 52 ---------------------- .../scenario-2/testsuite-2/s2.ts2.testcase-1.yaml | 52 ---------------------- .../scenario-2/testsuite-3/s2.ts3.testcase-1.yaml | 31 ------------- 11 files changed, 469 deletions(-) delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1-registry.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-1.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-2.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-3.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-1.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-2.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2-registry.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/scenario-1-registry.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-1/s2.ts1.testcase-1.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-2/s2.ts2.testcase-1.yaml delete mode 100644 vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-3/s2.ts3.testcase-1.yaml (limited to 'vnfmarket-be/vnf-sdk-marketplace/src/test') diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1-registry.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1-registry.yaml deleted file mode 100644 index 915938ab..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1-registry.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 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. - -open_cli_schema_version: 1.0 - -product: - name: VTP Scenario 1 - - version: 1.0 - - description: | - Test scenario 1 - -contact: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -services: - - name: testsuite-1 - description: testsuite 1 - - name: testsuite-2 - description: testsuite 2 diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-1.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-1.yaml deleted file mode 100644 index cf3f0a62..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-1.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# 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: s1.ts1.testcase-1 -description: s1.ts1.testcase-1 - -info: - product: scenario-1 - service: testsuite-1 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false - metadata: - allowed_value: - - a - - b - - c - - name: input2 - type: string - description: Input 2 - short_option: y - long_option: input2 - is_optional: true - default_value: v2 - -results: - direction: portrait - attributes: - - name: output1 - description: output 1 - scope: short - type: string - default_value: ${input1}-${input2} \ No newline at end of file diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-2.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-2.yaml deleted file mode 100644 index 81e63808..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-2.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# 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: s1.ts1.testcase-2 -description: s1.ts1.testcase-2 - -info: - product: scenario-1 - service: testsuite-1 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false - - name: input2 - type: string - description: Input 2 - short_option: y - long_option: input2 - is_optional: true - default_value: v2 - -results: - direction: landscape - attributes: - - name: output1 - description: output 1 - scope: short - type: string - default_value: ${input1} - - name: output2 - description: output 2 - scope: short - type: string - default_value: ${input2} \ No newline at end of file diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-3.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-3.yaml deleted file mode 100644 index 354409bf..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-1/s1.ts1.testcase-3.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 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: s1.ts1.testcase-3 -description: s1.ts1.testcase-3 - -info: - product: scenario-1 - service: testsuite-1 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-1.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-1.yaml deleted file mode 100644 index ebdeab83..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-1.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# 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: s1.ts2.testcase-1 -description: s1.ts2.testcase-1 - -info: - product: scenario-1 - service: testsuite-2 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false - metadata: - allowed_value: - - a - - b - - c - - name: input2 - type: string - description: Input 2 - short_option: y - long_option: input2 - is_optional: true - default_value: v2 - -results: - direction: portrait - attributes: - - name: output1 - description: output 1 - scope: short - type: string - default_value: ${input1}=${input2} \ No newline at end of file diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-2.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-2.yaml deleted file mode 100644 index b30e565a..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-1/testsuite-2/s1.ts2.testcase-2.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# 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: s1.ts2.testcase-2 -description: s1.ts2.testcase-2 - -info: - product: scenario-1 - service: testsuite-2 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false - - name: input2 - type: string - description: Input 2 - short_option: y - long_option: input2 - is_optional: true - default_value: v2 - -results: - direction: landscape - attributes: - - name: output1 - description: output 1 - scope: short - type: string - default_value: ${input1} - - name: output2 - description: output 2 - scope: short - type: string - default_value: ${input2} \ No newline at end of file diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2-registry.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2-registry.yaml deleted file mode 100644 index b224c041..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2-registry.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# 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. - -open_cli_schema_version: 1.0 - -product: - name: VTP Scenario 2 - - version: 1.0 - - description: | - Test scenario 1 - -contact: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -services: - - name: testsuite-1 - description: testsuite 1 - - name: testsuite-2 - description: testsuite 2 - - name: testsuite-3 - description: testsuite 3 \ No newline at end of file diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/scenario-1-registry.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/scenario-1-registry.yaml deleted file mode 100644 index 915938ab..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/scenario-1-registry.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 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. - -open_cli_schema_version: 1.0 - -product: - name: VTP Scenario 1 - - version: 1.0 - - description: | - Test scenario 1 - -contact: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -services: - - name: testsuite-1 - description: testsuite 1 - - name: testsuite-2 - description: testsuite 2 diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-1/s2.ts1.testcase-1.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-1/s2.ts1.testcase-1.yaml deleted file mode 100644 index 8cf4d29b..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-1/s2.ts1.testcase-1.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# 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: s2.ts1.testcase-1 -description: s2.ts1.testcase-1 - -info: - product: scenario-2 - service: testsuite-1 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false - metadata: - allowed_value: - - a - - b - - c - - name: input2 - type: string - description: Input 2 - short_option: y - long_option: input2 - is_optional: true - default_value: v2 - -results: - direction: portrait - attributes: - - name: output1 - description: output 1 - scope: short - type: string - default_value: ${input1}-${input2} \ No newline at end of file diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-2/s2.ts2.testcase-1.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-2/s2.ts2.testcase-1.yaml deleted file mode 100644 index ab3d62b1..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-2/s2.ts2.testcase-1.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# 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: s2.ts2.testcase-1 -description: s2.ts2.testcase-1 - -info: - product: scenario-2 - service: testsuite-2 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false - - name: input2 - type: string - description: Input 2 - short_option: y - long_option: input2 - is_optional: true - default_value: v2 - -results: - direction: landscape - attributes: - - name: output1 - description: output 1 - scope: short - type: string - default_value: ${input1} - - name: output2 - description: output 2 - scope: short - type: string - default_value: ${input2} \ No newline at end of file diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-3/s2.ts3.testcase-1.yaml b/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-3/s2.ts3.testcase-1.yaml deleted file mode 100644 index e612dca9..00000000 --- a/vnfmarket-be/vnf-sdk-marketplace/src/test/resources/sample-vtp-scenarios/open-cli-schema/scenario-2/testsuite-3/s2.ts3.testcase-1.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 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: s2.ts3.testcase-1 -description: s2.ts3.testcase-1 - -info: - product: scenario-2 - service: testsuite-3 - type: cmd - author: Kanagaraj Manickam kanagaraj.manickam@huawei.com - -parameters: - - name: input1 - type: string - description: Input 1 - short_option: x - long_option: input1 - is_optional: false -- cgit 1.2.3-korg