diff --git a/ansible/library/port_alias.py b/ansible/library/port_alias.py index d626c07cbe1..0bb19afb8cd 100755 --- a/ansible/library/port_alias.py +++ b/ansible/library/port_alias.py @@ -194,9 +194,9 @@ def _get_portmap_from_json(self, platform_json_path, asic_id=None, include_inter if index != '-1': indexmap[index] = name - if include_internal and card_type == "linecard": + if include_internal and (card_type == "linecard" or card_type == "ut2"): aliases.append(("Cpu0/{}".format(asic_id if asic_id is not None else 0), -1)) - if asic_id is not None and card_type == "linecard": + if asic_id is not None and (card_type == "linecard" or card_type == "ut2"): asic_if_names["Cpu0/{}".format(asic_id)] = "Cpu0" asic_if_ids["Cpu0/{}".format(asic_id)] = "ASIC" + str(asic_id) diff --git a/ansible/testbed_config_vchassis.yml b/ansible/testbed_config_vchassis.yml index cab76eecd6f..2f7190cebba 100644 --- a/ansible/testbed_config_vchassis.yml +++ b/ansible/testbed_config_vchassis.yml @@ -14,6 +14,10 @@ fail: msg="Define topo variable with -e topo=something" when: topo is not defined + - name: Check that topo is not single node "t2" + meta: end_play + when: topo == "t2_single_node_min" + - set_fact: base_topo: "{{ topo.split('_') | first }}" diff --git a/ansible/veos_vtb b/ansible/veos_vtb index 331e236e1cb..8dae066b6ff 100644 --- a/ansible/veos_vtb +++ b/ansible/veos_vtb @@ -43,6 +43,7 @@ all: - t2 - t2_2lc_min_ports-masic - t2_2lc_min_ports + - t2-single-node-min - m1-48 - m1-44 - m1-108 @@ -89,6 +90,7 @@ all: vlab-t2-1-1: vlab-t2-1-2: vlab-t2-1-sup: + vlab-ut2: vlab-c-02: vlab-vpp-01: vlab-vpp-02: @@ -287,6 +289,18 @@ all: card_type: supervisor slot_num: slot0 switch_type: dummy-sup + vlab-ut2: + ansible_host: 10.250.0.150 + ansible_hostv6: fec0::ffff:afa:16 + type: kvm + hwsku: NH-5010-F-O64 + switch_type: voq + num_asics: 1 + card_type: ut2 + serial_port: 9050 + switchids: [0] + ansible_password: password + ansible_user: admin vlab-09: ansible_host: 10.250.0.115 ansible_hostv6: fec0::ffff:afb:1 diff --git a/ansible/vtestbed.yaml b/ansible/vtestbed.yaml index a3cdf022d27..f6d1b3b3d33 100644 --- a/ansible/vtestbed.yaml +++ b/ansible/vtestbed.yaml @@ -153,6 +153,21 @@ auto_recover: 'False' comment: T2 Virtual chassis with Multi-ASIC LCs +- conf-name: vms-kvm-t2-single-node-min + group-name: vms6-1 + topo: t2_single_node_min + ptf_image_name: docker-ptf + ptf: ptf-01 + ptf_ip: 10.250.0.102/24 + ptf_ipv6: fec0::ffff:afa:2/64 + server: server_1 + vm_base: VM0100 + dut: + - vlab-ut2 + inv_name: veos_vtb + auto_recover: 'False' + comment: Small t2 single asic topology with 5 peers + - conf-name: vms-kvm-t0-3 group-name: vms6-6 topo: t0