From 4bf48023f8d549cab4e99e884954947410db8f25 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 24 Mar 2022 19:45:17 +0000 Subject: [PATCH 1/2] add ipv6, ethernet interface to kvm test suite --- tests/generic_config_updater/test_eth_interface.py | 3 +++ tests/kvmtest.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/tests/generic_config_updater/test_eth_interface.py b/tests/generic_config_updater/test_eth_interface.py index d2eab838a11..954344159df 100644 --- a/tests/generic_config_updater/test_eth_interface.py +++ b/tests/generic_config_updater/test_eth_interface.py @@ -144,6 +144,9 @@ def test_toggle_pfc_asym(duthost, ensure_dut_readiness, pfc_asym): @pytest.mark.parametrize("fec", ["rs", "fc"]) def test_replace_fec(duthost, ensure_dut_readiness, fec): + if duthost.facts['platform'] == 'x86_64-kvm_x86_64-r0': + pytest.skip("Not supported on virtual switch") + json_patch = [ { "op": "replace", diff --git a/tests/kvmtest.sh b/tests/kvmtest.sh index e8dfb9f1b5e..ebbfe9e6b20 100755 --- a/tests/kvmtest.sh +++ b/tests/kvmtest.sh @@ -157,6 +157,8 @@ test_t0() { generic_config_updater/test_bgp_prefix.py \ generic_config_updater/test_bgp_speaker.py \ generic_config_updater/test_dhcp_relay.py \ + generic_config_updater/test_eth_interface.py \ + generic_config_updater/test_ipv6.py \ generic_config_updater/test_lo_interface.py \ generic_config_updater/test_portchannel_interface.py \ generic_config_updater/test_syslog.py \ From b51b525c73a7086ea693fd7af95563f1212c60be Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 5 Apr 2022 03:46:56 +0000 Subject: [PATCH 2/2] address PR comment --- .../plugins/conditional_mark/tests_mark_conditions.yaml | 9 +++++++++ tests/generic_config_updater/test_eth_interface.py | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 5a4d8f592d2..21adc362ee9 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -95,6 +95,15 @@ everflow/test_everflow_testbed.py::TestEverflowV4IngressAclIngressMirror::test_e conditions: - "asic_type=='cisco-8000'" +####################################### +##### generic_config_updater ##### +####################################### +generic_config_updater/test_eth_interface.py::test_replace_fec: + skip: + reason: 'replace_fec ethernet test is not supported on virtual switch' + conditions: + - "platform in ['x86_64-kvm_x86_64-r0']" + ####################################### ##### iface_namingmode ##### ####################################### diff --git a/tests/generic_config_updater/test_eth_interface.py b/tests/generic_config_updater/test_eth_interface.py index 954344159df..36e1e227749 100644 --- a/tests/generic_config_updater/test_eth_interface.py +++ b/tests/generic_config_updater/test_eth_interface.py @@ -142,11 +142,9 @@ def test_toggle_pfc_asym(duthost, ensure_dut_readiness, pfc_asym): delete_tmpfile(duthost, tmpfile) +@pytest.mark.device_type('physical') @pytest.mark.parametrize("fec", ["rs", "fc"]) def test_replace_fec(duthost, ensure_dut_readiness, fec): - if duthost.facts['platform'] == 'x86_64-kvm_x86_64-r0': - pytest.skip("Not supported on virtual switch") - json_patch = [ { "op": "replace",