Skip to content

[pytest conn graph] leverage the conn_graph_facts.py lookup capability #2226

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
yxieca merged 1 commit into from
Sep 18, 2020
Merged

[pytest conn graph] leverage the conn_graph_facts.py lookup capability #2226

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ansible/library/conn_graph_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def main():
hostnames = [m_args['host']]
try:
# When called by pytest, the file path is obscured to /tmp/.../.
# we need the caller to tell us wehre the graph files are with
# we need the caller to tell us where the graph files are with
# filepath argument.
if m_args['filepath']:
global LAB_GRAPHFILE_PATH
Expand Down
22 changes: 20 additions & 2 deletions tests/common/fixtures/conn_graph_facts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,17 @@ def get_graph_facts(duthost, localhost, hostnames):
duthost - pytest fixture
hostnames - can be either a single DUT or a list of multiple DUTs
"""
conn_graph_facts = dict()
base_path = os.path.dirname(os.path.realpath(__file__))
lab_conn_graph_path = os.path.join(base_path, "../../../ansible/files/")

# BEGINING OF DEPRECATE WARNING:
#
# conn_graph_facts is able to look up the right graph according to
# the hostname(s) passed in from all graph file lists. Therefore the
# inv_mapping.yml solution is become redandunt. Please move on to
# populate ansible/files/graph_files.yml with all graph files.
# The next chunk of code will be deprecated in the future.

# yaml file contains mapping from inventory file name to its corresponding graph file
inv_mapping_file = os.path.join(base_path, "../../../ansible/group_vars/all/inv_mapping.yml")
if os.path.exists(inv_mapping_file):
Expand All @@ -51,7 +60,7 @@ def get_graph_facts(duthost, localhost, hostnames):
# For the first inventory file that has a mapping in inv_mapping.yml, return
# its conn_graph_facts.
if inv_map and inv_file in inv_map:
lab_conn_graph_file = os.path.join(base_path, "../../../ansible/files/{}".format(inv_map[inv_file]))
lab_conn_graph_file = os.path.join(lab_conn_graph_path, inv_map[inv_file])
kargs = {"filename": lab_conn_graph_file}
if isinstance(hostnames, six.string_types):
kargs["host"] = hostnames
Expand All @@ -60,4 +69,13 @@ def get_graph_facts(duthost, localhost, hostnames):
conn_graph_facts = localhost.conn_graph_facts(
**kargs)["ansible_facts"]
return conn_graph_facts
# END OF DEPRECATE WARNING: deprecate ends here.

kargs = {"filepath": lab_conn_graph_path}
if isinstance(hostnames, six.string_types):
kargs["host"] = hostnames
elif isinstance(hostnames, (list, tuple)):
kargs["hosts"] = hostnames
conn_graph_facts = localhost.conn_graph_facts(
**kargs)["ansible_facts"]
return conn_graph_facts