Skip to content
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.

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

creategraph - Support comments and empty lines in the lab_devices and lab links csv files #2547

Merged
merged 1 commit into from Dec 15, 2020

Conversation

sanmalho-git
Copy link
Contributor

…b_links csv files

Description of PR

Summary:
Fixes # (issue)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • Test case(new/improvement)

Approach

What is the motivation for this PR?

The devices and links between them are added to a csv files lab_devices.csv and lab_links.csv. These files are fed into creategraph.py to generate to lab_connection_graph.xml file.

When dealing with many testbeds, all the devices and links are added to these files without any spaces or comments - making it hard to read.

Need to add capability to add empty lines and comments in these csv files.

Sample lab devices file:

Hostname,ManagementIp,HwSku,Type

# DUTs
str-msn2700-01,10.251.0.188/23,Mellanox-2700,DevSonic

# Fanouts
str-7260-10,10.251.0.13/23,Arista-7260QX-64,FanoutLeaf
str-7260-11,10.251.0.234/23,Arista-7260QX-64,FanoutRoot

# Testbed servers
str-acs-serv-01,10.251.0.245/23,TestServ,Server

How did you do it?

When using csv.DictReader - filter out empty lines and those starting with '#'

How did you verify/test it?

  • ran creategraph.py with files with no comment and empty lines and with comments and empty lines.
  • compared the generated lab_connection_graph.xml and made sure that that there are no differences.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@wangxin wangxin merged commit 820a0d5 into sonic-net:master Dec 15, 2020
@sanmalho-git sanmalho-git deleted the creategraph branch January 6, 2021 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants