From c055c10a9a1362a96687614d4478dd2773e6ddc0 Mon Sep 17 00:00:00 2001 From: Simon Lin Date: Fri, 17 Jun 2022 10:42:10 +0800 Subject: [PATCH] [routing-manager] self-generated OMR prefix to use `P_preference=Low` (#7802) --- src/core/border_router/routing_manager.cpp | 4 ++-- .../thread-cert/border_router/test_manual_omr_prefix.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/border_router/routing_manager.cpp b/src/core/border_router/routing_manager.cpp index 4dfa0fcd3..dfdf971fa 100644 --- a/src/core/border_router/routing_manager.cpp +++ b/src/core/border_router/routing_manager.cpp @@ -434,7 +434,7 @@ void RoutingManager::EvaluateOmrPrefix(OmrPrefixArray &aNewOmrPrefixes) localOmrEntry = aNewOmrPrefixes.PushBack(); VerifyOrExit(localOmrEntry != nullptr); - localOmrEntry->Init(mLocalOmrPrefix, NetworkData::kRoutePreferenceMedium); + localOmrEntry->Init(mLocalOmrPrefix, NetworkData::kRoutePreferenceLow); } else if (favoredOmrEntry == localOmrEntry) { @@ -475,7 +475,7 @@ Error RoutingManager::PublishLocalOmrPrefix(void) omrPrefixConfig.mPreferred = true; omrPrefixConfig.mOnMesh = true; omrPrefixConfig.mDefaultRoute = false; - omrPrefixConfig.mPreference = NetworkData::kRoutePreferenceMedium; + omrPrefixConfig.mPreference = NetworkData::kRoutePreferenceLow; error = Get().AddOnMeshPrefix(omrPrefixConfig); if (error != kErrorNone) diff --git a/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py b/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py index 043a37128..259ce0023 100644 --- a/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py +++ b/tests/scripts/thread-cert/border_router/test_manual_omr_prefix.py @@ -82,11 +82,11 @@ class ManualOmrsPrefix(thread_cert.TestCase): self.assertEqual(br1.get_netdata_omr_prefixes(), [br1.get_br_omr_prefix()]) # Add a smaller OMR prefix. Verify BR_1 withdraws its OMR prefix. - self._test_manual_omr_prefix('2001::/64', 'paros', expect_withdraw=True) + self._test_manual_omr_prefix('2001::/64', 'paros', expect_withdraw=True, prf='low') # Add a bigger OMR prefix. Verify BR_1 does not withdraw its OMR prefix. - self._test_manual_omr_prefix('fdff:ffff:1::/64', 'paros', expect_withdraw=False, prf='med') + self._test_manual_omr_prefix('fdff:ffff:1::/64', 'paros', expect_withdraw=False, prf='low') # Add a high preference bigger OMR prefix. Verify BR_1 withdraws its OMR prefix. - self._test_manual_omr_prefix('fdff:ffff:2::/64', 'paros', expect_withdraw=True, prf='high') + self._test_manual_omr_prefix('fdff:ffff:2::/64', 'paros', expect_withdraw=True, prf='med') # Add a smaller but invalid OMR prefix (P_on_mesh = 0). Verify BR_1 does not withdraw its OMR prefix. self._test_manual_omr_prefix('2002::/64', 'pars', expect_withdraw=False) # Add a smaller but invalid OMR prefix (P_stable = 0). Verify BR_1 does not withdraw its OMR prefix.