Azure topology file MAC fix.

Signed-off-by: Maros Mullner <maros.mullner@pantheon.tech>
Change-Id: I7eefdb5db39a0f5328c7f1a0a0a5d57c762cc21c

diff --git a/resources/tools/terraform/azure/main.tf b/resources/tools/terraform/azure/main.tf
index cae6591..96b8065 100644 (file)
--- a/resources/tools/terraform/azure/main.tf
+++ b/resources/tools/terraform/azure/main.tf
@@ -37,8 +37,8 @@ variable "trex_dummy_cidr_port_1" {
 # Create resource group and resources
 
 resource "azurerm_resource_group" "CSIT" {
-  name     = "CSIT_pm"
-  location = "North Europe"
+  name     = "CSIT"
+  location = "East US"
 }
 
 resource "azurerm_virtual_network" "CSIT" {
@@ -360,7 +360,7 @@ resource "azurerm_virtual_machine" "tg" {
         admin_username = "ubuntu"
     }
     os_profile_linux_config {
-        disable_password_authentication = false
+        disable_password_authentication = true
         ssh_keys {
             path     = "/home/ubuntu/.ssh/authorized_keys"
             key_data = file("~/.ssh/id_rsa.pub")
@@ -398,7 +398,7 @@ resource "azurerm_virtual_machine" "dut1" {
         admin_username = "ubuntu"
     }
     os_profile_linux_config {
-        disable_password_authentication = false
+        disable_password_authentication = true
         ssh_keys {
             path     = "/home/ubuntu/.ssh/authorized_keys"
             key_data = file("~/.ssh/id_rsa.pub")
@@ -436,7 +436,7 @@ resource "azurerm_virtual_machine" "dut2" {
         admin_username = "ubuntu"
     }
     os_profile_linux_config {
-        disable_password_authentication = false
+        disable_password_authentication = true
         ssh_keys {
             path     = "/home/ubuntu/.ssh/authorized_keys"
             key_data = file("~/.ssh/id_rsa.pub")
@@ -538,13 +538,13 @@ resource "null_resource" "deploy_dut2" {
   }
 }
 
-eesource "null_resource" "deploy_topology" {
+resource "null_resource" "deploy_topology" {
   depends_on = [ azurerm_virtual_machine.tg,
                  azurerm_network_interface.tg_if1,
                  azurerm_network_interface.tg_if2,
                  azurerm_virtual_machine.dut1,
                  azurerm_network_interface.dut1_if1,
-                 azurerm_network_interface.dut1_if2
+                 azurerm_network_interface.dut1_if2,
                  azurerm_virtual_machine.dut2,
                  azurerm_network_interface.dut2_if1,
                  azurerm_network_interface.dut2_if2 ]
@@ -557,12 +557,12 @@ eesource "null_resource" "deploy_topology" {
       extra_vars = {
         ansible_python_interpreter = "/usr/bin/python3"
         cloud_topology = "azure"
-        tg_if1_mac = azurerm_network_interface.tg_if1.mac_address
-        tg_if2_mac = azurerm_network_interface.tg_if2.mac_address
-        dut1_if1_mac = azurerm_network_interface.dut1_if1.mac_address
-        dut1_if2_mac = azurerm_network_interface.dut1_if2.mac_address
-        dut2_if1_mac = azurerm_network_interface.dut2_if1.mac_address
-        dut2_if2_mac = azurerm_network_interface.dut2_if2.mac_address
+        tg_if1_mac = data.azurerm_network_interface.tg_if1.mac_address
+        tg_if2_mac = data.azurerm_network_interface.tg_if2.mac_address
+        dut1_if1_mac = data.azurerm_network_interface.dut1_if1.mac_address
+        dut1_if2_mac = data.azurerm_network_interface.dut1_if2.mac_address
+        dut2_if1_mac = data.azurerm_network_interface.dut2_if1.mac_address
+        dut2_if2_mac = data.azurerm_network_interface.dut2_if2.mac_address
         tg_public_ip = data.azurerm_public_ip.tg_public_ip.ip_address
         dut1_public_ip = data.azurerm_public_ip.dut1_public_ip.ip_address
         dut2_public_ip = data.azurerm_public_ip.dut2_public_ip.ip_address

diff --git a/resources/tools/terraform/azure/nic.tf b/resources/tools/terraform/azure/nic.tf
index c259757..8bacd4a 100644 (file)
--- a/resources/tools/terraform/azure/nic.tf
+++ b/resources/tools/terraform/azure/nic.tf
@@ -16,6 +16,12 @@ resource "azurerm_network_interface" "dut1_if2" {
     }
 }
 
+data "azurerm_network_interface" "dut1_if2" {
+  name                = "dut1_if2"
+  resource_group_name = azurerm_resource_group.CSIT.name
+  depends_on          = [ azurerm_virtual_machine.dut1 ]
+}
+
 resource "azurerm_network_interface" "dut2_if1" {
     name                      = "dut2_if1"
     location                  = azurerm_resource_group.CSIT.location
@@ -32,6 +38,12 @@ resource "azurerm_network_interface" "dut2_if1" {
     }
 }
 
+data "azurerm_network_interface" "dut2_if1" {
+  name                = "dut2_if1"
+  resource_group_name = azurerm_resource_group.CSIT.name
+  depends_on          = [ azurerm_virtual_machine.dut2 ]
+}
+
 resource "azurerm_network_interface" "dut1_if1" {
     name                      = "dut1_if1"
     location                  = azurerm_resource_group.CSIT.location
@@ -48,6 +60,12 @@ resource "azurerm_network_interface" "dut1_if1" {
     }
 }
 
+data "azurerm_network_interface" "dut1_if1" {
+  name                = "dut1_if1"
+  resource_group_name = azurerm_resource_group.CSIT.name
+  depends_on          = [ azurerm_virtual_machine.dut1 ]
+}
+
 resource "azurerm_network_interface" "dut2_if2" {
     name                      = "dut2_if2"
     location                  = azurerm_resource_group.CSIT.location
@@ -64,6 +82,12 @@ resource "azurerm_network_interface" "dut2_if2" {
     }
 }
 
+data "azurerm_network_interface" "dut2_if2" {
+  name                = "dut2_if2"
+  resource_group_name = azurerm_resource_group.CSIT.name
+  depends_on          = [ azurerm_virtual_machine.dut2 ]
+}
+
 resource "azurerm_network_interface" "tg_if1" {
     name                      = "tg_if1"
     location                  = azurerm_resource_group.CSIT.location
@@ -80,6 +104,12 @@ resource "azurerm_network_interface" "tg_if1" {
     }
 }
 
+data "azurerm_network_interface" "tg_if1" {
+  name                = "tg_if1"
+  resource_group_name = azurerm_resource_group.CSIT.name
+  depends_on          = [ azurerm_virtual_machine.tg ]
+}
+
 resource "azurerm_network_interface" "tg_if2" {
     name                      = "tg_if2"
     location                  = azurerm_resource_group.CSIT.location
@@ -96,3 +126,8 @@ resource "azurerm_network_interface" "tg_if2" {
     }
 }
 
+data "azurerm_network_interface" "tg_if2" {
+  name                = "tg_if2"
+  resource_group_name = azurerm_resource_group.CSIT.name
+  depends_on          = [ azurerm_virtual_machine.tg ]
+}

diff --git a/resources/tools/testbed-setup/ansible/templates/topology_azure.j2 b/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
index ae0ae52..df595fd 100644 (file)
--- 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