From 7e8c6d6f7d97ea3dcf8c14adc31bb5e6c6c42d13 Mon Sep 17 00:00:00 2001
From: Serhiy Boiko <serhiy.boiko@plvision.eu>
Date: Tue, 2 May 2023 12:00:37 +0000
Subject: [PATCH] Fix nei test

Signed-off-by: Serhiy Boiko <serhiy.boiko@plvision.eu>
---
 .../functional/ipv6/test_ipv6_nei.py          | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/ipv6/test_ipv6_nei.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/ipv6/test_ipv6_nei.py
index c7fc34d50..f5b1346b7 100644
--- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/ipv6/test_ipv6_nei.py
+++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/ipv6/test_ipv6_nei.py
@@ -148,7 +148,10 @@ async def test_ipv6_nei_ageing(testbed):
     })
 
     expected_routes = [
-        {'dev': info.swp, 'dst': info.swp_ip[:-1] + f'/{info.plen}', 'flags': ['rt_trap']}
+        {'dev': info.swp,
+         'dst': info.swp_ip[:-1] + f'/{info.plen}',
+         'should_exist': True,
+         'flags': ['rt_trap']}
         for info in address_map
     ]
     await verify_dut_routes(dent, expected_routes)
@@ -294,10 +297,11 @@ async def test_ipv6_nei_ageing(testbed):
         {'dev': info.swp, 'dst': info.tg_ip, 'should_exist': True, 'state': 'STALE'}
         for info in address_map
     ]
-    await wait_for_nei_state(dent_dev, expected)
+    await wait_for_nei_state(dent_dev, expected, poll_interval=nei_update_time_s)
     elapsed = time.time() - start
-    assert elapsed < base_reach_time_s*1.5 + gc_interval_s*2, \
-        f'Expected neighbors to be STALE after no more than {base_reach_time_s*1.5 + gc_interval_s-2 = }s, ' + \
+    expected_time = base_reach_time_s*1.5 + gc_interval_s*2 + nei_update_time_s
+    assert elapsed < expected_time, \
+        f'Expected neighbors to be STALE after no more than {expected_time}s, ' + \
         f'but waited for {elapsed // 1}s'
 
     # 3.5 Check that neighbor entries are aged only on the first port
@@ -307,8 +311,9 @@ async def test_ipv6_nei_ageing(testbed):
     ]
     await wait_for_nei_state(dent_dev, expected, timeout=gc_stale_time_s + gc_interval_s*2)
     elapsed = time.time() - start
-    assert elapsed < gc_stale_time_s + gc_interval_s*2, \
-        f'Expected neighbors to be STALE/aged after no more than {gc_stale_time_s + gc_interval_s*2 = }s, ' + \
+    expected_time = gc_stale_time_s + gc_interval_s*2 + nei_update_time_s
+    assert elapsed < expected_time, \
+        f'Expected neighbors to be STALE/aged after no more than {expected_time}s, ' + \
         f'but waited for {elapsed // 1}s'
 
     # 3.6 Check that neighbor entries on the second port are aged in the next time window
@@ -318,6 +323,7 @@ async def test_ipv6_nei_ageing(testbed):
     ]
     await wait_for_nei_state(dent_dev, expected)
     elapsed = time.time() - start
-    assert elapsed < gc_stale_time_s + gc_interval_s*3, \
-        f'Expected neighbors to be aged after no more than {gc_stale_time_s + gc_interval_s*3 = }s, ' + \
+    expected_time = gc_stale_time_s + gc_interval_s*3
+    assert elapsed < expected_time, \
+        f'Expected neighbors to be aged after no more than {expected_time}s, ' + \
         f'but waited for {elapsed // 1}s'