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

[draft] test PR checkers with generic-update in sonic-utilities #8526

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
url = https://github.com/p4lang/ptf.git
[submodule "src/sonic-utilities"]
path = src/sonic-utilities
url = https://github.com/Azure/sonic-utilities
url = https://github.com/ghooo/sonic-utilities.git
branch = dev/mghoneim/patch_sorter
[submodule "platform/broadcom/sonic-platform-modules-arista"]
path = platform/broadcom/sonic-platform-modules-arista
url = https://github.com/aristanetworks/sonic
Expand Down
1 change: 1 addition & 0 deletions slave.mk
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,7 @@ $(addprefix $(PYTHON_WHEELS_PATH)/, $(SONIC_PYTHON_WHEELS)) : $(PYTHON_WHEELS_PA
pushd $($*_SRC_PATH) $(LOG_SIMPLE)
# apply series of patches if exist
if [ -f ../$(notdir $($*_SRC_PATH)).patch/series ]; then QUILT_PATCHES=../$(notdir $($*_SRC_PATH)).patch quilt push -a; fi
dpkg -l --no-pager && python$($*_PYTHON_VERSION) -m pip list -l
if [ ! "$($*_TEST)" = "n" ]; then python$($*_PYTHON_VERSION) setup.py test $(LOG); fi
python$($*_PYTHON_VERSION) setup.py bdist_wheel $(LOG)
# clean up
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-utilities
Submodule sonic-utilities updated 69 files
+28 −2 clear/main.py
+9 −4 config/chassis_modules.py
+8 −3 config/main.py
+390 −435 config/muxcable.py
+851 −0 config/plugins/pbh.py
+300 −0 doc/Command-Reference.md
+118 −72 dump/match_infra.py
+15 −0 dump/plugins/__init__.py
+26 −0 dump/plugins/executor.py
+76 −0 dump/plugins/port.py
+2 −6 generic_config_updater/generic_updater.py
+528 −11 generic_config_updater/gu_common.py
+1,010 −0 generic_config_updater/patch_sorter.py
+18 −4 scripts/ecnconfig
+42 −15 scripts/intfstat
+373 −0 scripts/voqutil
+2 −0 setup.py
+65 −3 show/chassis_modules.py
+1 −1 show/main.py
+425 −378 show/muxcable.py
+469 −0 show/plugins/pbh.py
+163 −16 tests/chassis_modules_test.py
+12 −2 tests/config_test.py
+35 −0 tests/dump_input/port/appl_db.json
+29 −0 tests/dump_input/port/asic_db.json
+30 −0 tests/dump_input/port/config_db.json
+14 −0 tests/dump_input/port/state_db.json
+51 −49 tests/dump_tests/match_engine_test.py
+0 −0 tests/dump_tests/module_tests/__init__.py
+162 −0 tests/dump_tests/module_tests/port_test.py
+105 −1 tests/ecn_input/ecn_test_vectors.py
+82 −12 tests/ecn_test.py
+2 −0 tests/generic_config_updater/files/any_config_db.json
+4 −0 tests/generic_config_updater/files/any_other_config_db.json
+1 −1 tests/generic_config_updater/files/config_db_after_multi_patch.json
+83 −0 tests/generic_config_updater/files/config_db_after_single_operation.json
+17 −0 tests/generic_config_updater/files/config_db_choice.json
+39 −0 tests/generic_config_updater/files/config_db_no_dependencies.json
+9 −0 tests/generic_config_updater/files/config_db_with_crm.json
+16 −0 tests/generic_config_updater/files/config_db_with_device_metadata.json
+20 −0 tests/generic_config_updater/files/config_db_with_interface.json
+25 −0 tests/generic_config_updater/files/config_db_with_portchannel_and_acl.json
+10 −0 tests/generic_config_updater/files/config_db_with_portchannel_interface.json
+7 −0 tests/generic_config_updater/files/contrainer_with_container_config_db.json
+35 −0 tests/generic_config_updater/files/dpb_1_split_full_config.json
+88 −0 tests/generic_config_updater/files/dpb_1_to_4.json-patch
+65 −0 tests/generic_config_updater/files/dpb_4_splits_full_config.json
+58 −0 tests/generic_config_updater/files/dpb_4_to_1.json-patch
+2 −0 tests/generic_config_updater/files/empty_config_db.json
+20 −0 tests/generic_config_updater/files/simple_config_db_inc_deps.json
+305 −5 tests/generic_config_updater/gu_common_test.py
+1,730 −0 tests/generic_config_updater/patch_sorter_test.py
+20 −0 tests/intfstat_test.py
+36 −1 tests/mock_tables/asic0/appl_db.json
+35 −0 tests/mock_tables/asic1/appl_db.json
+35 −0 tests/mock_tables/asic2/appl_db.json
+54 −0 tests/mock_tables/chassis_app_db.json
+675 −0 tests/mock_tables/config_db.json
+5 −0 tests/mock_tables/database_config.json
+86 −0 tests/muxcable_test.py
+92 −0 tests/pbh_input/assert_show_output.py
+10 −0 tests/pbh_input/counters_db.json
+10 −0 tests/pbh_input/counters_db_updated.json
+81 −0 tests/pbh_input/full_pbh_config.json
+40 −0 tests/pbh_input/hash.json
+34 −0 tests/pbh_input/hash_fields.json
+50 −0 tests/pbh_input/rule.json
+17 −0 tests/pbh_input/table.json
+939 −0 tests/pbh_test.py
7 changes: 4 additions & 3 deletions src/sonic-yang-models/yang-models/sonic-nat.yang
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ module sonic-nat {
prefix inet;
}

import sonic-acl {
prefix sacl;
}
// Comment sonic-acl import here until libyang back-links issue is resolved for ACL_TABLE leaf reference.
// import sonic-acl {
// prefix sacl;
// }

import sonic-types {
prefix stypes;
Expand Down