[buildImage] Add support of platform.json parsing to portconfig.py file #3909

samaity · 2019-12-14T19:38:26Z

Signed-off-by: Sangita Maity sangitamaity0211@gmail.com

[sonic-cfggen] Add a unit-test to test platform capability file

Signed-off-by: Sangita Maity sangitamaity0211@gmail.com

Adding a new function to create BRKOUT_CFG TABLE in config db

Signed-off-by: Sangita Maity sangitamaity0211@gmail.com

- What I did
Add support of platform.json parsing to portconfig.py file which is being used by sonic-cfggen and minigraph.py file under src/sonic-config-engine folder to get port config via get_port_config function.

- How I did it

portconfig.py file will first check whether the platform.json file is there or not. if not then whether port_config.ini file is there or not. Modified get_port_config_file_name for this purpose.
Added two separate functions i.e. parse_platform_json_file to get port attributes from platform.json and gen_port_config to generate port attributes.
Added another two functions i.e get_breakout_mode parse_breakout_mode to get breakout mode and parse breakout mode from platform.json respectively.

- How to verify it

rebuilt "sonic_config_engine-1.0" wheel package with all the test cases.All the below-mentioned test cases passed.

# Check whether all interfaces present or not as per platform.json
def test_platform_json_interfaces_keys(self):
       
# Check specific Interface with it's proper configuration as per platform.json
def test_platform_json_specific_ethernet_interfaces(self):

# Check all Interface with it's proper configuration as per platform.json
def test_platform_json_all_ethernet_interfaces(self):

log file

samaity@50c03d616603:/sonic$ BLDENV=stretch make -f slave.mk target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl
SONiC Build System

Build Configuration
"CONFIGURED_PLATFORM"             : "vs"
"CONFIGURED_ARCH"                 : "amd64"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_BUILD_JOBS"                : "1"
"SONIC_CONFIG_MAKE_JOBS"          : "24"
"SONIC_USE_DOCKER_BUILDKIT"       : ""
"USERNAME"                        : "admin"
"PASSWORD"                        : "admin123"
"ENABLE_DHCP_GRAPH_SERVICE"       : ""
"SHUTDOWN_BGP_ON_START"           : ""
"ENABLE_PFCWD_ON_START"           : ""
"INSTALL_DEBUG_TOOLS"             : ""
"ROUTING_STACK"                   : "frr"
"FRR_USER_UID"                    : "300"
"FRR_USER_GID"                    : "300"
"ENABLE_SYNCD_RPC"                : ""
"ENABLE_ORGANIZATION_EXTENSIONS"  : "y"
"HTTP_PROXY"                      : ""
"HTTPS_PROXY"                     : ""
"ENABLE_SYSTEM_TELEMETRY"         : "y"
"SONIC_DEBUGGING_ON"              : ""
"SONIC_PROFILING_ON"              : ""
"KERNEL_PROCURE_METHOD"           : "build"
"BUILD_TIMESTAMP"                 : ""
"BLDENV"                          : "stretch"
"VS_PREPARE_MEM"                  : "yes"
"ENABLE_SFLOW"                    : "y"


samaity@server09:~/REPO_FACTORY/GIT_REPO/DPB/sonic-buildimage$ ls -la     target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl
-rw-r--r-- 1 samaity samaity 44514 Dec  2 19:05 target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl

src/sonic-daemon-base/sonic_daemon_base/daemon_base.py

stevenlu99 · 2020-02-04T17:59:53Z

I think would be better if we put all port definitions in platform.json file into a section "interfaces" or "port_defs"?

samaity · 2020-05-14T20:55:13Z

I think would be better if we put all port definitions in platform.json file into a section "interfaces" or "port_defs"?

#done

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com> * [sonic-cfggen] Add a unit-test to test platform capability file Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com> Adding a new function to create BRKOUT_CFG TABLE in config db (sonic-net#17) Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

lgtm-com · 2020-06-02T21:15:56Z

This pull request introduces 3 alerts when merging e5066af into 7b80377 - view on LGTM.com

new alerts:

2 for Except block handles 'BaseException'
1 for Result of integer division may be truncated

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

lgtm-com · 2020-06-02T23:38:07Z

This pull request introduces 1 alert when merging 20c212c into 3e110fb - view on LGTM.com

new alerts:

1 for Result of integer division may be truncated

src/sonic-config-engine/tests/test_cfggen_platformJson.py

src/sonic-daemon-base/sonic_daemon_base/daemon_base.py

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

lgtm-com · 2020-06-03T02:48:23Z

This pull request introduces 1 alert when merging 2f17452 into 3e110fb - view on LGTM.com

new alerts:

1 for Result of integer division may be truncated

jleveque · 2020-06-03T03:47:38Z

Please fix LGTM alert. Looks like integer division. If you don't care about the remainder, you can use the Python "floor division" operator: //

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

samaity · 2020-06-03T18:02:00Z

Please fix LGTM alert. Looks like integer division. If you don't care about the remainder, you can use the Python "floor division" operator: //

#done

lguohan · 2020-06-04T23:10:44Z

retest vsimage please

daall · 2020-06-05T07:18:17Z

retest vsimage please

renukamanavalan · 2020-06-05T16:52:31Z

retest vsimage please

zhenggen-xu · 2020-06-09T04:51:36Z

retest vsimage please

daall · 2020-06-10T17:33:45Z

retest vsimage please

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

lgtm-com · 2020-06-13T00:19:25Z

This pull request introduces 1 alert when merging abf66c9 into a748dae - view on LGTM.com

new alerts:

1 for Unused import

src/sonic-config-engine/portconfig.py

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

zhenggen-xu · 2020-06-14T22:44:00Z

retest vsimage please

daall · 2020-06-15T18:45:26Z

retest vsimage please

src/sonic-config-engine/minigraph.py

src/sonic-config-engine/portconfig.py

…it and addressed review comments Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

samaity · 2020-06-17T17:23:17Z

All test cases are passing except dhcp_relay.test_dhcp_relay.test_dhcp_relay_after_link_flap

I can see some ongoing issue related to this matter? Any Idea @daall?

daall · 2020-06-17T17:31:28Z

retest vsimage please

daall · 2020-06-17T17:33:00Z

All test cases are passing except dhcp_relay.test_dhcp_relay.test_dhcp_relay_after_link_flap

I can see some ongoing issue related to this matter? Any Idea @daall?

We can re-run the tests. It looks like everything else is working now so hopefully it passes on the next run. :)

This was referenced Dec 14, 2019

[config] Add Initial draft of Breakout Mode subcommand sonic-net/sonic-utilities#766

Merged

DPB Breakout Cli Test with proper setup #3910

Merged

samaity marked this pull request as ready for review December 14, 2019 20:53

samaity force-pushed the port_config_file_change_msft branch from f697206 to 547a606 Compare December 16, 2019 04:19

lguohan requested a review from jleveque December 16, 2019 20:37

jleveque mentioned this pull request Dec 18, 2019

[sonic_platform_base] Add sonic_sfp and sonic_eeprom to sonic_platform_base sonic-net/sonic-platform-common#27

Merged

jleveque reviewed Dec 18, 2019

View reviewed changes

src/sonic-daemon-base/sonic_daemon_base/daemon_base.py Outdated Show resolved Hide resolved

jleveque added the Enhancement ➕ label Dec 18, 2019

samaity force-pushed the port_config_file_change_msft branch from 13307f9 to c25cc98 Compare March 8, 2020 01:44

zhenggen-xu mentioned this pull request Mar 9, 2020

[DPB Seastone] On boarding DPB feature to Seastone HWSKUs #4235

Merged

lguohan added the Port Breakout 🔱 label May 1, 2020

zhenggen-xu mentioned this pull request May 20, 2020

[SONiC] Design and test plan document for refactoring port_config.ini parse code sonic-net/SONiC#613

Merged

samaity added 2 commits June 2, 2020 20:41

Fix merge conflict due to multi-asic support

e5066af

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

samaity force-pushed the port_config_file_change_msft branch from c25cc98 to e5066af Compare June 2, 2020 21:03

Removed legacy 'portmap.ini' and fixed LGTM issue

20c212c

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

jleveque suggested changes Jun 2, 2020

View reviewed changes

src/sonic-config-engine/tests/test_cfggen_platformJson.py Outdated Show resolved Hide resolved

src/sonic-daemon-base/sonic_daemon_base/daemon_base.py Outdated Show resolved Hide resolved

changed variable name as per review

2f17452

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

Fix one LGTM alert related integer division

9369448

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

jleveque previously approved these changes Jun 3, 2020

View reviewed changes

Temporary verfication for 'config load_minigraph' hang issue.

abf66c9

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

samaity dismissed jleveque’s stale review via abf66c9 June 13, 2020 00:03

zhenggen-xu reviewed Jun 13, 2020

View reviewed changes

src/sonic-config-engine/portconfig.py Outdated Show resolved Hide resolved

Reverted the last commit and changed config db connecto change

7eb4196

Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

remove minlink initial value while fallback is define

a1fe1ab

renukamanavalan reviewed Jun 16, 2020

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated Show resolved Hide resolved

renukamanavalan reviewed Jun 16, 2020

View reviewed changes

src/sonic-config-engine/minigraph.py Outdated Show resolved Hide resolved

renukamanavalan reviewed Jun 16, 2020

View reviewed changes

src/sonic-config-engine/portconfig.py Outdated Show resolved Hide resolved

reverted 'remove minlink initial value while fallback is define' comm…

1936c41

…it and addressed review comments Signed-off-by: Sangita Maity <sangitamaity0211@gmail.com>

samaity requested a review from jleveque June 18, 2020 04:53

jleveque approved these changes Jun 18, 2020

View reviewed changes

jleveque merged commit 7f95238 into sonic-net:master Jun 18, 2020

samaity mentioned this pull request Aug 15, 2020

Revert "Revert 'DPB Breakout Cli Test with proper setup (#3910)' " #5192

Merged

vadymhlushko-mlnx mentioned this pull request Jan 26, 2021

[DPB] wrong aliases for interfaces #6024

Closed

dgsudharsan mentioned this pull request Sep 7, 2021

[DPB]config load_minigraph initializes all ports admin status to up when using platform.json #8697

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[buildImage] Add support of platform.json parsing to portconfig.py file #3909

[buildImage] Add support of platform.json parsing to portconfig.py file #3909

samaity commented Dec 14, 2019 •

edited

Loading

stevenlu99 commented Feb 4, 2020

samaity commented May 14, 2020

lgtm-com bot commented Jun 2, 2020

lgtm-com bot commented Jun 2, 2020

lgtm-com bot commented Jun 3, 2020

jleveque commented Jun 3, 2020 •

edited

Loading

samaity commented Jun 3, 2020

lguohan commented Jun 4, 2020

daall commented Jun 5, 2020

renukamanavalan commented Jun 5, 2020

zhenggen-xu commented Jun 9, 2020

daall commented Jun 10, 2020

lgtm-com bot commented Jun 13, 2020

zhenggen-xu commented Jun 14, 2020

daall commented Jun 15, 2020

samaity commented Jun 17, 2020 •

edited

Loading

daall commented Jun 17, 2020

daall commented Jun 17, 2020

[buildImage] Add support of platform.json parsing to portconfig.py file #3909

[buildImage] Add support of platform.json parsing to portconfig.py file #3909

Conversation

samaity commented Dec 14, 2019 • edited Loading

stevenlu99 commented Feb 4, 2020

samaity commented May 14, 2020

lgtm-com bot commented Jun 2, 2020

lgtm-com bot commented Jun 2, 2020

lgtm-com bot commented Jun 3, 2020

jleveque commented Jun 3, 2020 • edited Loading

samaity commented Jun 3, 2020

lguohan commented Jun 4, 2020

daall commented Jun 5, 2020

renukamanavalan commented Jun 5, 2020

zhenggen-xu commented Jun 9, 2020

daall commented Jun 10, 2020

lgtm-com bot commented Jun 13, 2020

zhenggen-xu commented Jun 14, 2020

daall commented Jun 15, 2020

samaity commented Jun 17, 2020 • edited Loading

daall commented Jun 17, 2020

daall commented Jun 17, 2020

samaity commented Dec 14, 2019 •

edited

Loading

jleveque commented Jun 3, 2020 •

edited

Loading

samaity commented Jun 17, 2020 •

edited

Loading