From c3303c5cd6290634a4d5918b6fad5debc9f2db76 Mon Sep 17 00:00:00 2001
From: pmikus <peter.mikus@protonmail.ch>
Date: Wed, 13 Dec 2023 10:07:49 +0000
Subject: [PATCH] fix(terraform): Character escaping

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: Ie1dae9ae9820c91eecaa565c1326fb9e6151f4dc
---
 .../topology-1n-aws-c5n.tftpl                       |  6 +++---
 .../terraform-aws-1n-c6in/topology-1n-c6in.tftpl    |  6 +++---
 .../topology-2n-aws-c5n.tftpl                       | 10 +++++-----
 .../terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl    | 12 ++++++------
 .../terraform-aws-2n-c6in/topology-2n-c6in.tftpl    | 10 +++++-----
 .../terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl    | 12 ++++++------
 .../topology-3n-aws-c5n.tftpl                       | 14 +++++++-------
 .../terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl    | 18 +++++++++---------
 .../terraform-aws-3n-c6in/topology-3n-c6in.tftpl    | 18 +++++++++---------
 .../terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl    | 21 ++++++++++-----------
 10 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl
index 1cf63d6ded..c99d1f5ebc 100644
--- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl
+++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/topology-1n-aws-c5n.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,13 +18,13 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 50GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-50G
       port2:
         # tg_instance/p2 - 50GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link1
         model: Amazon-Nitro-50G
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl
index 5e8533d1a9..dc24577bbd 100644
--- a/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl
+++ b/fdio.infra.terraform/terraform-aws-1n-c6in/topology-1n-c6in.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,13 +18,13 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 200GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-200G
       port2:
         # tg_instance/p2 - 200GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link1
         model: Amazon-Nitro-200G
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl
index 2f2a244025..313b4b3d86 100644
--- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/topology-2n-aws-c5n.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,13 +18,13 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 50GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-50G
       port2:
         # tg_instance/p2 - 50GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-50G
@@ -39,13 +39,13 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 50GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-50G
       port2:
         # dut1_instance/p2 - 50GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-50G
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl
index eb2e4107d2..a0fa5fc191 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c6gn/topology-2n-c6gn.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,19 +18,19 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # tg_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
   DUT1:
     type: DUT
-    host: ${dut1_public_ip}
+    host: "${dut1_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -39,13 +39,13 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # dut1_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl
index e81d34cb80..d012d335b6 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c6in/topology-2n-c6in.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: "${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,13 +18,13 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 200GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-200G
       port2:
         # tg_instance/p2 - 200GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-200G
@@ -39,13 +39,13 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 200GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-200G
       port2:
         # dut1_instance/p2 - 200GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-200G
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl
index eb2e4107d2..a0fa5fc191 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/topology-2n-c7gn.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,19 +18,19 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # tg_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
   DUT1:
     type: DUT
-    host: ${dut1_public_ip}
+    host: "${dut1_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -39,13 +39,13 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # dut1_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl
index 7df7cf3d86..9886b56a8d 100644
--- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/topology-3n-aws-c5n.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,13 +18,13 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 50GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-50G
       port2:
         # tg_instance/p2 - 50GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-50G
@@ -39,13 +39,13 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 50GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-50G
       port2:
         # dut1_instance/p2 - 50GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link21
         model: Amazon-Nitro-50G
@@ -60,13 +60,13 @@ nodes:
     interfaces:
       port1:
         # dut2_instance/p1 - 50GE port1 on ENA NIC.
-        mac_address: ${dut2_if1_mac}
+        mac_address: "${dut2_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link21
         model: Amazon-Nitro-50G
       port2:
         # dut2_instance/p2 - 50GE port1 on ENA NIC.
-        mac_address: ${dut2_if2_mac}
+        mac_address: "${dut2_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-50G
\ No newline at end of file
diff --git a/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl
index 4fb97d5511..dc6d869a02 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c6gn/topology-3n-c6gn.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,19 +18,19 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # tg_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
   DUT1:
     type: DUT
-    host: ${dut1_public_ip}
+    host: "${dut1_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -39,19 +39,19 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # dut1_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link21
         model: Amazon-Nitro-100G
   DUT2:
     type: DUT
-    host: ${dut2_public_ip}
+    host: "${dut2_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -60,13 +60,13 @@ nodes:
     interfaces:
       port1:
         # dut2_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${dut2_if1_mac}
+        mac_address: "${dut2_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link21
         model: Amazon-Nitro-100G
       port2:
         # dut2_instance/p2 - 100GE port1 on ENA NIC.
-        mac_address: ${dut2_if2_mac}
+        mac_address: "${dut2_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
diff --git a/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl b/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl
index e9ecfb65b5..2ec39d0ea9 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c6in/topology-3n-c6in.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,19 +18,19 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 200GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-200G
       port2:
         # tg_instance/p2 - 200GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-200G
   DUT1:
     type: DUT
-    host: ${dut1_public_ip}
+    host: "${dut1_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -39,19 +39,19 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 200GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-200G
       port2:
         # dut1_instance/p2 - 200GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link21
         model: Amazon-Nitro-200G
   DUT2:
     type: DUT
-    host: ${dut2_public_ip}
+    host: "${dut2_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -60,13 +60,13 @@ nodes:
     interfaces:
       port1:
         # dut2_instance/p1 - 200GE port1 on ENA NIC.
-        mac_address: ${dut2_if1_mac}
+        mac_address: "${dut2_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link21
         model: Amazon-Nitro-200G
       port2:
         # dut2_instance/p2 - 200GE port1 on ENA NIC.
-        mac_address: ${dut2_if2_mac}
+        mac_address: "${dut2_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-200G
diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl b/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl
index 4fb97d5511..65106da556 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl
+++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/topology-3n-c7gn.tftpl
@@ -10,7 +10,7 @@ nodes:
   TG:
     type: TG
     subtype: TREX
-    host: ${tg_public_ip}
+    host: "${tg_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -18,19 +18,19 @@ nodes:
     interfaces:
       port1:
         # tg_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${tg_if1_mac}
+        mac_address: "${tg_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # tg_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${tg_if2_mac}
+        mac_address: "${tg_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
         model: Amazon-Nitro-100G
   DUT1:
     type: DUT
-    host: ${dut1_public_ip}
+    host: "${dut1_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -39,19 +39,19 @@ nodes:
     interfaces:
       port1:
         # dut1_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${dut1_if1_mac}
+        mac_address: "${dut1_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link1
         model: Amazon-Nitro-100G
       port2:
         # dut1_instance/p2 - 100GE port2 on ENA NIC.
-        mac_address: ${dut1_if2_mac}
+        mac_address: "${dut1_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link21
         model: Amazon-Nitro-100G
   DUT2:
     type: DUT
-    host: ${dut2_public_ip}
+    host: "${dut2_public_ip}"
     arch: x86_64
     port: 22
     username: testuser
@@ -60,14 +60,13 @@ nodes:
     interfaces:
       port1:
         # dut2_instance/p1 - 100GE port1 on ENA NIC.
-        mac_address: ${dut2_if1_mac}
+        mac_address: "${dut2_if1_mac}"
         pci_address: "0000:00:06.0"
         link: link21
         model: Amazon-Nitro-100G
       port2:
         # dut2_instance/p2 - 100GE port1 on ENA NIC.
-        mac_address: ${dut2_if2_mac}
+        mac_address: "${dut2_if2_mac}"
         pci_address: "0000:00:07.0"
         link: link2
-        model: Amazon-Nitro-100G
-
+        model: Amazon-Nitro-100G
\ No newline at end of file
-- 
2.16.6