From 2db38b0335139e5397177e66dc40f94046892be1 Mon Sep 17 00:00:00 2001 From: Song GUO Date: Wed, 14 Dec 2022 04:50:07 +0800 Subject: [PATCH] [test] ensure NAT64 is enabled when running NAT64 tests (#8520) We cannot ensure NAT64 is enabled when running tests, and calling an extra nat64_set_enabled has no side-effects. --- .../border_router/nat64/test_multi_border_routers.py | 8 ++++++-- .../border_router/nat64/test_single_border_router.py | 4 +++- .../nat64/test_with_infrastructure_prefix.py | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/scripts/thread-cert/border_router/nat64/test_multi_border_routers.py b/tests/scripts/thread-cert/border_router/nat64/test_multi_border_routers.py index 8f7296dfa..e4f4b9654 100644 --- a/tests/scripts/thread-cert/border_router/nat64/test_multi_border_routers.py +++ b/tests/scripts/thread-cert/border_router/nat64/test_multi_border_routers.py @@ -107,8 +107,10 @@ class Nat64MultiBorderRouter(thread_cert.TestCase): host.start(start_radvd=False) self.simulator.go(5) - # NAT64 is enabled by default when starting BR1. br1.start() + # When feature flag is enabled, NAT64 might be disabled by default. So + # ensure NAT64 is enabled here. + br1.nat64_set_enabled(True) self.simulator.go(config.LEADER_STARTUP_DELAY) br1.bash("service bind9 stop") self.simulator.go(NAT64_PREFIX_REFRESH_DELAY) @@ -122,8 +124,10 @@ class Nat64MultiBorderRouter(thread_cert.TestCase): # Case 1. BR2 with an infrastructure prefix joins the network later and # it will add the infrastructure nat64 prefix to Network Data. # - # NAT64 is enabled by default when starting BR2. br2.start() + # When feature flag is enabled, NAT64 might be disabled by default. So + # ensure NAT64 is enabled here. + br2.nat64_set_enabled(True) self.simulator.go(config.BORDER_ROUTER_STARTUP_DELAY) self.assertEqual('router', br2.get_state()) diff --git a/tests/scripts/thread-cert/border_router/nat64/test_single_border_router.py b/tests/scripts/thread-cert/border_router/nat64/test_single_border_router.py index e62f88b88..4a69b2a93 100644 --- a/tests/scripts/thread-cert/border_router/nat64/test_single_border_router.py +++ b/tests/scripts/thread-cert/border_router/nat64/test_single_border_router.py @@ -115,8 +115,10 @@ class Nat64SingleBorderRouter(thread_cert.TestCase): host.start(start_radvd=False) self.simulator.go(5) - # NAT64 is enabled by default when starting BR. br.start() + # When feature flag is enabled, NAT64 might be disabled by default. So + # ensure NAT64 is enabled here. + br.nat64_set_enabled(True) self.simulator.go(config.LEADER_STARTUP_DELAY) br.bash("service bind9 stop") self.simulator.go(330) diff --git a/tests/scripts/thread-cert/border_router/nat64/test_with_infrastructure_prefix.py b/tests/scripts/thread-cert/border_router/nat64/test_with_infrastructure_prefix.py index cf5359c99..d0f6b2c56 100644 --- a/tests/scripts/thread-cert/border_router/nat64/test_with_infrastructure_prefix.py +++ b/tests/scripts/thread-cert/border_router/nat64/test_with_infrastructure_prefix.py @@ -74,8 +74,10 @@ class Nat64SingleBorderRouter(thread_cert.TestCase): br = self.nodes[BR] router = self.nodes[ROUTER] - # NAT64 is enabled by default when starting BR. br.start() + # When feature flag is enabled, NAT64 might be disabled by default. So + # ensure NAT64 is enabled here. + br.nat64_set_enabled(True) self.simulator.go(config.LEADER_STARTUP_DELAY) self.assertEqual('leader', br.get_state())