Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[mutli-asic][vs]: Add support to test multi-asic vs with four asic and 8 interfaces #2858

Merged
merged 14 commits into from
Feb 25, 2021
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ansible/config_sonic_basedon_testbed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
- fail: msg="The DUT you are trying to run test does not belongs to this testbed"
when: inventory_hostname not in testbed_facts['duts']

- name: Set default num_asic
set_fact:
num_asics: 1
when: num_asics is not defined

- name: Set default dut index
set_fact:
dut_index: "{{ testbed_facts['duts_map'][inventory_hostname]|int }}"
Expand All @@ -66,11 +71,11 @@
delegate_to: localhost

- name: find interface name mapping and individual interface speed if defined from dut
port_alias: hwsku="{{ hwsku }}"
port_alias: hwsku="{{ hwsku }}" num_asic="{{ num_asics }}"
when: deploy is defined and deploy|bool == true

- name: find interface name mapping and individual interface speed if defined with local data
port_alias: hwsku="{{ hwsku }}"
port_alias: hwsku="{{ hwsku }}" num_asic="{{ num_asics }}"
delegate_to: localhost
when: deploy is not defined or deploy|bool == false

Expand Down Expand Up @@ -348,6 +353,11 @@

- debug: msg={{ docker_status.stdout_lines }}

- name: start topology service for multi-asic platform
become: true
shell: systemctl start topology.service
when: start_topo_service is defined and start_topo_service|bool == true

- name: execute cli "config load_minigraph -y" to apply new minigraph
become: true
shell: config load_minigraph -y
Expand Down
20 changes: 18 additions & 2 deletions ansible/lab
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ all:
sonic_s6100:
sonic_a7260:
sonic_multi_asic:
sonic_multi_asic_2:
fanout:
hosts:
str-7260-10:
Expand Down Expand Up @@ -118,7 +119,22 @@ sonic_multi_asic:
vars:
hwsku: msft_multi_asic_vs
iface_speed: 40000
num_asics: 6
start_topo_service: True
frontend_asics: [0,1,2,3]
hosts:
vlab-07:
ansible_host: 10.250.0.109
ansible_hostv6: fec0::ffff:afa:7
ansible_host: 10.250.0.110
ansible_hostv6: fec0::ffff:afa:a

sonic_multi_asic_2:
vars:
hwsku: msft_four_asic_vs
iface_speed: 40000
num_asics: 4
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the frontend asic attribute as well
frontend_asics: [2,3]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to [0,1].

start_topo_service: True
frontend_asics: [0,1]
hosts:
vlab-08:
ansible_host: 10.250.0.112
ansible_hostv6: fec0::ffff:afa:c
Loading