NAT44-EI traffic profiles fix.

[csit.git] / resources / tools / testbed-setup / ansible / templates / topology_azure.j2

diff --git a/resources/tools/testbed-setup/ansible/templates/topology_azure.j2 b/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
index ef8b22e..e4dd6cd 100644 (file)
--- a/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
+++ b/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: "{{ ansible_default_ipv4.address }}"
+    host: "{{ tg_public_ip }}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,19 +18,19 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 40GE port1 on Mellanox NIC.
-        mac_address: {{ tg_if1_mac }}
+        mac_address: "{{ tg_if1_mac | lower | replace('-',':') }}"
         pci_address: "0002:00:02.0"
         link: link1
-        model: azure-mlx-40g
+        model: Azure-MLX-40G
       port2:
         # tg_instance/p2 - 40GE port2 on Mellanox NIC.
-        mac_address: {{ tg_if2_mac }}
+        mac_address: "{{ tg_if2_mac | lower | replace('-',':') }}"
         pci_address: "0003:00:02.0"
         link: link2
-        model: azure-mlx-40g
+        model: Azure-MLX-40G
   DUT1:
     type: DUT
-    host: "{{ ansible_default_ipv4.address }}"
+    host: "{{ dut1_public_ip }}"
     arch: x86_64
     port: 22
     username: testuser
@@ -44,19 +44,19 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 40GE port1 on Mellanox NIC.
-        mac_address: {{ dut1_if1_mac }}
+        mac_address: "{{ dut1_if1_mac | lower | replace('-',':') }}"
         pci_address: "0002:00:02.0"
         link: link1
-        model: azure-mlx-40g
+        model: Azure-MLX-40G
       port2:
         # dut2_instance/p1 - 40GE port2 on Mellanox NIC.
-        mac_address: {{ dut1_if2_mac }}
-        pci_address: "0002:00:03.0"
+        mac_address: "{{ dut1_if2_mac | lower | replace('-',':') }}"
+        pci_address: "0003:00:02.0"
         link: link21
-        model: azure-mlx-40g
+        model: Azure-MLX-40G
   DUT2:
     type: DUT
-    host: "{{ ansible_default_ipv4.address }}"
+    host: "{{ dut2_public_ip }}"
     arch: x86_64
     port: 22
     username: testuser
@@ -70,13 +70,13 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 40GE port1 on Mellanox NIC.
-        mac_address: {{ dut2_if1_mac }}
+        mac_address: "{{ dut2_if1_mac | lower | replace('-',':') }}"
         pci_address: "0002:00:02.0"
         link: link21
-        model: azure-mlx-40g
+        model: Azure-MLX-40G
       port2:
         # dut2_instance/p1 - 40GE port2 on Mellanox NIC.
-        mac_address: {{ dut2_if2_mac }}
+        mac_address: "{{ dut2_if2_mac | lower | replace('-',':') }}"
         pci_address: "0003:00:02.0"
         link: link2
-        model: azure-mlx-40g
+        model: Azure-MLX-40G