From ad8149cc4fc9f5a703f5cffd5557abc0874d4d50 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 25 Mar 2022 14:15:25 +0100 Subject: refactor(terraform): 2n_aws_c5n Signed-off-by: Peter Mikus Change-Id: I5f68fd84a9ea034c5d8ff175807033aa0b60d5a2 --- fdio.infra.ansible/roles/topology/tasks/main.yaml | 4 +- .../roles/topology/templates/hosts.j2 | 2 +- .../topology/templates/topology-2n-aws-c5n.j2 | 56 +++++++++++++++ .../topology/templates/topology-3n-aws-c5n.j2 | 83 ++++++++++++++++++++++ .../topology/templates/topology_2n_aws_c5n.j2 | 56 --------------- .../topology/templates/topology_3n_aws_c5n.j2 | 83 ---------------------- 6 files changed, 142 insertions(+), 142 deletions(-) create mode 100644 fdio.infra.ansible/roles/topology/templates/topology-2n-aws-c5n.j2 create mode 100644 fdio.infra.ansible/roles/topology/templates/topology-3n-aws-c5n.j2 delete mode 100644 fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2 delete mode 100644 fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2 (limited to 'fdio.infra.ansible') diff --git a/fdio.infra.ansible/roles/topology/tasks/main.yaml b/fdio.infra.ansible/roles/topology/tasks/main.yaml index a70107478e..4f94060cad 100644 --- a/fdio.infra.ansible/roles/topology/tasks/main.yaml +++ b/fdio.infra.ansible/roles/topology/tasks/main.yaml @@ -3,8 +3,8 @@ - name: Create Topology File template: - src: "templates/topology_{{ cloud_topology }}.j2" - dest: "../topologies/available/{{ cloud_topology }}_{{ testbed_name }}.yaml" + src: "templates/topology-{{ cloud_topology }}.j2" + dest: "../topologies/available/{{ cloud_topology }}-{{ testbed_name }}.yaml" tags: - create-topology-file diff --git a/fdio.infra.ansible/roles/topology/templates/hosts.j2 b/fdio.infra.ansible/roles/topology/templates/hosts.j2 index 12a992dfec..f02586cc99 100644 --- a/fdio.infra.ansible/roles/topology/templates/hosts.j2 +++ b/fdio.infra.ansible/roles/topology/templates/hosts.j2 @@ -5,5 +5,5 @@ all: {{ tg_public_ip }} sut: hosts: - {{ dut1_public_ip }} + {{ dut1_public_ip | default() }} {{ dut2_public_ip | default() }} diff --git a/fdio.infra.ansible/roles/topology/templates/topology-2n-aws-c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology-2n-aws-c5n.j2 new file mode 100644 index 0000000000..1d99a34994 --- /dev/null +++ b/fdio.infra.ansible/roles/topology/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/fdio.infra.ansible/roles/topology/templates/topology-3n-aws-c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology-3n-aws-c5n.j2 new file mode 100644 index 0000000000..631b0be63b --- /dev/null +++ b/fdio.infra.ansible/roles/topology/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/fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2 deleted file mode 100644 index 1d99a34994..0000000000 --- a/fdio.infra.ansible/roles/topology/templates/topology_2n_aws_c5n.j2 +++ /dev/null @@ -1,56 +0,0 @@ ---- -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/fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2 b/fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.j2 deleted file mode 100644 index 631b0be63b..0000000000 --- a/fdio.infra.ansible/roles/topology/templates/topology_3n_aws_c5n.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 - -- cgit 1.2.3-korg