updates for MCFG (netascode#428)

Author: juburnet

templates/nd/tests/config/overlay/networks.robot

@@ -133,7 +133,7 @@ Verify Network {{ network.name }} Attachments
     ${d_normalized}=    Evaluate    [str(__import__('ipaddress').ip_address(ip)) for ip in ${d_value}]
     Lists Should Be Equal   ${r_normalized}   ${d_normalized}   ignore_order=True
 
-{% elif vxlan.fabric.type == "MSD" %}
+{% elif vxlan.fabric.type == "MSD" or vxlan.fabric.type == "MCFG" %}
     ${r_value}=   Get Value From Json   ${r_networks_attachments.json()}   $[*].lanAttachList[?(@.networkName=="{{ network.name }}" & @.lanAttachState=="DEPLOYED")].switchName
     {% set switches = (vxlan.multisite.overlay | default() | json_query(query))[0] %}
 

templates/nd/tests/config/overlay/vrfs.robot

@@ -109,8 +109,8 @@ Verify VRF {{ vrf.name }} Attachments
     ${d_normalized}=    Evaluate    [str(__import__('ipaddress').ip_address(ip)) for ip in ${d_value}]
     Lists Should Be Equal   ${r_normalized}   ${d_normalized}   ignore_order=True
 
-{% elif vxlan.fabric.type == "MSD" %}
-# In MSD we don't know IP address instead use switchName to compare
+{% elif vxlan.fabric.type == "MSD" or vxlan.fabric.type == "MCFG" %}
+# In MSD/MCFG we don't know IP address instead use switchName to compare
     ${r_value}=   Get Value From Json   ${r_vrfs_attachments.json()}   $[*][?(@.vrfName=="{{ vrf.name }}" & @.lanAttachState=="DEPLOYED")].switchName
     {% set switches = (vxlan.multisite.overlay | default() | json_query(query))[0] %}