From e32043f58a2450b6a5986dc2a01f64f8b22c3992 Mon Sep 17 00:00:00 2001 From: "Yang (Gabriel) Yu" Date: Tue, 4 Sep 2018 21:02:27 +0800 Subject: Change naming and veriy test-scheduler function Changes: 1. Testing-scheduler -> Test-scheduler 2. lots of windows breaks '\r' and '^M' in files, batch changes to unix breaks '$' 3. Add ui/build Change-Id: I1f2c98ab9348460d4e68bfbfab664dae82b761ba Signed-off-by: Yang (Gabriel) Yu --- .../server/test/test_case/logic/tc_logic_00.yaml | 30 ------ .../server/test/test_case/logic/tc_logic_01.yaml | 73 ------------- .../server/test/test_case/logic/tc_logic_02.yaml | 71 ------------- .../server/test/test_case/logic/tc_logic_03.yaml | 86 ---------------- .../server/test/test_case/logic/tc_logic_04.yaml | 70 ------------- .../server/test/test_case/logic/tc_logic_05.yaml | 100 ------------------ .../server/test/test_case/logic/tc_logic_06.yaml | 80 --------------- .../server/test/test_case/logic/tc_logic_07.yaml | 100 ------------------ .../server/test/test_case/logic/tc_logic_08.yaml | 114 --------------------- .../test/test_case/logic_in_out/tc_cxt_01.yaml | 47 --------- .../test/test_case/logic_in_out/tc_io_01.yaml | 63 ------------ .../test/test_case/logic_in_out/tc_io_02.yaml | 60 ----------- .../test/test_case/suite_test/tc_suitetest_00.yaml | 27 ----- .../test/test_case/suite_test/tc_suitetest_01.yaml | 27 ----- .../test/test_case/suite_test/tc_suitetest_02.yaml | 27 ----- 15 files changed, 975 deletions(-) delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_00.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_01.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_02.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_03.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_04.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_05.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_06.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_07.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic/tc_logic_08.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic_in_out/tc_cxt_01.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic_in_out/tc_io_01.yaml delete mode 100644 testing-scheduler/server/test/test_case/logic_in_out/tc_io_02.yaml delete mode 100644 testing-scheduler/server/test/test_case/suite_test/tc_suitetest_00.yaml delete mode 100644 testing-scheduler/server/test/test_case/suite_test/tc_suitetest_01.yaml delete mode 100644 testing-scheduler/server/test/test_case/suite_test/tc_suitetest_02.yaml (limited to 'testing-scheduler/server/test/test_case') diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_00.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_00.yaml deleted file mode 100644 index 6a4eeea9..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_00.yaml +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic -# this testcase contains a single step for scheduling. - -schema: - steps: - - - id: 1 - name: make_a_greet - service: - name: greet - interface: greet - args: - name: leo - flows: - - - name: main - orders: - - - type: normal - step: 1 \ No newline at end of file diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_01.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_01.yaml deleted file mode 100644 index 3f8f4f41..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_01.yaml +++ /dev/null @@ -1,73 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic -# 5 steps while only 2 in them will be executed. - -schema: - steps: - - - id: 1 - name: make_a_greet - service: - name: greet - interface: greet - args: - name: leo - - - - id: 2 - name: response_the_greet - service: - name: greet - interface: answer - args: - ping: ping_from_leo - - - - id: 3 - name: make_a_greet_3 - service: - name: greet - interface: greet - args: - name: leo_@ - - - - id: 4 - name: make_a_greet_4 - service: - name: greet - interface: greet - args: - name: leo_@ - - - - id: 5 - name: make_a_greet_5 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: normal - step: 2 diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_02.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_02.yaml deleted file mode 100644 index ce7197d1..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_02.yaml +++ /dev/null @@ -1,71 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic of switch -# switch will determine the next case to execute based -# on the "value", and "value" can be assigned by the -# previous step's output. -# The testcase below is an example. -# To referring the step's output, using ((x.y)). -# x is the id of the step, -# y is the output key of the step. - -schema: - steps: - - - id: 1 - name: choose_greet_type - type: test - service: - name: greet - interface: switch - action: start - - - - id: 2 - name: response_the_greet - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo - - - - id: 3 - name: make_a_greet_2 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: switch - value: ((1.result)) - cases: - A: - - - type: normal - step: 2 - B: - - - type: normal - step: 3 diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_03.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_03.yaml deleted file mode 100644 index 2cb89430..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_03.yaml +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test useless sub workflow -# In this testcase, there is a subflow whose name -# is 'flow-1' which will not be executed because no -# other flow refers to it. -# This testcase is used to test that besides main flow, -# whether subflow can be parsed without exception. - -schema: - steps: - - - id: 1 - name: choose_greet_type - type: test - service: - name: greet - interface: switch - action: start - - - - id: 2 - name: response_the_greet - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo - - - - id: 3 - name: make_a_greet_2 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - - id: 4 - name: make_a_greet_3 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: switch - value: ((1.result)) - cases: - A: - - - type: normal - step: 2 - B: - - - type: normal - step: 3 - - - name: flow-1 - orders: - - - type: normal - step: 4 diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_04.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_04.yaml deleted file mode 100644 index 67847ff3..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_04.yaml +++ /dev/null @@ -1,70 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic of sub flow. - -schema: - steps: - - - id: 1 - name: choose_greet_type - type: test - service: - name: greet - interface: switch - action: start - - - - id: 2 - name: response_the_greet - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo - - - - id: 3 - name: make_a_greet_2 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: switch - value: ((1.result)) - cases: - A: flow-1 - B: flow-2 - - - name: flow-1 - orders: - - - type: normal - step: 2 - - - name: flow-2 - orders: - - - type: normal - step: 3 diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_05.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_05.yaml deleted file mode 100644 index ac0f81c9..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_05.yaml +++ /dev/null @@ -1,100 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic of switch. -# switch nested in switch by using subflow. - -schema: - steps: - - - id: 1 - name: choose_greet_type - type: test - service: - name: greet - interface: switch - action: start - - - - id: 2 - name: response_the_greet - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo - - - - id: 3 - name: choose_greet_type_2 - type: test - service: - name: greet - interface: switch_2 - action: start - - - - id: 4 - name: make_a_greet - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - - id: 5 - name: response_the_greet_2 - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo_2 - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: switch - value: ((1.result)) - cases: - A: - - - type: normal - step: 2 - B: flow-1 - - - name: flow-1 - orders: - - - type: normal - step: 3 - - - type: switch - value: ((3.result)) - cases: - C: - - - type: normal - step: 4 - D: - - - type: normal - step: 5 diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_06.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_06.yaml deleted file mode 100644 index 7c14d012..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_06.yaml +++ /dev/null @@ -1,80 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic of parallel - -schema: - steps: - - - id: 1 - name: choose_greet_type - type: test - service: - name: greet - interface: switch - action: start - - - - id: 2 - name: response_the_greet - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo - - - - id: 3 - name: make_a_greet - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - - id: 4 - name: make_a_greet_2 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: parallel - parallel: - p1: flow-1 - p2: - - - type: normal - step: 4 - - - name: flow-1 - orders: - - - type: normal - step: 2 - - - type: normal - step: 3 diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_07.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_07.yaml deleted file mode 100644 index 5fa71227..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_07.yaml +++ /dev/null @@ -1,100 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic of parallel + switch - -schema: - steps: - - - id: 1 - name: make_a_greet - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - id: 2 - name: choose_greet_type - type: test - service: - name: greet - interface: switch - action: start - - - - id: 3 - name: response_the_greet - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo - - - - id: 4 - name: make_a_greet - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - - id: 5 - name: make_a_greet_2 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: parallel - parallel: - p1: flow-1 - p2: - - - type: normal - step: 5 - - - name: flow-1 - orders: - - - type: normal - step: 2 - - - type: switch - value: ((2.result)) - cases: - A: - - - type: normal - step: 3 - B: - - - type: normal - step: 4 \ No newline at end of file diff --git a/testing-scheduler/server/test/test_case/logic/tc_logic_08.yaml b/testing-scheduler/server/test/test_case/logic/tc_logic_08.yaml deleted file mode 100644 index e5da14f2..00000000 --- a/testing-scheduler/server/test/test_case/logic/tc_logic_08.yaml +++ /dev/null @@ -1,114 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test conductor basic logic of parallel. -# parallel nested in parallel using subflow - -schema: - steps: - - - id: 1 - name: make_a_greet - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - id: 2 - name: choose_greet_type - type: test - service: - name: greet - interface: switch - action: start - - - - id: 3 - name: response_the_greet - type: test - service: - name: greet - interface: answer - action: start - args: - ping: ping_from_leo - - - - id: 4 - name: make_a_greet - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - - id: 5 - name: make_a_greet_2 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - - id: 6 - name: make_a_greet_3 - type: test - service: - name: greet - interface: greet - action: start - args: - name: leo_@ - - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: parallel - parallel: - p1: flow-p1 - p2: - - - type: normal - step: 6 - - - name: flow-p1 - orders: - - - type: normal - step: 2 - - - type: parallel - parallel: - p1: - - - type: normal - step: 3 - p2: - - - type: normal - step: 4 - - - type: normal - step: 5 \ No newline at end of file diff --git a/testing-scheduler/server/test/test_case/logic_in_out/tc_cxt_01.yaml b/testing-scheduler/server/test/test_case/logic_in_out/tc_cxt_01.yaml deleted file mode 100644 index 583bc1c3..00000000 --- a/testing-scheduler/server/test/test_case/logic_in_out/tc_cxt_01.yaml +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test use param of the context -# we can using the context param just like environment variable by -# writting ((context.a.b.c)). -# 'context' is a constant string, -# a, b, c is the key in the context yaml file (src/env/context/context.yaml). - -schema: - steps: - - - id: 1 - name: make_a_greet - service: - name: greet - interface: greet - args: - name: leo - - - - id: 2 - name: response_the_greet - service: - name: greet - interface: answer - args: - ping: ((context.sprout.name)) - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: normal - step: 2 - context: clearwater-conf.yaml diff --git a/testing-scheduler/server/test/test_case/logic_in_out/tc_io_01.yaml b/testing-scheduler/server/test/test_case/logic_in_out/tc_io_01.yaml deleted file mode 100644 index b5ce203f..00000000 --- a/testing-scheduler/server/test/test_case/logic_in_out/tc_io_01.yaml +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test switch value used step-1's output. -# to referring the step's output, using ((x.y)). -# x is the id of the step, -# y is the output key of the step. - -schema: - steps: - - - id: 1 - name: get-switch - service: - name: greet - interface: switch - args: - name: leo - - - - id: 2 - name: greet1 - service: - name: greet - interface: answer - args: - ping: ping_from_Leo - - - - id: 3 - name: greet2 - service: - name: greet - interface: answer - args: - ping: ping_from_Leo_2 - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: switch - value: ((1.result)) - cases: - A: - - - type: normal - step: 2 - B: - - - type: normal - step: 3 \ No newline at end of file diff --git a/testing-scheduler/server/test/test_case/logic_in_out/tc_io_02.yaml b/testing-scheduler/server/test/test_case/logic_in_out/tc_io_02.yaml deleted file mode 100644 index 804a6791..00000000 --- a/testing-scheduler/server/test/test_case/logic_in_out/tc_io_02.yaml +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -# description: test switch and step-2 used step-1's output - -schema: - steps: - - - id: 1 - name: get-switch - service: - name: greet - interface: switch - args: - name: leo - - - - id: 2 - name: greet1 - service: - name: greet - interface: answer - args: - ping: ((1.result)) - - - - id: 3 - name: greet2 - service: - name: greet - interface: answer - args: - ping: ping_from_Leo_2 - - flows: - - - name: main - orders: - - - type: normal - step: 1 - - - type: switch - value: ((1.result)) - cases: - A: - - - type: normal - step: 2 - B: - - - type: normal - step: 3 \ No newline at end of file diff --git a/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_00.yaml b/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_00.yaml deleted file mode 100644 index 06f8c4ef..00000000 --- a/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_00.yaml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -schema: - steps: - - - id: 1 - name: suitetest_00 - service: - name: greet - interface: ten - args: - name: leo - flows: - - - name: main - orders: - - - type: normal - step: 1 \ No newline at end of file diff --git a/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_01.yaml b/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_01.yaml deleted file mode 100644 index 0189e7af..00000000 --- a/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_01.yaml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -schema: - steps: - - - id: 1 - name: suitetest_01 - service: - name: greet - interface: ten - args: - name: leo - flows: - - - name: main - orders: - - - type: normal - step: 1 \ No newline at end of file diff --git a/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_02.yaml b/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_02.yaml deleted file mode 100644 index bc689248..00000000 --- a/testing-scheduler/server/test/test_case/suite_test/tc_suitetest_02.yaml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -schema: - steps: - - - id: 1 - name: suitetest_01 - service: - name: greet - interface: greet - args: - name: leo - flows: - - - name: main - orders: - - - type: normal - step: 1 \ No newline at end of file -- cgit 1.2.3-korg