@@ -1947,7 +1947,6 @@ def setUp(self):
19471947 self .any_checkpoints_list_as_text = json .dumps (self .any_checkpoints_list , indent = 4 )
19481948 self .any_checkpoints_list_with_time_as_text = json .dumps (self .any_checkpoints_list_with_time , indent = 4 )
19491949
1950-
19511950 @patch ('generic_config_updater.main.validate_patch' , mock .Mock (return_value = True ))
19521951 def test_apply_patch__no_params__get_required_params_error_msg (self ):
19531952 # Arrange
@@ -2096,7 +2095,7 @@ def validate_apply_patch_optional_parameter(self, param_args, expected_call):
20962095 mock_generic_updater .apply_patch .assert_has_calls ([expected_call ])
20972096
20982097 def test_filter_duplicate_patch_operations_basic (self ):
2099- from config .main import filter_duplicate_patch_operations
2098+ from generic_config_updater .main import filter_duplicate_patch_operations
21002099 # Patch tries to add duplicate port to ACL_TABLE leaf-list
21012100 patch_ops = [
21022101 {"op" : "add" , "path" : "/ACL_TABLE/MY_ACL_TABLE/ports/-" , "value" : "Ethernet1" },
@@ -2116,7 +2115,7 @@ def test_filter_duplicate_patch_operations_basic(self):
21162115 self .assertEqual (filtered_patch_ops [0 ]['value' ], "Ethernet3" , "Only Ethernet3 add op should remain" )
21172116
21182117 def test_filter_duplicate_patch_operations_no_duplicates (self ):
2119- from config .main import filter_duplicate_patch_operations
2118+ from generic_config_updater .main import filter_duplicate_patch_operations
21202119 # Patch does not contain any duplicate ops
21212120 patch_ops = [
21222121 {"op" : "add" , "path" : "/ACL_TABLE/MY_ACL_TABLE/ports/-" , "value" : "Ethernet3" },
@@ -2137,7 +2136,7 @@ def test_filter_duplicate_patch_operations_no_duplicates(self):
21372136 self .assertEqual (filtered_patch_ops , patch_ops , "Filtered ops should match original ops" )
21382137
21392138 def test_filter_duplicate_patch_operations_non_list_field (self ):
2140- from config .main import filter_duplicate_patch_operations
2139+ from generic_config_updater .main import filter_duplicate_patch_operations
21412140 # Patch tries to add duplicate entries to a non-list field
21422141 patch_ops = [
21432142 {"op" : "add" , "path" : "/PORT/Ethernet0/description" , "value" : "Desc1" },
@@ -2156,7 +2155,7 @@ def test_filter_duplicate_patch_operations_non_list_field(self):
21562155 self .assertEqual (filtered_patch_ops , patch_ops , "Filtered ops should match original ops" )
21572156
21582157 def test_filter_duplicate_patch_operations_empty_config (self ):
2159- from config .main import filter_duplicate_patch_operations
2158+ from generic_config_updater .main import filter_duplicate_patch_operations
21602159 patch_ops = [
21612160 {"op" : "add" , "path" : "/PORT/Ethernet0/allowed_vlans/-" , "value" : "100" },
21622161 {"op" : "add" , "path" : "/PORT/Ethernet0/allowed_vlans/-" , "value" : "200" }
@@ -2174,7 +2173,7 @@ def test_filter_duplicate_patch_operations_empty_config(self):
21742173 self .assertEqual (filtered_patch_ops , patch_ops , "Filtered ops should match original ops" )
21752174
21762175 def test_append_emptytables_if_required_basic_config (self ):
2177- from config .main import append_emptytables_if_required
2176+ from generic_config_updater .main import append_emptytables_if_required
21782177
21792178 patch_ops = [
21802179 {"op" : "add" , "path" : "/ACL_TABLE2/ports" , "value" : ["Ethernet1" , "Ethernet2" ]}
@@ -2191,7 +2190,7 @@ def test_append_emptytables_if_required_basic_config(self):
21912190 assert updated_patch_ops [1 ] == patch_ops [0 ], "Second op should be the original add operation"
21922191
21932192 def test_append_emptytables_if_required_no_action_needed (self ):
2194- from config .main import append_emptytables_if_required
2193+ from generic_config_updater .main import append_emptytables_if_required
21952194 patch_ops = [
21962195 {"op" : "add" , "path" : "/ACL_TABLE/ports" , "value" : ["Ethernet1" , "Ethernet2" ]}
21972196 ]
@@ -2205,7 +2204,7 @@ def test_append_emptytables_if_required_no_action_needed(self):
22052204 assert updated_patch_ops [0 ] == patch_ops [0 ], "Patch operation should remain unchanged"
22062205
22072206 def test_append_emptytables_if_required_multiple_tables (self ):
2208- from config .main import append_emptytables_if_required
2207+ from generic_config_updater .main import append_emptytables_if_required
22092208
22102209 patch_ops = [
22112210 {"op" : "add" , "path" : "/TABLE1/field" , "value" : "value1" },
@@ -4365,7 +4364,7 @@ def test_apply_patch_parallel_with_error_multiasic(self):
43654364 mock_config_db_connector .assert_not_called ()
43664365
43674366 def test_filter_duplicate_patch_operations_basic_multiasic (self ):
4368- from config .main import filter_duplicate_patch_operations
4367+ from generic_config_updater .main import filter_duplicate_patch_operations
43694368 import jsonpatch
43704369 # Multi-ASIC config: each ASIC has its own ACL_TABLE
43714370 config = {
@@ -4406,7 +4405,7 @@ def test_filter_duplicate_patch_operations_basic_multiasic(self):
44064405 self .assertEqual (len (filtered_ops ), 0 , "All adds are duplicates, should be filtered out in multi-asic config" )
44074406
44084407 def test_filter_duplicate_patch_operations_no_duplicates_multiasic (self ):
4409- from config .main import filter_duplicate_patch_operations
4408+ from generic_config_updater .main import filter_duplicate_patch_operations
44104409 import jsonpatch
44114410 # Multi-ASIC config: each ASIC has its own ACL_TABLE
44124411 config = {
@@ -4451,7 +4450,7 @@ def test_filter_duplicate_patch_operations_no_duplicates_multiasic(self):
44514450 )
44524451
44534452 def test_filter_duplicate_patch_operations_mixed_multiasic (self ):
4454- from config .main import filter_duplicate_patch_operations
4453+ from generic_config_updater .main import filter_duplicate_patch_operations
44554454 import jsonpatch
44564455 # Multi-ASIC config: each ASIC has its own ACL_TABLE
44574456 config = {
@@ -4496,7 +4495,7 @@ def test_filter_duplicate_patch_operations_mixed_multiasic(self):
44964495 )
44974496
44984497 def test_filter_duplicate_patch_operations_empty_config_multiasic (self ):
4499- from config .main import filter_duplicate_patch_operations
4498+ from generic_config_updater .main import filter_duplicate_patch_operations
45004499 import jsonpatch
45014500 config = {
45024501 "localhost" : {
@@ -4541,7 +4540,7 @@ def test_filter_duplicate_patch_operations_empty_config_multiasic(self):
45414540 )
45424541
45434542 def test_test_append_emptytables_if_required_basic_config_multiasic (self ):
4544- from config .main import append_emptytables_if_required
4543+ from generic_config_updater .main import append_emptytables_if_required
45454544 # Multi-ASIC config: each ASIC has its own PORT table
45464545 config = {
45474546 "localhost" : {
@@ -4583,7 +4582,7 @@ def test_test_append_emptytables_if_required_basic_config_multiasic(self):
45834582 assert updated_patch_list [5 ] == patch_ops [2 ]
45844583
45854584 def test_test_append_emptytables_if_required_no_additional_tables_multiasic (self ):
4586- from config .main import append_emptytables_if_required
4585+ from generic_config_updater .main import append_emptytables_if_required
45874586 # Multi-ASIC config: each ASIC has its own PORT table
45884587 config = {
45894588 "localhost" : {
0 commit comments