Skip to content

[tests/conftest] Construct FanoutHost by it os type #1577

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
Blueve merged 1 commit into from
Apr 16, 2020
Merged

[tests/conftest] Construct FanoutHost by it os type #1577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@ def fanouthosts(ansible_adhoc, conn_graph_facts, creds):
if fanout_host in fanout_hosts.keys():
fanout = fanout_hosts[fanout_host]
else:
# FIXME: assuming all fanout hosts are EOS for now. Needs to figure out the os type and
# create fanout switch with the right type.
fanout = FanoutHost(ansible_adhoc, 'eos', fanout_host, 'FanoutLeaf', creds['fanout_admin_user'], creds['fanout_admin_password'])
host_vars = ansible_adhoc().options['inventory_manager'].get_host(fanout_host).vars
os_type = 'eos' if 'os' not in host_vars else host_vars['os']
fanout = FanoutHost(ansible_adhoc, os_type, fanout_host, 'FanoutLeaf', creds['fanout_admin_user'], creds['fanout_admin_password'])
fanout_hosts[fanout_host] = fanout
fanout.add_port_map(dut_port, fanout_port)

Expand Down