Revert "[GCU] Add PFC_WD RDMA validator (sonic-net#2781)"

This reverts commit 98dadce.

Author: yxieca

generic_config_updater/change_applier.py

@@ -9,7 +9,7 @@
 from .gu_common import genericUpdaterLogging
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-UPDATER_CONF_FILE = f"{SCRIPT_DIR}/gcu_services_validator.conf.json"
+UPDATER_CONF_FILE = f"{SCRIPT_DIR}/generic_config_updater.conf.json"
 logger = genericUpdaterLogging.get_logger(title="Change Applier")
 
 print_to_console = False

generic_config_updater/field_operation_validators.py

@@ -1,21 +1,17 @@
 import json
 import jsonpatch
-import importlib
 from jsonpointer import JsonPointer
 import sonic_yang
 import sonic_yang_ext
 import subprocess
 import yang as ly
 import copy
 import re
-import os
 from sonic_py_common import logger
 from enum import Enum
 
 YANG_DIR = "/usr/local/yang-models"
 SYSLOG_IDENTIFIER = "GenericConfigUpdater"
-SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
-GCU_FIELD_OP_CONF_FILE = f"{SCRIPT_DIR}/gcu_field_operation_validators.conf.json"
 
 class GenericConfigUpdaterError(Exception):
     pass
@@ -161,37 +157,6 @@ def validate_field_operation(self, old_config, target_config):
                 if any(op['op'] == operation and field == op['path'] for op in patch):
                     raise IllegalPatchOperationError("Given patch operation is invalid. Operation: {} is illegal on field: {}".format(operation, field))
 
-        def _invoke_validating_function(cmd):
-            # cmd is in the format as <package/module name>.<method name>
-            method_name = cmd.split(".")[-1]
-            module_name = ".".join(cmd.split(".")[0:-1])
-            if module_name != "generic_config_updater.field_operation_validators" or "validator" not in method_name:
-                raise GenericConfigUpdaterError("Attempting to call invalid method {} in module {}. Module must be generic_config_updater.field_operation_validators, and method must be a defined validator".format(method_name, module_name))
-            module = importlib.import_module(module_name, package=None)
-            method_to_call = getattr(module, method_name)
-            return method_to_call()
-
-        if os.path.exists(GCU_FIELD_OP_CONF_FILE):
-            with open(GCU_FIELD_OP_CONF_FILE, "r") as s:
-                gcu_field_operation_conf = json.load(s)
-        else:
-            raise GenericConfigUpdaterError("GCU field operation validators config file not found") 
-
-        for element in patch:
-            path = element["path"]
-            match = re.search(r'\/([^\/]+)(\/|$)', path) # This matches the table name in the path, eg if path if /PFC_WD/GLOBAL, the match would be PFC_WD
-            if match is not None:
-                table = match.group(1)
-            else:
-                raise GenericConfigUpdaterError("Invalid jsonpatch path: {}".format(path))
-            validating_functions= set()
-            tables = gcu_field_operation_conf["tables"]
-            validating_functions.update(tables.get(table, {}).get("field_operation_validators", []))
-
-            for function in validating_functions:
-                if not _invoke_validating_function(function):
-                    raise IllegalPatchOperationError("Modification of {} table is illegal- validating function {} returned False".format(table, function))
-
     def validate_lanes(self, config_db):
         if "PORT" not in config_db:
             return True, None

generic_config_updater/gcu_field_operation_validators.conf.json

@@ -63,7 +63,7 @@
         'sonic_cli_gen',
     ],
     package_data={
-        'generic_config_updater': ['gcu_services_validator.conf.json', 'gcu_field_operation_validators.conf.json'],
+        'generic_config_updater': ['generic_config_updater.conf.json'],
         'show': ['aliases.ini'],
         'sonic_installer': ['aliases.ini'],
         'tests': ['acl_input/*',

generic_config_updater/gcu_services_validator.conf.json renamed to generic_config_updater/generic_config_updater.conf.json

@@ -3,10 +3,8 @@
 import jsonpatch
 import sonic_yang
 import unittest
-import mock
+from unittest.mock import MagicMock, Mock, patch
 
-from unittest.mock import MagicMock, Mock
-from mock import patch
 from .gutest_helpers import create_side_effect_dict, Files
 import generic_config_updater.gu_common as gu_common
 
@@ -71,59 +69,15 @@ def setUp(self):
         self.config_wrapper_mock = gu_common.ConfigWrapper()
         self.config_wrapper_mock.get_config_db_as_json=MagicMock(return_value=Files.CONFIG_DB_AS_JSON)
 
-    @patch("sonic_py_common.device_info.get_sonic_version_info", mock.Mock(return_value={"asic_type": "mellanox", "build_version": "SONiC.20181131"}))
-    def test_validate_field_operation_legal__pfcwd(self):
+    def test_validate_field_operation_legal(self):
         old_config = {"PFC_WD": {"GLOBAL": {"POLL_INTERVAL": "60"}}}
         target_config = {"PFC_WD": {"GLOBAL": {"POLL_INTERVAL": "40"}}}
         config_wrapper = gu_common.ConfigWrapper()
         config_wrapper.validate_field_operation(old_config, target_config)
-        
-    def test_validate_field_operation_illegal__pfcwd(self):
-        old_config = {"PFC_WD": {"GLOBAL": {"POLL_INTERVAL": "60"}}}
-        target_config = {"PFC_WD": {"GLOBAL": {}}}
-        config_wrapper = gu_common.ConfigWrapper()
-        self.assertRaises(gu_common.IllegalPatchOperationError, config_wrapper.validate_field_operation, old_config, target_config)
 
-    @patch("sonic_py_common.device_info.get_sonic_version_info", mock.Mock(return_value={"asic_type": "invalid-asic", "build_version": "SONiC.20181131"}))
-    def test_validate_field_modification_illegal__pfcwd(self):
-        old_config = {"PFC_WD": {"GLOBAL": {"POLL_INTERVAL": "60"}}}
-        target_config = {"PFC_WD": {"GLOBAL": {"POLL_INTERVAL": "80"}}}
-        config_wrapper = gu_common.ConfigWrapper()
-        self.assertRaises(gu_common.IllegalPatchOperationError, config_wrapper.validate_field_operation, old_config, target_config)
-
-    def test_validate_field_operation_legal__rm_loopback1(self):
-        old_config = {
-            "LOOPBACK_INTERFACE": {
-                "Loopback0": {},
-                "Loopback0|10.1.0.32/32": {},
-                "Loopback1": {},
-                "Loopback1|10.1.0.33/32": {}
-            }
-        }
-        target_config = {
-            "LOOPBACK_INTERFACE": {
-                "Loopback0": {},
-                "Loopback0|10.1.0.32/32": {}
-            }
-        }
-        config_wrapper = gu_common.ConfigWrapper()
-        config_wrapper.validate_field_operation(old_config, target_config)
-        
-    def test_validate_field_operation_illegal__rm_loopback0(self):
-        old_config = {
-            "LOOPBACK_INTERFACE": {
-                "Loopback0": {},
-                "Loopback0|10.1.0.32/32": {},
-                "Loopback1": {},
-                "Loopback1|10.1.0.33/32": {}
-            }
-        }
-        target_config = {
-            "LOOPBACK_INTERFACE": {
-                "Loopback1": {},
-                "Loopback1|10.1.0.33/32": {}
-            }
-        }
+    def test_validate_field_operation_illegal(self):
+        old_config = {"PFC_WD": {"GLOBAL": {"POLL_INTERVAL": 60}}}
+        target_config = {"PFC_WD": {"GLOBAL": {}}}
         config_wrapper = gu_common.ConfigWrapper()
         self.assertRaises(gu_common.IllegalPatchOperationError, config_wrapper.validate_field_operation, old_config, target_config)