Skip to content

Support L1 & L3 Config generation in SONiC #7637

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
judyjoseph merged 9 commits into from
Jul 8, 2021
Merged

Support L1 & L3 Config generation in SONiC #7637

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ed124f
Enhance sonic-config-engine to support L1 & L3 configurations
VenkatCisco Apr 19, 2021
d9e98f0
Address PR comments for L1 & L3 config methods
VenkatCisco May 18, 2021
37e8dc2
Adding UT for L1 & L3 config support
VenkatCisco May 25, 2021
7e80cbe
Merge branch 'master' into VenkatCisco/master/PR12_L1_L2_cfg
VenkatCisco May 25, 2021
30c591c
Change description to address PR comments
VenkatCisco Jun 3, 2021
d27bbde
Merge branch 'VenkatCisco/master/PR12_L1_L2_cfg' of github.com:Venkat…
VenkatCisco Jun 3, 2021
975daf5
remove DEVICE_METADATA parameters
VenkatCisco Jun 7, 2021
8932089
Fix Tests that were failing due to mistmatch in device metadata
VenkatCisco Jun 8, 2021
8bb7f1f
removed a swap file
VenkatCisco Jun 28, 2021
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
32 changes: 31 additions & 1 deletion src/sonic-config-engine/config_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,34 @@
else:
UNICODE_TYPE = unicode


# The new enhancements to this file provides capabilities to generate l1 & l3
Copy link
Copy Markdown
Contributor

@akokhan akokhan Jun 3, 2021

Choose a reason for hiding this comment

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

This comment looks more like PR description. I think this should be removed.

Copy link
Copy Markdown
Contributor

@akokhan akokhan Jun 3, 2021

Choose a reason for hiding this comment

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

Also, it will require the comment update again once someone add an additional template..

Copy link
Copy Markdown
Contributor Author

@VenkatCisco VenkatCisco Jun 3, 2021

Choose a reason for hiding this comment

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

Thanks. Fixed the comments and uploaded the new change.

Copy link
Copy Markdown
Contributor Author

@VenkatCisco VenkatCisco Jun 8, 2021

Choose a reason for hiding this comment

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

The tests for both L1 & L3 passed as belows.

test_l1_ports_template (tests.test_j2files.TestJ2Files) ... ok
test_l3_ports_template (tests.test_j2files.TestJ2Files) ... ok

New failures are seen in unrleated area.

# configuration in addition the existing l2, t1 and empty configurations
# So the following capabilities exits now:
# 't1': generate_t1_sample_config,
# 'l2': generate_l2_config,
# 'empty': generate_empty_config,
# 'l1': generate_l1_config,
# 'l3': generate_l3_config

def generate_l1_config(data):
for port in natsorted(data['PORT']):
data['PORT'][port]['admin_status'] = 'up'
data['PORT'][port]['mtu'] = '9100'
return data;

def generate_l3_config(data):
data['LOOPBACK_INTERFACE'] = {"Loopback0": {},
"Loopback0|10.1.0.1/32": {}}
data['BGP_NEIGHBOR'] = {}
data['DEVICE_NEIGHBOR'] = {}
data['INTERFACE'] = {}
for port in natsorted(data['PORT']):
data['PORT'][port]['admin_status'] = 'up'
data['PORT'][port]['mtu'] = '9100'
data['INTERFACE']['{}'.format(port)] = {}
return data;

def generate_t1_sample_config(data):
data['DEVICE_METADATA']['localhost']['hostname'] = 'sonic'
data['DEVICE_METADATA']['localhost']['type'] = 'LeafRouter'
Expand Down Expand Up @@ -95,7 +123,9 @@ def generate_l2_config(data):
_sample_generators = {
't1': generate_t1_sample_config,
'l2': generate_l2_config,
'empty': generate_empty_config
'empty': generate_empty_config,
'l1': generate_l1_config,
Copy link
Copy Markdown
Contributor

@prsunny prsunny May 19, 2021

Choose a reason for hiding this comment

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

Can you please add a unit test for this? You can refer as done for #7215

Copy link
Copy Markdown
Contributor Author

@VenkatCisco VenkatCisco May 25, 2021

Choose a reason for hiding this comment

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

Thanks for the comments. Added UT. Please review.

Copy link
Copy Markdown
Contributor Author

@VenkatCisco VenkatCisco Jun 22, 2021

Choose a reason for hiding this comment

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

@prsunny do you have any more comments or else would be able to approve this PR ?

'l3': generate_l3_config
}

def get_available_config():
Expand Down