Skip to content

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

Merged
wangxin merged 1 commit intosonic-net:masterfrom
sanmalho-git:creategraph
Dec 15, 2020
Merged

creategraph - Support comments and empty lines in the lab_devices and lab links csv files#2547
wangxin merged 1 commit intosonic-net:masterfrom
sanmalho-git:creategraph

Conversation

@sanmalho-git
Copy link
Copy Markdown
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
kazinator-arista pushed a commit to kazinator-arista/sonic-mgmt that referenced this pull request Mar 4, 2026
swss:
* 6902a98 2022-12-13 | [muxorch] Skip programming SoC IP kernel tunnel route (sonic-net#2557) (HEAD -> 202205) [Longxiang Lyu]
* 8a86404 2022-12-07 | [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (sonic-net#2484) [Vaibhav Hemant Dixit]
* d16f51d 2022-12-07 | Revert "sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552)" (github/202205) [Ying Xie]
* abc6a81 2022-12-05 | sonic-swss: Fix orchagent crash in generateQueueMapPerPort. (sonic-net#2552) [Sambath Kumar Balasubramanian]

sonic-utilities:
* 2c29fde 2022-12-13 | [202205][route_check]: Ignore ASIC only SOC IPs (cherry-picking sonic-net#2548) (sonic-net#2552) (HEAD -> 202205, github/202205) [Ying Xie]
* aaa8d25 2022-12-13 | [202205][generate_dump]: Enhance show techsupport for cisco-8000 platform (sonic-net#2533) [Geert Vlaemynck]
* 25d581e 2022-12-13 | [202205][show]Fix show route return code on error (sonic-net#2547) [Sudharsan Dhamal Gopalarathnam]
* da870fc 2022-11-17 | [azure-pipelines] update azp from buster to bullseye (sonic-net#2455) [Mai Bui]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
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.

2 participants