From 900fc8ba5d8aa9e0eafce2fbb64a10555618b577 Mon Sep 17 00:00:00 2001
From: Maros Mullner <maros.mullner@pantheon.tech>
Date: Mon, 15 Jun 2020 10:35:08 +0200
Subject: AWS 2n topology

Signed-off-by: Maros Mullner <maros.mullner@pantheon.tech>
Change-Id: Idc9317d3e37d9ed0a82adc273e0628a8defcfdf6
---
 .../ansible/roles/topology/tasks/main.yaml         |  2 +-
 .../ansible/templates/topology_2n_aws_c5n.j2       | 56 +++++++++++++++
 .../ansible/templates/topology_3n_aws_c5n.j2       | 83 ++++++++++++++++++++++
 .../ansible/templates/topology_3n_azure_Fsv2.j2    | 82 +++++++++++++++++++++
 .../ansible/templates/topology_aws.j2              | 83 ----------------------
 .../ansible/templates/topology_azure.j2            | 82 ---------------------
 6 files changed, 222 insertions(+), 166 deletions(-)
 create mode 100644 resources/tools/testbed-setup/ansible/templates/topology_2n_aws_c5n.j2
 create mode 100644 resources/tools/testbed-setup/ansible/templates/topology_3n_aws_c5n.j2
 create mode 100644 resources/tools/testbed-setup/ansible/templates/topology_3n_azure_Fsv2.j2
 delete mode 100644 resources/tools/testbed-setup/ansible/templates/topology_aws.j2
 delete mode 100644 resources/tools/testbed-setup/ansible/templates/topology_azure.j2

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

diff --git a/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml
index a2e67f4153..9efdc71759 100644
--- a/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/topology/tasks/main.yaml
@@ -4,6 +4,6 @@
 - name: Create topology file
   template:
     src: 'templates/topology_{{ cloud_topology }}.j2'
-    dest: '../../../../topologies/available/{{ cloud_topology }}_3n_skx_testbed.yaml'
+    dest: '../../../../topologies/available/{{ cloud_topology }}_testbed.yaml'
   tags:
     - create-topology-file
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_2n_aws_c5n.j2 b/resources/tools/testbed-setup/ansible/templates/topology_2n_aws_c5n.j2
new file mode 100644
index 0000000000..1d99a34994
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/templates/topology_2n_aws_c5n.j2
@@ -0,0 +1,56 @@
+---
+metadata:
+  version: 0.1
+  schema:
+    - resources/topology_schemas/2_node_topology.sch.yaml
+    - resources/topology_schemas/topology.sch.yaml
+  tags: [hw, 2-node]
+
+nodes:
+  TG:
+    type: TG
+    subtype: TREX
+    host: "{{ tg_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    interfaces:
+      port1:
+        # tg_instance/p1 - 50GE port1 on ENA NIC.
+        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 }}
+        pci_address: "0000:00:07.0"
+        link: link2
+        model: Amazon-Nitro-50G
+  DUT1:
+    type: DUT
+    host: "{{ dut1_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    uio_driver: vfio-pci
+    honeycomb:
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831
+    interfaces:
+      port1:
+        # dut1_instance/p1 - 50GE port1 on ENA NIC.
+        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 }}
+        pci_address: "0000:00:07.0"
+        link: link2
+        model: Amazon-Nitro-50G
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_3n_aws_c5n.j2 b/resources/tools/testbed-setup/ansible/templates/topology_3n_aws_c5n.j2
new file mode 100644
index 0000000000..631b0be63b
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/templates/topology_3n_aws_c5n.j2
@@ -0,0 +1,83 @@
+---
+metadata:
+  version: 0.1
+  schema:
+    - resources/topology_schemas/3_node_topology.sch.yaml
+    - resources/topology_schemas/topology.sch.yaml
+  tags: [hw, 3-node]
+
+nodes:
+  TG:
+    type: TG
+    subtype: TREX
+    host: "{{ tg_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    interfaces:
+      port1:
+        # tg_instance/p1 - 50GE port1 on ENA NIC.
+        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 }}
+        pci_address: "0000:00:07.0"
+        link: link2
+        model: Amazon-Nitro-50G
+  DUT1:
+    type: DUT
+    host: "{{ dut1_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    uio_driver: vfio-pci
+    honeycomb:
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831
+    interfaces:
+      port1:
+        # dut1_instance/p1 - 50GE port1 on ENA NIC.
+        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 }}
+        pci_address: "0000:00:07.0"
+        link: link21
+        model: Amazon-Nitro-50G
+  DUT2:
+    type: DUT
+    host: "{{ dut2_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    uio_driver: vfio-pci
+    honeycomb:
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831
+    interfaces:
+      port1:
+        # dut2_instance/p1 - 50GE port1 on ENA NIC.
+        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 }}
+        pci_address: "0000:00:07.0"
+        link: link2
+        model: Amazon-Nitro-50G
+
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_3n_azure_Fsv2.j2 b/resources/tools/testbed-setup/ansible/templates/topology_3n_azure_Fsv2.j2
new file mode 100644
index 0000000000..e4dd6cdbf2
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/templates/topology_3n_azure_Fsv2.j2
@@ -0,0 +1,82 @@
+---
+metadata:
+  version: 0.1
+  schema:
+    - resources/topology_schemas/3_node_topology.sch.yaml
+    - resources/topology_schemas/topology.sch.yaml
+  tags: [hw, 3-node]
+
+nodes:
+  TG:
+    type: TG
+    subtype: TREX
+    host: "{{ tg_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    interfaces:
+      port1:
+        # tg_instance/p1 - 40GE port1 on Mellanox NIC.
+        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 | lower | replace('-',':') }}"
+        pci_address: "0003:00:02.0"
+        link: link2
+        model: Azure-MLX-40G
+  DUT1:
+    type: DUT
+    host: "{{ dut1_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    uio_driver: vfio-pci
+    honeycomb:
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831
+    interfaces:
+      port1:
+        # dut1_instance/p1 - 40GE port1 on Mellanox NIC.
+        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 | lower | replace('-',':') }}"
+        pci_address: "0003:00:02.0"
+        link: link21
+        model: Azure-MLX-40G
+  DUT2:
+    type: DUT
+    host: "{{ dut2_public_ip }}"
+    arch: x86_64
+    port: 22
+    username: testuser
+    password: Csit1234
+    uio_driver: vfio-pci
+    honeycomb:
+      user: admin
+      passwd: admin
+      port: 8183
+      netconf_port: 2831
+    interfaces:
+      port1:
+        # dut1_instance/p1 - 40GE port1 on Mellanox NIC.
+        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 | lower | replace('-',':') }}"
+        pci_address: "0003:00:02.0"
+        link: link2
+        model: Azure-MLX-40G
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_aws.j2 b/resources/tools/testbed-setup/ansible/templates/topology_aws.j2
deleted file mode 100644
index 631b0be63b..0000000000
--- a/resources/tools/testbed-setup/ansible/templates/topology_aws.j2
+++ /dev/null
@@ -1,83 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - resources/topology_schemas/3_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 3-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: "{{ tg_public_ip }}"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # tg_instance/p1 - 50GE port1 on ENA NIC.
-        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 }}
-        pci_address: "0000:00:07.0"
-        link: link2
-        model: Amazon-Nitro-50G
-  DUT1:
-    type: DUT
-    host: "{{ dut1_public_ip }}"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    honeycomb:
-      user: admin
-      passwd: admin
-      port: 8183
-      netconf_port: 2831
-    interfaces:
-      port1:
-        # dut1_instance/p1 - 50GE port1 on ENA NIC.
-        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 }}
-        pci_address: "0000:00:07.0"
-        link: link21
-        model: Amazon-Nitro-50G
-  DUT2:
-    type: DUT
-    host: "{{ dut2_public_ip }}"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    honeycomb:
-      user: admin
-      passwd: admin
-      port: 8183
-      netconf_port: 2831
-    interfaces:
-      port1:
-        # dut2_instance/p1 - 50GE port1 on ENA NIC.
-        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 }}
-        pci_address: "0000:00:07.0"
-        link: link2
-        model: Amazon-Nitro-50G
-
diff --git a/resources/tools/testbed-setup/ansible/templates/topology_azure.j2 b/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
deleted file mode 100644
index e4dd6cdbf2..0000000000
--- a/resources/tools/testbed-setup/ansible/templates/topology_azure.j2
+++ /dev/null
@@ -1,82 +0,0 @@
----
-metadata:
-  version: 0.1
-  schema:
-    - resources/topology_schemas/3_node_topology.sch.yaml
-    - resources/topology_schemas/topology.sch.yaml
-  tags: [hw, 3-node]
-
-nodes:
-  TG:
-    type: TG
-    subtype: TREX
-    host: "{{ tg_public_ip }}"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    interfaces:
-      port1:
-        # tg_instance/p1 - 40GE port1 on Mellanox NIC.
-        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 | lower | replace('-',':') }}"
-        pci_address: "0003:00:02.0"
-        link: link2
-        model: Azure-MLX-40G
-  DUT1:
-    type: DUT
-    host: "{{ dut1_public_ip }}"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    honeycomb:
-      user: admin
-      passwd: admin
-      port: 8183
-      netconf_port: 2831
-    interfaces:
-      port1:
-        # dut1_instance/p1 - 40GE port1 on Mellanox NIC.
-        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 | lower | replace('-',':') }}"
-        pci_address: "0003:00:02.0"
-        link: link21
-        model: Azure-MLX-40G
-  DUT2:
-    type: DUT
-    host: "{{ dut2_public_ip }}"
-    arch: x86_64
-    port: 22
-    username: testuser
-    password: Csit1234
-    uio_driver: vfio-pci
-    honeycomb:
-      user: admin
-      passwd: admin
-      port: 8183
-      netconf_port: 2831
-    interfaces:
-      port1:
-        # dut1_instance/p1 - 40GE port1 on Mellanox NIC.
-        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 | lower | replace('-',':') }}"
-        pci_address: "0003:00:02.0"
-        link: link2
-        model: Azure-MLX-40G
-- 
cgit 1.2.3-korg