Fix Two issues when using config node as unified #20019

[eddieruan-alibaba]

Why I did it

Described in #20019

Work item tracking

• Microsoft ADO (number only):

How I did it

How to verify it

Manual run via
sonic-cfggen -d -y /etc/sonic/constants.yml -T /usr/local/sonic/frrcfgd -t /usr/share/sonic/templates/gen_frr.conf.j2,/etc/frr/frr.conf

and run it with integrated image.

Which release branch to backport (provide reason below if selected)

• 201811
• 201911
• 202006
• 202012
• 202106
• 202111
• 202205
• 202211
• 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

[kperumalbfn]

/azpw run Azure.sonic-buildimage

[kperumalbfn]

/AzurePipelines run Azure.sonic-buildimage

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[eddieruan-alibaba]

/AzurePipelines run Azure.sonic-buildimage

[azure-pipelines]

Commenter does not have sufficient privileges for PR 20020 in repo sonic-net/sonic-buildimage

[kperumalbfn]

@eddieruan-alibaba Could you update the branch and retry? Recent commits have all sanities passed.

[eddieruan-alibaba]

@eddieruan-alibaba Could you update the branch and retry? Recent commits have all sanities passed.

@kperumalbfn I still hit a failure.

The log I saw is at https://elastictest.org/scheduler/publictestplan/66da5d8f9ae803ee15b3c380?testcase=syslog%2Ftest_logrotate.py%7C%7C%7C2&type=console

which has the following error message. I don't feel this failure is related to my changes.

syslog/test_logrotate.py::test_orchagent_logrotate[vlab-03-None-1-5]
-------------------------------- live log call ---------------------------------
03:32:59 utilities.wait_until L0142 ERROR | Exception caught while checking no_pending_entries:Traceback (most recent call last):
File "/var/src/sonic-mgmt/tests/common/utilities.py", line 138, in wait_until
check_result = condition(*args, **kwargs)
File "/var/src/sonic-mgmt/tests/syslog/test_logrotate.py", line 260, in no_pending_entries
return not bool(get_pending_entries(duthost, ignore_list=ignore_list))
File "/var/src/sonic-mgmt/tests/syslog/test_logrotate.py", line 243, in get_pending_entries
pending_entries.remove(entry)
KeyError: '_ROUTE_TABLE:20c0:e9b0::/64'
, error:'_ROUTE_TABLE:20c0:e9b0::/64'
03:33:01 utilities.wait_until L0142 ERROR | Exception caught while checking