ospfd: fix internal ldp-sync state flags when feature is disabled

[c-po]

When enabling "mpls ldp-sync" under "router ospf" ospfd configures SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_IF_CONFIG) so internally knowing that the ldp-sync feature is enabled. However the flag is not cleared when turning of the feature using "nompls ldp-sync"!

Closes #16375

Please backup this to stable/10.0 and stable/9.1

[mjstapp]

thanks, looks good

[mjstapp]

@Mergifyio backport dev/10.1 stable/10.0 stable/9.1 stable/9.0

[mergify]

backport dev/10.1 stable/10.0 stable/9.1 stable/9.0

✅ Backports have been created

• #16443 ospfd: fix internal ldp-sync state flags when feature is disabled (backport #16376) has been created for branch dev/10.1
• #16444 ospfd: fix internal ldp-sync state flags when feature is disabled (backport #16376) has been created for branch stable/10.0
• #16445 ospfd: fix internal ldp-sync state flags when feature is disabled (backport #16376) has been created for branch stable/9.1
• #16446 ospfd: fix internal ldp-sync state flags when feature is disabled (backport #16376) has been created for branch stable/9.0

[mjstapp]

Looks like there are CI test problems, some look suspicious. Please look into the test results.

[c-po]

Rebased on current master so Topotests can re-run. I see no issues with the tests. Local run shows: 443 passed, 3 skipped in 9.41s

[mjstapp]

Please look at the failures in the "checks" tab - there are errors reported in ldp-sync topotests, it appears.

Rebased on current master so Topotests can re-run. I see no issues with the tests. Local run shows: 443 passed, 3 skipped in 9.41s

[riw777]

looks good

[riw777]

failure looks related :-(

rname = 'r2', command = 'show ip ospf mpls ldp-sync json'
reference = 'show_ospf_ldp_sync.ref'

    def router_compare_json_output(rname, command, reference):
        "Compare router JSON output"
    
        logger.info('Comparing router "%s" "%s" output', rname, command)
    
        tgen = get_topogen()
        filename = "{}/{}/{}".format(CWD, rname, reference)
        expected = json.loads(open(filename).read())
    
        # Run test function until we get an result.
        test_func = partial(topotest.router_json_cmp, tgen.gears[rname], command, expected)
        _, diff = topotest.run_and_expect(test_func, None, count=320, wait=0.5)
        assertmsg = '"{}" JSON output mismatches the expected result'.format(rname)
>       assert diff is None, assertmsg
E       AssertionError: "r2" JSON output mismatches the expected result
E       assert Generated JSON diff error report:
E         
E         > $->r2-eth2->ldpIgpSyncEnabled: output has element with value 'True' but in expected it has value 'False'
E         > $->r2-eth2->ldpIgpSyncState: output has element with value 'Sync achieved' but in expected it has value 'Sync not required'

[c-po]

failure looks related :-(

Topotests adjusted

[email protected]:~/frr/tests/topotests$ sudo -E pytest ldp_sync_ospf_topo1
==================================================================== test session starts ====================================================================
platform linux -- Python 3.11.2, pytest-7.2.1, pluggy-1.0.0+repack
rootdir: /home/cpo/frr/tests/topotests, configfile: pytest.ini
collected 14 items

ldp_sync_ospf_topo1/test_ldp_sync_ospf_topo1.py .............s                                                                                        [100%]

----------------------------------------------------- generated xml file: /tmp/topotests/topotests.xml ------------------------------------------------------
========================================================= 13 passed, 1 skipped in 100.13s (0:01:40) =========================================================

[c-po]

Anything missing on my side to continue with the PR?