From cafc2c4349638cb7b5d63e46754505256722c28b Mon Sep 17 00:00:00 2001
From: Maros Mullner <maros.mullner@pantheon.tech>
Date: Tue, 3 Mar 2020 11:32:36 +0100
Subject: Azure topology file MAC fix.

Signed-off-by: Maros Mullner <maros.mullner@pantheon.tech>
Change-Id: I7eefdb5db39a0f5328c7f1a0a0a5d57c762cc21c
---
 .../testbed-setup/ansible/templates/topology_azure.j2      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'resources/tools/testbed-setup/ansible')

diff --git a/resources/tools/testbed-setup/ansible/templates/topology_azure.j2 b/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
index ae0ae5295b..df595fd4b8 100644
--- a/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
+++ b/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
@@ -18,13 +18,13 @@ 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
       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
@@ -44,14 +44,14 @@ 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
       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
   DUT2:
@@ -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
       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
-- 
cgit 1.2.3-korg