smoketest: T6841: fix config tests which validate migration scripts

[c-po]

Change summary

This complements commit dda428f (T6841: firewall: migrate existing VRF in zone based firewall) which provides the new configuration files after CLI was migrated.

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Code style update (formatting, renaming)
• Refactoring (no functional changes)
• Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
• Other (please describe):

Related Task(s)

• https://vyos.dev/T6841

Related PR(s)

• T6841: firewall: improve config parsing for ZBF when using VRFs and interfaces attached to VRFs #4180

How to test / Smoketest result

DEBUG - test_bgp_dmvpn_hub (__main__.TestConfigBgpDmvpnHub.test_bgp_dmvpn_hub) ...  time: 54.037
DEBUG - ok
DEBUG - test_bgp_dmvpn_spoke (__main__.TestConfigBgpDmvpnSpoke.test_bgp_dmvpn_spoke) ...  time: 83.787
DEBUG - ok
DEBUG - test_bgp_evpn_l2vpn_leaf (__main__.TestConfigBgpEvpnL2vpnLeaf.test_bgp_evpn_l2vpn_leaf) ...  time: 53.916
DEBUG - ok
DEBUG - test_bgp_evpn_l2vpn_spine (__main__.TestConfigBgpEvpnL2vpnSpine.test_bgp_evpn_l2vpn_spine) ...  time: 49.167
DEBUG - ok
DEBUG - test_bgp_evpn_l3vpn_pe_router (__main__.TestConfigBgpEvpnL3vpnPeRouter.test_bgp_evpn_l3vpn_pe_router) ...  time: 67.499
DEBUG - ok
DEBUG - test_bgp_medium_confederation (__main__.TestConfigBgpMediumConfederation.test_bgp_medium_confederation) ...  time: 40.209
DEBUG - ok
DEBUG - test_bgp_rpki (__main__.TestConfigBgpRpki.test_bgp_rpki) ...  time: 47.370
DEBUG - ok
DEBUG - test_bgp_small_internet_exchange (__main__.TestConfigBgpSmallInternetExchange.test_bgp_small_internet_exchange) ...  time: 71.176
DEBUG - ok
DEBUG - test_bgp_small_ipv4_unicast (__main__.TestConfigBgpSmallIpv4Unicast.test_bgp_small_ipv4_unicast) ...  time: 49.904
DEBUG - ok
DEBUG - test_cluster_basic (__main__.TestConfigClusterBasic.test_cluster_basic) ...  time: 29.759
DEBUG - ok
DEBUG - test_container_simple (__main__.TestConfigContainerSimple.test_container_simple) ...  time: 30.257
DEBUG - ok
DEBUG - test_dialup_router_complex (__main__.TestConfigDialupRouterComplex.test_dialup_router_complex) ...  time: 168.031
DEBUG - ok
DEBUG - test_dialup_router_medium_vpn (__main__.TestConfigDialupRouterMediumVpn.test_dialup_router_medium_vpn) ...  time: 123.099
DEBUG - ok
DEBUG - test_dialup_router_wireguard_ipv6 (__main__.TestConfigDialupRouterWireguardIpv6.test_dialup_router_wireguard_ipv6) ...  time: 172.035
DEBUG - ok
DEBUG - test_egp_igp_route_maps (__main__.TestConfigEgpIgpRouteMaps.test_egp_igp_route_maps) ...  time: 36.035
DEBUG - ok
DEBUG - test_igmp_pim_small (__main__.TestConfigIgmpPimSmall.test_igmp_pim_small) ...  time: 47.241
DEBUG - ok
DEBUG - test_ipoe_server (__main__.TestConfigIpoeServer.test_ipoe_server) ...  time: 49.054
DEBUG - ok
DEBUG - test_ipv6_disable (__main__.TestConfigIpv6Disable.test_ipv6_disable) ...  time: 48.286
DEBUG - ok
DEBUG - test_isis_small (__main__.TestConfigIsisSmall.test_isis_small) ...  time: 45.476
DEBUG - ok
DEBUG - test_nat_basic (__main__.TestConfigNatBasic.test_nat_basic) ...  time: 65.477
DEBUG - ok
DEBUG - test_ospf_simple (__main__.TestConfigOspfSimple.test_ospf_simple) ...  time: 28.751
DEBUG - ok
DEBUG - test_ospf_small (__main__.TestConfigOspfSmall.test_ospf_small) ...  time: 53.776
DEBUG - ok
DEBUG - test_pppoe_server (__main__.TestConfigPppoeServer.test_pppoe_server) ...  time: 49.312
DEBUG - ok
DEBUG - test_qos_basic (__main__.TestConfigQosBasic.test_qos_basic) ...  time: 47.206
DEBUG - ok
DEBUG - test_rip_router (__main__.TestConfigRipRouter.test_rip_router) ...  time: 50.556
DEBUG - ok
DEBUG - test_rpki_only (__main__.TestConfigRpkiOnly.test_rpki_only) ...  time: 56.227
DEBUG - ok
DEBUG - test_static_route_basic (__main__.TestConfigStaticRouteBasic.test_static_route_basic) ...  time: 27.461
DEBUG - ok
DEBUG - test_tunnel_broker (__main__.TestConfigTunnelBroker.test_tunnel_broker) ...  time: 51.324
DEBUG - ok
DEBUG - test_vpn_openconnect_sstp (__main__.TestConfigVpnOpenconnectSstp.test_vpn_openconnect_sstp) ...  time: 53.669
DEBUG - ok
DEBUG - test_vrf_basic (__main__.TestConfigVrfBasic.test_vrf_basic) ...  time: 57.971
DEBUG - ok
DEBUG - test_vrf_bgp_pppoe_underlay (__main__.TestConfigVrfBgpPppoeUnderlay.test_vrf_bgp_pppoe_underlay) ...  time: 97.454
DEBUG - ok
DEBUG - test_vrf_ospf (__main__.TestConfigVrfOspf.test_vrf_ospf) ...  time: 46.453
DEBUG - ok
DEBUG - test_wireless_basic (__main__.TestConfigWirelessBasic.test_wireless_basic) ...  time: 25.686
DEBUG - ok
DEBUG -
DEBUG - ----------------------------------------------------------------------
DEBUG - Ran 38 tests in 2487.026s
DEBUG -
DEBUG - OK
DEBUG - vyos@vyos:~$ echo EXITCODE:$?
DEBUG - echo EXITCODE:$?
 INFO - Configtest finished successfully!
 INFO - Powering off system
poweroff nowCODE:0
 INFO - Shutting down virtual machine
 INFO - Waiting for shutdown...
DEBUG - poweroff now
 INFO - Waiting for shutdown...
DEBUG - poweroff now
 INFO - VM is shut down!
 INFO - Cleaning up

Checklist:

• I have read the CONTRIBUTING document
• I have linked this PR to one or more Phabricator Task(s)
• I have run the components SMOKETESTS if applicable
• My commit headlines contain a valid Task id
• My change requires a change to the documentation
• I have updated the documentation accordingly

[github-actions]

👍
No issues in PR Title / Commit Title

[github-actions]

CI integration ❌ failed!

Details

CI logs

• CLI Smoketests (no interfaces) ❌ failed
• CLI Smoketests (interfaces only) 👍 passed
• Config tests 👍 passed
• RAID1 tests 👍 passed
• TPM tests 👍 passed