allow to specify different loopback ip address in topology for multi-duts

Signed-off-by: Guohan Lu <[email protected]>

Author: lguohan

ansible/templates/minigraph_cpg.j2

@@ -44,7 +44,7 @@
 {% if 'tor' in vm_topo_config['dut_type'] | lower %}
           <BGPPeer i:type="a:BGPPeerPassive">
             <ElementType>BGPPeer</ElementType>
-            <Address>10.1.0.32</Address>
+            <Address>{{ lp_ipv4_addr }}</Address>
             <RouteMapIn i:nil="true"/>
             <RouteMapOut i:nil="true"/>
             <Vrf i:nil="true"/>
@@ -53,7 +53,7 @@
           </BGPPeer>
           <BGPPeer i:type="a:BGPPeerPassive">
             <ElementType>BGPPeer</ElementType>
-            <Address>10.1.0.32</Address>
+            <Address>{{ lp_ipv4_addr }}</Address>
             <RouteMapIn i:nil="true"/>
             <RouteMapOut i:nil="true"/>
             <Vrf i:nil="true"/>

ansible/templates/minigraph_dpg.j2

@@ -6,17 +6,17 @@
           <Name>HostIP</Name>
           <AttachTo>Loopback0</AttachTo>
           <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
-            <b:IPPrefix>10.1.0.32/32</b:IPPrefix>
+            <b:IPPrefix>{{ lp_ipv4 }}</b:IPPrefix>
           </a:Prefix>
-          <a:PrefixStr>10.1.0.32/32</a:PrefixStr>
+          <a:PrefixStr>{{ lp_ipv4 }}</a:PrefixStr>
         </a:LoopbackIPInterface>
         <a:LoopbackIPInterface>
           <Name>HostIP1</Name>
           <AttachTo>Loopback0</AttachTo>
           <a:Prefix xmlns:b="Microsoft.Search.Autopilot.Evolution">
-            <b:IPPrefix>FC00:1::32/128</b:IPPrefix>
+            <b:IPPrefix>{{ lp_ipv6 }}</b:IPPrefix>
           </a:Prefix>
-          <a:PrefixStr>FC00:1::32/128</a:PrefixStr>
+          <a:PrefixStr>{{ lp_ipv6 }}</a:PrefixStr>
         </a:LoopbackIPInterface>
       </LoopbackIPInterfaces>
       <ManagementIPInterfaces xmlns:a="http://schemas.datacontract.org/2004/07/Microsoft.Search.Autopilot.Evolution">

ansible/templates/minigraph_template.j2

@@ -1,6 +1,17 @@
 <DeviceMiniGraph xmlns="Microsoft.Search.Autopilot.Evolution" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
 {% set vms=vm_topo_config['vm'].keys() | sort %}
 {% set vms_number = vms | length %}
+{% if 'loopback' in vm_topo_config['DUT'] %}
+{% set lp_ipv4 = vm_topo_config['DUT']['loopback']['ipv4'][dut_index|int] %}
+{% set lp_ipv4_addr = lp_ipv4.split('/')[0] %}
+{% set lp_ipv6 = vm_topo_config['DUT']['loopback']['ipv6'][dut_index|int] %}
+{% set lp_ipv6_addr = lp_ipv6.split('/')[0] %}
+{% else %}
+{% set lp_ipv4 = '10.1.0.32/32' %}
+{% set lp_ipv4_addr = '10.1.0.32' %}
+{% set lp_ipv6 = 'FC00:1::32/128' %}
+{% set lp_ipv6_addr = 'FC00:1::32' %}
+{% endif %}
 {% include 'minigraph_cpg.j2' %}
 {% include 'minigraph_dpg.j2' %}
 {% include 'minigraph_png.j2' %}

ansible/vars/topo_dualtor.yml

@@ -56,6 +56,13 @@ topology:
         - "1.31@35"
       vm_offset: 3
   DUT:
+    loopback:
+      ipv4:
+        - 10.1.0.32/32
+        - 10.1.0.33/32
+      ipv6:
+        - FC00:1::32/128
+        - FC00:1::33/128
     vlan_configs:
       default_vlan_config: one_vlan_a
       one_vlan_a: