Skip to content

Commit

Permalink
[vstest] Resolve intermittent timing failure in test_fgnhg.py (#1495)
Browse files Browse the repository at this point in the history
Add polling function for ecmp group validation and use wait API for asic_db/state_db update
to resolve intermittent timing related test failure in test_fgnhg.py.
  • Loading branch information
anish-n authored Nov 3, 2020
1 parent a89b8ed commit d9ca6e2
Showing 1 changed file with 34 additions and 2 deletions.
36 changes: 34 additions & 2 deletions tests/test_fgnhg.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,37 @@ def validate_asic_nhg(asic_db, nhgid, size):
assert len(keys) == size


def validate_asic_nhg_regular_ecmp(asic_db, ipprefix):
def _access_function():
false_ret = (False, '')
keys = asic_db.get_keys(ASIC_ROUTE_TB)
key = ''
route_exists = False
for k in keys:
rt_key = json.loads(k)
if rt_key['dest'] == ipprefix:
route_exists = True
key = k
if not route_exists:
return false_ret
fvs = asic_db.get_entry(ASIC_ROUTE_TB, key)
if not fvs:
return false_ret
nhgid = fvs.get("SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID")
fvs = asic_db.get_entry("ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP", nhgid)
if not fvs:
return false_ret
nhg_type = fvs.get("SAI_NEXT_HOP_GROUP_ATTR_TYPE")
if nhg_type != "SAI_NEXT_HOP_GROUP_TYPE_DYNAMIC_UNORDERED_ECMP":
return false_ret
return (True, nhgid)
status, result = wait_for_result(_access_function, DVSDatabase.DEFAULT_POLLING_CONFIG)
if not status:
assert not polling_config.strict, \
f"SAI_NEXT_HOP_GROUP_TYPE_DYNAMIC_UNORDERED_ECMP not found"
return result


def get_nh_oid_map(asic_db):
nh_oid_map = {}
keys = asic_db.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP")
Expand Down Expand Up @@ -429,7 +460,7 @@ def test_route_fgnhg(self, dvs, testlog):

# Validate the transistion to Fine Grained ECMP
asic_db.wait_for_n_keys(ASIC_NHG_MEMB, bucket_size)
keys = asic_db.get_keys(ASIC_ROUTE_TB)
keys = asic_db.wait_for_n_keys(ASIC_ROUTE_TB, asic_routes_count + 1)
nhgid = asic_route_exists_and_is_nhg(asic_db, keys, fg_nhg_prefix)
validate_asic_nhg(asic_db, nhgid, bucket_size)

Expand All @@ -444,8 +475,9 @@ def test_route_fgnhg(self, dvs, testlog):
remove_entry(config_db, "FG_NHG_PREFIX", fg_nhg_prefix)

# Validate regular ECMP
validate_asic_nhg_regular_ecmp(asic_db, fg_nhg_prefix)
asic_db.wait_for_n_keys(ASIC_NHG_MEMB, 3)
asic_route_exists_and_is_nhg(asic_db, keys, fg_nhg_prefix)
state_db.wait_for_n_keys("FG_ROUTE_TABLE", 0)

# remove prefix entry
asic_rt_key = get_asic_route_key(asic_db, fg_nhg_prefix)
Expand Down

0 comments on commit d9ca6e2

Please sign in to comment.