From cbd2bfe96d0f85dfd40255381fca2c30c8f4ca30 Mon Sep 17 00:00:00 2001 From: jingwenxie Date: Sat, 18 Jan 2025 05:20:46 +0800 Subject: [PATCH] [override] Remove table test which has no YANG model (#16507) Description of PR Summary:Remove test for no yang supported table test Approach What is the motivation for this PR? We plan on strict yang enforcement on config CLI. Thus it will fail for non-yang supported NEW_FEATURE_TABLE How did you do it? Remove test for tables without yang model How did you verify/test it? E2E test --- .../test_override_config_table.py | 22 ----------- .../test_override_config_table_masic.py | 39 ------------------- 2 files changed, 61 deletions(-) diff --git a/tests/override_config_table/test_override_config_table.py b/tests/override_config_table/test_override_config_table.py index 9cffcb7f0d5..fda0a88fe9c 100644 --- a/tests/override_config_table/test_override_config_table.py +++ b/tests/override_config_table/test_override_config_table.py @@ -121,27 +121,6 @@ def load_minigraph_with_golden_partial_config(duthost): ) -def load_minigraph_with_golden_new_feature(duthost): - """Test Golden Config with new feature - """ - new_feature_config = { - "NEW_FEATURE_TABLE": { - "entry": { - "field": "value", - "state": "disabled" - } - } - } - reload_minigraph_with_golden_config(duthost, new_feature_config) - - current_config = get_running_config(duthost) - pytest_assert( - 'NEW_FEATURE_TABLE' in current_config and - current_config['NEW_FEATURE_TABLE'] == new_feature_config['NEW_FEATURE_TABLE'], - "new feature config update fail: {}".format(current_config['NEW_FEATURE_TABLE']) - ) - - def load_minigraph_with_golden_full_config(duthost, full_config): """Test Golden Config fully override minigraph config """ @@ -190,7 +169,6 @@ def test_load_minigraph_with_golden_config(duthosts, setup_env, duthost = duthosts[enum_rand_one_per_hwsku_frontend_hostname] load_minigraph_with_golden_empty_input(duthost) load_minigraph_with_golden_partial_config(duthost) - load_minigraph_with_golden_new_feature(duthost) full_config = setup_env load_minigraph_with_golden_full_config(duthost, full_config) load_minigraph_with_golden_empty_table_removal(duthost) diff --git a/tests/override_config_table/test_override_config_table_masic.py b/tests/override_config_table/test_override_config_table_masic.py index ba7dac36904..de7ba41be7d 100644 --- a/tests/override_config_table/test_override_config_table_masic.py +++ b/tests/override_config_table/test_override_config_table_masic.py @@ -154,44 +154,6 @@ def load_minigraph_with_golden_partial_config(duthost): ) -def load_minigraph_with_golden_new_feature(duthost): - """Test Golden Config with new feature - """ - new_feature_config = { - "localhost": { - "NEW_FEATURE_TABLE": { - "entry": { - "field": "value", - "state": "disabled" - } - } - }, - "asic0": { - "NEW_FEATURE_TABLE": { - "entry": { - "field": "value", - "state": "disabled" - } - } - } - } - reload_minigraph_with_golden_config(duthost, new_feature_config) - - host_current_config = get_running_config(duthost) - pytest_assert( - 'NEW_FEATURE_TABLE' in host_current_config and - host_current_config['NEW_FEATURE_TABLE'] == new_feature_config['localhost']['NEW_FEATURE_TABLE'], - "new feature config update fail: {}".format(host_current_config['NEW_FEATURE_TABLE']) - ) - - asic0_current_config = get_running_config(duthost, "asic0") - pytest_assert( - 'NEW_FEATURE_TABLE' in asic0_current_config and - asic0_current_config['NEW_FEATURE_TABLE'] == new_feature_config['asic0']['NEW_FEATURE_TABLE'], - "new feature config update fail: {}".format(asic0_current_config['NEW_FEATURE_TABLE']) - ) - - def load_minigraph_with_golden_empty_table_removal(duthost): """Test Golden Config with empty table removal. @@ -247,5 +209,4 @@ def test_load_minigraph_with_golden_config(duthosts, setup_env, tbinfo, enum_ran # since the handling of empty golden config doesn't work on upstream linecards load_minigraph_with_golden_empty_input(duthost) load_minigraph_with_golden_partial_config(duthost) - load_minigraph_with_golden_new_feature(duthost) load_minigraph_with_golden_empty_table_removal(duthost)