Refactor(eos_designs): structured_config for network_services router_…

…bgp (aristanetworks#4961)

Co-authored-by: Guillaume Mulocher <[email protected]>

ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-interfaces-point-to-point-services-4.yml

@@ -28,6 +28,7 @@ tenants:
   - name: TENANT
     vrfs:
       - name: TEST
+        vrf_id: 1  # Only set to avoid the general VRF code triggering other errors.
         l3_interfaces:
           - nodes: ["duplicate-interfaces-point-to-point-services-4", "some_other_device"]
             interfaces: ["Ethernet6.1000", "some_other_interface"]

ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-peer-ip-address-network-services.yml

@@ -34,5 +34,5 @@ tenants:
             nodes: [ duplicate-peer-ip-address-network-services ]
 
 expected_error_message: >-
-  Found duplicate objects with conflicting data while generating configuration for BGP peer defined under VRFs.
+  Found duplicate objects with conflicting data while generating configuration for Neighbors.
   {'ip_address': '2.2.2.2', 'peer_group': 'Tenant_C_BGP_PEER_GROUP2'} conflicts with {'ip_address': '2.2.2.2', 'peer_group': 'Tenant_C_BGP_PEER_GROUP'}.

ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/duplicate-vrfs-id-conflict.yml

@@ -48,7 +48,8 @@ tenants:
             ip_address_virtual: 10.0.100.1/24
 
 expected_error_message: >-
-  Found duplicate objects with conflicting data while generating configuration for BGP VRFs defined under network services.
+  Found duplicate objects with conflicting data while generating configuration for Vrfs.
   {'name': 'VRF1', 'rd': '192.168.255.101:1', 'route_targets': {'import': [{'address_family': 'evpn', 'route_targets': ['1:1']}],
-  'export': [{'address_family': 'evpn', 'route_targets': ['1:1']}]}} conflicts with {'name': 'VRF1', 'rd': '192.168.255.101:2', 'route_targets':
-  {'import': [{'address_family': 'evpn', 'route_targets': ['2:2']}], 'export': [{'address_family': 'evpn', 'route_targets': ['2:2']}]}}.
+  'export': [{'address_family': 'evpn', 'route_targets': ['1:1']}]}, 'router_id': '192.168.255.101', 'redistribute': {'connected': {'enabled': True}}}
+  conflicts with {'name': 'VRF1', 'rd': '192.168.255.101:2', 'route_targets': {'import': [{'address_family': 'evpn', 'route_targets': ['2:2']}],
+  'export': [{'address_family': 'evpn', 'route_targets': ['2:2']}]}, 'router_id': '192.168.255.101', 'redistribute': {'connected': {'enabled': True}}}.

ansible_collections/arista/avd/molecule/eos_designs_negative_unit_tests/inventory/host_vars/failure-duplicate-evpn-vlan-bundle-name.yml

@@ -45,7 +45,8 @@ evpn_vlan_bundles:
     id: 1
 
 expected_error_message: >-
-  Found duplicate objects with conflicting data while generating configuration for BGP VLAN-Aware Bundles
-  defined under network services. A common reason is that an 'l2vlan' name overlaps with an 'evpn_vlan_bundle' name.
-  {'name': 'bundle1', 'rd': '10.10.0.3:10010', 'route_targets': {'both': ['10010:10010']}, 'tenant': 'StorageProd', 'vlan': '10'}
-  conflicts with {'name': 'bundle1', 'rd': '10.10.0.3:1', 'route_targets': {'both': ['1:1']}, 'tenant': None, 'vlan': '50,60'}.
+  Found duplicate objects with conflicting data while generating configuration for VlanAwareBundles.
+  {'name': 'bundle1', 'tenant': 'StorageProd', 'rd': '10.10.0.3:10010', 'route_targets': {'both': ['10010:10010']},
+  'redistribute_routes': ['learned'], 'vlan': '10'}
+  conflicts with
+  {'name': 'bundle1', 'rd': '10.10.0.3:1', 'route_targets': {'both': ['1:1']}, 'redistribute_routes': ['learned'], 'vlan': '50,60'}.