Skip to content

test_radv_ipv6_ra is unnecessarily skipped on non-dualtor topology #9048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangxin merged 3 commits into from
Aug 4, 2023
Merged

test_radv_ipv6_ra is unnecessarily skipped on non-dualtor topology #9048

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de58f3d
Dualtor fixture cable_type caused unnecessary skip on non-dualtor topo
wangxin Jul 20, 2023
a7976a0
Use toggle_all_simulator_ports_to_rand_selected_tor_m and rand_one_du…
wangxin Jul 24, 2023
def2618
Fix style issue
wangxin Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 49 additions & 60 deletions tests/radv/test_radv_ipv6_ra.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
from tests.common.fixtures.ptfhost_utils import run_garp_service # noqa F401
from tests.common.fixtures.ptfhost_utils import run_icmp_responder # noqa F401
from tests.common.dualtor.dual_tor_mock import mock_server_base_ip_addr # noqa F401
from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_upper_tor # noqa F401
from tests.common.dualtor.dual_tor_common import cable_type # noqa F401
from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_rand_selected_tor_m # noqa F401
from tests.common.helpers.assertions import pytest_assert
from tests.ptf_runner import ptf_runner

Expand All @@ -23,16 +22,14 @@
RADV_MIN_RA_INTERVAL_SECS = 3
RADV_MAX_RA_INTERVAL_SECS = 4

"""
@summary: This fixture collects the data related to downlink VLAN port(s) and
the connected PTF port(s) required to setup the RADV tests

"""


@pytest.fixture(scope="module", autouse=True)
def radv_test_setup(request, duthosts, ptfhost, tbinfo):
duthost = duthosts[0]
def radv_test_setup(duthosts, rand_one_dut_hostname, ptfhost, tbinfo):
"""
@summary: This fixture collects the data related to downlink VLAN port(s) and
the connected PTF port(s) required to setup the RADV tests
"""
duthost = duthosts[rand_one_dut_hostname]
logging.info("radv_test_setup() DUT {}".format(duthost.hostname))
mg_facts = duthost.get_extended_minigraph_facts(tbinfo)

Expand Down Expand Up @@ -75,27 +72,22 @@ def radv_test_setup(request, duthosts, ptfhost, tbinfo):
return vlan_interfaces_list


"""
@summary: Updates min/max RA interval in RADVd's config file

"""


def dut_update_ra_interval(duthost, ra, interval):
"""
@summary: Updates min/max RA interval in RADVd's config file
"""
logging.info("Updating %s to %d in RADVd's config file:%s", ra, int(interval), RADV_CONF_FILE)
cmd = "sed -ie 's/\(.*\)\({}\) \([[:digit:]]\+\)/\\1\\2 {}/' {}".format(ra, interval, RADV_CONF_FILE) # noqa W605
duthost.shell("docker exec radv {}".format(cmd))


"""
@summary: A fixture that updates the RADVd's periodic RA update intervals and restores the
intervals to old values after the test

"""


@pytest.fixture
def dut_update_radv_periodic_ra_interval(duthost):
def dut_update_radv_periodic_ra_interval(duthosts, rand_one_dut_hostname):
"""
@summary: A fixture that updates the RADVd's periodic RA update intervals and restores the
intervals to old values after the test
"""
duthost = duthosts[rand_one_dut_hostname]
pytest_assert(duthost.is_service_fully_started('radv'), "radv service not running")

cmd = 'docker exec radv [ -f {} ] && echo "1" || echo "0"'.format(RADV_CONF_FILE)
Expand All @@ -119,18 +111,16 @@ def dut_update_radv_periodic_ra_interval(duthost):
logging.info("Successfully restored RADVd's config back to original")


"""
@summary: Test validates the RADVd's periodic router advertisement sent on each VLAN interface

"""


def test_radv_router_advertisement(
request, tbinfo,
duthost, ptfhost,
radv_test_setup,
duthosts, rand_one_dut_hostname,
ptfhost, radv_test_setup,
dut_update_radv_periodic_ra_interval,
toggle_all_simulator_ports_to_upper_tor): # noqa F811
toggle_all_simulator_ports_to_rand_selected_tor_m # noqa F811
):
"""
@summary: Test validates the RADVd's periodic router advertisement sent on each VLAN interface
"""
duthost = duthosts[rand_one_dut_hostname]
for vlan_intf in radv_test_setup:
# Run the RADV test on the PTF host
logging.info("Verifying RA on VLAN intf:%s with TOR's mapped PTF port:eth%s",
Expand All @@ -148,14 +138,15 @@ def test_radv_router_advertisement(
log_file="/tmp/radv_ipv6_ra_test.RadvUnSolicitedRATest.log", is_python3=True)


"""
@summary: Test validates the RADVd's solicited router advertisement sent on each VLAN interface

"""


def test_solicited_router_advertisement(request, tbinfo, ptfhost, duthost, radv_test_setup,
toggle_all_simulator_ports_to_upper_tor): # noqa F811
def test_solicited_router_advertisement(
duthosts, rand_one_dut_hostname,
ptfhost, radv_test_setup,
toggle_all_simulator_ports_to_rand_selected_tor_m # noqa F811
):
"""
@summary: Test validates the RADVd's solicited router advertisement sent on each VLAN interface
"""
duthost = duthosts[rand_one_dut_hostname]
for vlan_intf in radv_test_setup:
# Run the RADV solicited RA test on the PTF host
logging.info("Verifying solicited RA on VLAN intf:%s with TOR's mapped PTF port:eth%s",
Expand All @@ -174,18 +165,15 @@ def test_solicited_router_advertisement(request, tbinfo, ptfhost, duthost, radv_
log_file="/tmp/radv_ipv6_ra_test.RadvSolicitedRATest.log", is_python3=True)


"""
@summary: Test validates the M flag in RADVd's periodic router advertisement sent on each VLAN interface

"""


def test_unsolicited_router_advertisement_with_m_flag(
request, tbinfo,
duthost, ptfhost,
radv_test_setup,
toggle_all_simulator_ports_to_upper_tor, # noqa F811
duthosts, rand_one_dut_hostname,
ptfhost, radv_test_setup,
toggle_all_simulator_ports_to_rand_selected_tor_m # noqa F811
):
"""
@summary: Test validates the M flag in RADVd's periodic router advertisement sent on each VLAN interface
"""
duthost = duthosts[rand_one_dut_hostname]
for vlan_intf in radv_test_setup:
# Run the RADV test on the PTF host
logging.info("Verifying RA on VLAN intf:%s with TOR's mapped PTF port:eth%s",
Expand All @@ -203,14 +191,15 @@ def test_unsolicited_router_advertisement_with_m_flag(
log_file="/tmp/router_adv_mflag_test.RadvUnSolicitedRATest.log", is_python3=True)


"""
@summary: Test validates the M flag in RADVd's solicited router advertisement sent on each VLAN interface

"""


def test_solicited_router_advertisement_with_m_flag(request, tbinfo, ptfhost, duthost, radv_test_setup,
toggle_all_simulator_ports_to_upper_tor): # noqa F811
def test_solicited_router_advertisement_with_m_flag(
duthosts, rand_one_dut_hostname,
ptfhost, radv_test_setup,
toggle_all_simulator_ports_to_rand_selected_tor_m # noqa F811
):
"""
@summary: Test validates the M flag in RADVd's solicited router advertisement sent on each VLAN interface
"""
duthost = duthosts[rand_one_dut_hostname]
for vlan_intf in radv_test_setup:
# Run the RADV solicited RA test on the PTF host
logging.info("Verifying solicited RA on VLAN intf:%s with TOR's mapped PTF port:eth%s",
Expand Down