From 9a0e00f982be35f12f8e109a29eea081bb3e6c8d Mon Sep 17 00:00:00 2001 From: lguohan Date: Sat, 25 Apr 2020 21:23:39 -0700 Subject: [PATCH] [pytest]: reorg tests info subfolder (#1613) Signed-off-by: Guohan Lu --- ansible/roles/test/tasks/bgp_speaker.yml | 2 +- ansible/roles/test/tasks/dhcp_relay.yml | 2 +- ansible/roles/test/tasks/dip_sip.yml | 2 +- ansible/roles/test/tasks/everflow_testbed.yml | 2 +- ansible/roles/test/tasks/lag_2.yml | 2 +- ansible/roles/test/tasks/lldp.yml | 2 +- ansible/roles/test/tasks/mtu.yml | 2 +- ansible/roles/test/tasks/vxlan-decap.yml | 2 +- tests/{ => bgp}/test_bgp_fact.py | 0 tests/{ => bgp}/test_bgp_speaker.py | 0 tests/{ => dhcp_relay}/test_dhcp_relay.py | 0 tests/{ => everflow}/test_everflow_testbed.py | 0 tests/{dip_sip => ipfwd}/test_dip_sip.py | 0 tests/{ => ipfwd}/test_mtu.py | 0 tests/{ => lldp}/test_lldp.py | 0 tests/{ => pc}/test_lag_2.py | 0 tests/{ => sflow}/test_sflow.py | 0 tests/{ => vxlan}/test_vxlan_decap.py | 0 18 files changed, 8 insertions(+), 8 deletions(-) rename tests/{ => bgp}/test_bgp_fact.py (100%) rename tests/{ => bgp}/test_bgp_speaker.py (100%) rename tests/{ => dhcp_relay}/test_dhcp_relay.py (100%) rename tests/{ => everflow}/test_everflow_testbed.py (100%) rename tests/{dip_sip => ipfwd}/test_dip_sip.py (100%) rename tests/{ => ipfwd}/test_mtu.py (100%) rename tests/{ => lldp}/test_lldp.py (100%) rename tests/{ => pc}/test_lag_2.py (100%) rename tests/{ => sflow}/test_sflow.py (100%) rename tests/{ => vxlan}/test_vxlan_decap.py (100%) diff --git a/ansible/roles/test/tasks/bgp_speaker.yml b/ansible/roles/test/tasks/bgp_speaker.yml index 4bed8ce473..7dca4b45e0 100644 --- a/ansible/roles/test/tasks/bgp_speaker.yml +++ b/ansible/roles/test/tasks/bgp_speaker.yml @@ -1,4 +1,4 @@ - name: run test include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: test_bgp_speaker.py + test_node: bgp/test_bgp_speaker.py diff --git a/ansible/roles/test/tasks/dhcp_relay.yml b/ansible/roles/test/tasks/dhcp_relay.yml index 839434b4f4..eb93fea9bd 100644 --- a/ansible/roles/test/tasks/dhcp_relay.yml +++ b/ansible/roles/test/tasks/dhcp_relay.yml @@ -1,4 +1,4 @@ - name: Run DHCP relay test (pytest-ansible) include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: test_dhcp_relay.py + test_node: dhcp_relay/test_dhcp_relay.py diff --git a/ansible/roles/test/tasks/dip_sip.yml b/ansible/roles/test/tasks/dip_sip.yml index b443146d78..2881dfe5a4 100644 --- a/ansible/roles/test/tasks/dip_sip.yml +++ b/ansible/roles/test/tasks/dip_sip.yml @@ -1,4 +1,4 @@ - name: run test include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: dip_sip/test_dip_sip.py \ No newline at end of file + test_node: ipfwd/test_dip_sip.py diff --git a/ansible/roles/test/tasks/everflow_testbed.yml b/ansible/roles/test/tasks/everflow_testbed.yml index c5efbe2ca6..256cb3bc32 100644 --- a/ansible/roles/test/tasks/everflow_testbed.yml +++ b/ansible/roles/test/tasks/everflow_testbed.yml @@ -1,4 +1,4 @@ - name: run test include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: test_everflow_testbed.py + test_node: everflow/test_everflow_testbed.py diff --git a/ansible/roles/test/tasks/lag_2.yml b/ansible/roles/test/tasks/lag_2.yml index 4abcd66c5d..a9d5a76f18 100644 --- a/ansible/roles/test/tasks/lag_2.yml +++ b/ansible/roles/test/tasks/lag_2.yml @@ -8,4 +8,4 @@ - name: run test include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: test_lag_2.py \ No newline at end of file + test_node: pc/test_lag_2.py diff --git a/ansible/roles/test/tasks/lldp.yml b/ansible/roles/test/tasks/lldp.yml index eb7ee04f6c..c1b6bb388e 100644 --- a/ansible/roles/test/tasks/lldp.yml +++ b/ansible/roles/test/tasks/lldp.yml @@ -1,4 +1,4 @@ - name: run test include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: test_lldp.py + test_node: lldp/test_lldp.py diff --git a/ansible/roles/test/tasks/mtu.yml b/ansible/roles/test/tasks/mtu.yml index a3340a3464..6492725b7f 100644 --- a/ansible/roles/test/tasks/mtu.yml +++ b/ansible/roles/test/tasks/mtu.yml @@ -4,4 +4,4 @@ - name: Run MTU relay test (pytest-ansible) include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: test_mtu.py + test_node: ipfwd/test_mtu.py diff --git a/ansible/roles/test/tasks/vxlan-decap.yml b/ansible/roles/test/tasks/vxlan-decap.yml index 532dd23cab..31aa917e52 100644 --- a/ansible/roles/test/tasks/vxlan-decap.yml +++ b/ansible/roles/test/tasks/vxlan-decap.yml @@ -1,4 +1,4 @@ - name: run test include_tasks: roles/test/tasks/pytest_runner.yml vars: - test_node: test_vxlan_decap.py + test_node: vxlan/test_vxlan_decap.py diff --git a/tests/test_bgp_fact.py b/tests/bgp/test_bgp_fact.py similarity index 100% rename from tests/test_bgp_fact.py rename to tests/bgp/test_bgp_fact.py diff --git a/tests/test_bgp_speaker.py b/tests/bgp/test_bgp_speaker.py similarity index 100% rename from tests/test_bgp_speaker.py rename to tests/bgp/test_bgp_speaker.py diff --git a/tests/test_dhcp_relay.py b/tests/dhcp_relay/test_dhcp_relay.py similarity index 100% rename from tests/test_dhcp_relay.py rename to tests/dhcp_relay/test_dhcp_relay.py diff --git a/tests/test_everflow_testbed.py b/tests/everflow/test_everflow_testbed.py similarity index 100% rename from tests/test_everflow_testbed.py rename to tests/everflow/test_everflow_testbed.py diff --git a/tests/dip_sip/test_dip_sip.py b/tests/ipfwd/test_dip_sip.py similarity index 100% rename from tests/dip_sip/test_dip_sip.py rename to tests/ipfwd/test_dip_sip.py diff --git a/tests/test_mtu.py b/tests/ipfwd/test_mtu.py similarity index 100% rename from tests/test_mtu.py rename to tests/ipfwd/test_mtu.py diff --git a/tests/test_lldp.py b/tests/lldp/test_lldp.py similarity index 100% rename from tests/test_lldp.py rename to tests/lldp/test_lldp.py diff --git a/tests/test_lag_2.py b/tests/pc/test_lag_2.py similarity index 100% rename from tests/test_lag_2.py rename to tests/pc/test_lag_2.py diff --git a/tests/test_sflow.py b/tests/sflow/test_sflow.py similarity index 100% rename from tests/test_sflow.py rename to tests/sflow/test_sflow.py diff --git a/tests/test_vxlan_decap.py b/tests/vxlan/test_vxlan_decap.py similarity index 100% rename from tests/test_vxlan_decap.py rename to tests/vxlan/test_vxlan_decap.py