fix test cases due to removal of import in change_applier

Author: bhouse-nexthop

tests/generic_config_updater/gcu_feature_patch_application_test.py

@@ -94,10 +94,9 @@ def create_patch_applier(self, config):
         patch_wrapper = PatchWrapper(config_wrapper)
         return gu.PatchApplier(config_wrapper=config_wrapper, patch_wrapper=patch_wrapper, changeapplier=change_applier)
 
-    @patch('generic_config_updater.change_applier.get_config_db_as_json', side_effect=get_running_config)
     @patch("generic_config_updater.change_applier.get_config_db")
     @patch("generic_config_updater.change_applier.set_config")
-    def run_single_success_case_applier(self, data, mock_set, mock_db, mock_get_config_db_as_json):
+    def run_single_success_case_applier(self, data, mock_set, mock_db):
         current_config = data["current_config"]
         expected_config = data["expected_config"]
         patch = jsonpatch.JsonPatch(data["patch"])
@@ -125,8 +124,7 @@ def run_single_success_case_applier(self, data, mock_set, mock_db, mock_get_conf
         self.assertEqual(simulated_config, expected_config)
 
     @patch("generic_config_updater.change_applier.get_config_db")
-    @patch('generic_config_updater.change_applier.get_config_db_as_json', side_effect=get_running_config)
-    def run_single_failure_case_applier(self, data, mock_db, mock_get_config_db_as_json):
+    def run_single_failure_case_applier(self, data, mock_db):
         current_config = data["current_config"]
         patch = jsonpatch.JsonPatch(data["patch"])
         expected_error_substrings = data["expected_error_substrings"]

tests/generic_config_updater/multiasic_change_applier_test.py

@@ -178,7 +178,7 @@ def test_extract_scope_singleasic(self, mock_is_multi_asic):
             except jsonpointer.JsonPointerException:
                 assert(not result)
 
-    @patch('generic_config_updater.change_applier.get_config_db_as_json', autospec=True)
+    @patch('generic_config_updater.gu_common.get_config_db_as_json', autospec=True)
     @patch('generic_config_updater.change_applier.ConfigDBConnector', autospec=True)
     def test_apply_change_default_scope(self, mock_ConfigDBConnector, mock_get_running_config):
         # Setup mock for ConfigDBConnector
@@ -195,13 +195,13 @@ def test_apply_change_default_scope(self, mock_ConfigDBConnector, mock_get_runni
         change = MagicMock()
 
         # Call the apply method with the change object
-        current_config = copy.deepcopy(generic_config_updater.change_applier.get_config_db_as_json(scope=self))
+        current_config = copy.deepcopy(generic_config_updater.gu_common.get_config_db_as_json(scope=self))
         current_config = applier.apply(current_config, change)
 
         # Assert ConfigDBConnector called with the correct namespace
         mock_ConfigDBConnector.assert_called_once_with(use_unix_socket_path=True, namespace="")
 
-    @patch('generic_config_updater.change_applier.get_config_db_as_json', autospec=True)
+    @patch('generic_config_updater.gu_common.get_config_db_as_json', autospec=True)
     @patch('generic_config_updater.change_applier.ConfigDBConnector', autospec=True)
     def test_apply_change_given_scope(self, mock_ConfigDBConnector, mock_get_running_config):
         # Setup mock for ConfigDBConnector
@@ -216,13 +216,13 @@ def test_apply_change_given_scope(self, mock_ConfigDBConnector, mock_get_running
         change = MagicMock()
 
         # Call the apply method with the change object
-        current_config = copy.deepcopy(generic_config_updater.change_applier.get_config_db_as_json(scope="asic0"))
+        current_config = copy.deepcopy(generic_config_updater.gu_common.get_config_db_as_json(scope="asic0"))
         current_config = applier.apply(current_config, change)
 
         # Assert ConfigDBConnector called with the correct scope
         mock_ConfigDBConnector.assert_called_once_with(use_unix_socket_path=True, namespace="asic0")
 
-    @patch('generic_config_updater.change_applier.get_config_db_as_json', autospec=True)
+    @patch('generic_config_updater.gu_common.get_config_db_as_json', autospec=True)
     @patch('generic_config_updater.change_applier.ConfigDBConnector', autospec=True)
     def test_apply_change_failure(self, mock_ConfigDBConnector, mock_get_running_config):
         # Setup mock for ConfigDBConnector
@@ -240,12 +240,12 @@ def test_apply_change_failure(self, mock_ConfigDBConnector, mock_get_running_con
 
         # Test the behavior when os.system fails
         with self.assertRaises(Exception) as context:
-            current_config = copy.deepcopy(generic_config_updater.change_applier.get_config_db_as_json())
+            current_config = copy.deepcopy(generic_config_updater.gu_common.get_config_db_as_json())
             current_config = applier.apply(current_config, change)
 
         self.assertTrue('Failed to get running config' in str(context.exception))
 
-    @patch('generic_config_updater.change_applier.get_config_db_as_json', autospec=True)
+    @patch('generic_config_updater.gu_common.get_config_db_as_json', autospec=True)
     @patch('generic_config_updater.change_applier.ConfigDBConnector', autospec=True)
     def test_apply_patch_with_empty_tables_failure(self, mock_ConfigDBConnector, mock_get_running_config):
         # Setup mock for ConfigDBConnector
@@ -271,7 +271,7 @@ def mock_get_empty_running_config_side_effect():
         # Prepare a change object or data that applier.apply would use, simulating a patch that requires non-empty tables
         change = MagicMock()
 
-        current_config = copy.deepcopy(generic_config_updater.change_applier.get_config_db_as_json())
+        current_config = copy.deepcopy(generic_config_updater.gu_common.get_config_db_as_json())
 
         # Apply the patch
         try: