Revert "Convert IPv6 addresses to lowercase in apply-patch (sonic-net…

…#2299)" This reverts commit 28b6ba5.
wen587 · Mar 27, 2023 · 8ed64a8 · 8ed64a8
1 parent 10f31ea
commit 8ed64a8
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 40 deletions.
diff --git a/config/main.py b/config/main.py
@@ -1362,20 +1362,6 @@ def apply_patch(ctx, patch_file_path, format, dry_run, ignore_non_yang_tables, i
             patch_as_json = json.loads(text)
             patch = jsonpatch.JsonPatch(patch_as_json)
 
-        # convert IPv6 addresses to lowercase
-        for patch_line in patch:
-            if 'remove' == patch_line['op']:
-                match = re.search(r"(?P<prefix>/INTERFACE/\w+\|)(?P<ipv6_address>([a-fA-F0-9]{0,4}[:~]|::){1,7}[a-fA-F0-9]{0,4})"
-                                    "(?P<suffix>.*)", str.format(patch_line['path']))
-                if match:
-                    prefix = match.group('prefix')
-                    ipv6_address_str = match.group('ipv6_address')
-                    suffix = match.group('suffix')
-                    ipv6_address_str = ipv6_address_str.lower()
-                    click.secho("converted ipv6 address to lowercase {} with prefix {} in value: {}"
-                                .format(ipv6_address_str, prefix, patch_line['path']))
-                    patch_line['path'] = prefix + ipv6_address_str + suffix
-
         config_format = ConfigFormat[format.upper()]
         GenericUpdater().apply_patch(patch, config_format, verbose, dry_run, ignore_non_yang_tables, ignore_path)
 

diff --git a/tests/ip_config_input/patch_ipv6.test b/tests/ip_config_input/patch_ipv6.test
diff --git a/tests/ip_config_test.py b/tests/ip_config_test.py
@@ -1,5 +1,3 @@
-import json
-import jsonpatch
 import os
 import traceback
 from unittest import mock
@@ -14,9 +12,6 @@
 from utilities_common.db import Db
 import utilities_common.bgp_util as bgp_util
 
-test_path = os.path.dirname(os.path.abspath(__file__))
-ip_config_input_path = os.path.join(test_path, "ip_config_input")
-
 ERROR_MSG = "Error: IP address is not valid"
 
 INVALID_VRF_MSG ="""\
@@ -243,21 +238,6 @@ def test_add_del_interface_shortened_ipv6_with_leading_zeros(self):
         assert result.exit_code != 0
         assert ('Ethernet68', '3000::1/64') not in db.cfgdb.get_table('INTERFACE')
 
-    def test_remove_interface_case_sensitive_mock_ipv6_w_apply_patch(self):
-        runner = CliRunner()
-        any_patch_as_json = [{"op": "remove", "path": "/INTERFACE/Ethernet12|FC00::1~1126"}]
-        any_patch = jsonpatch.JsonPatch(any_patch_as_json)
-        any_patch_as_text = json.dumps(any_patch_as_json)
-        ipv6_patch_file = os.path.join(ip_config_input_path, 'patch_ipv6.test')
-
-        # config apply-patch patch
-        mock_generic_updater = mock.Mock()
-        with mock.patch('config.main.GenericUpdater', return_value=mock_generic_updater):
-            with mock.patch('builtins.open', mock.mock_open(read_data=any_patch_as_text)):
-                result = runner.invoke(config.config.commands["apply-patch"], [ipv6_patch_file], catch_exceptions=False)
-        print(result.exit_code, result.output)
-        assert "converted ipv6 address to lowercase fc00::1~1126 with prefix /INTERFACE/Ethernet12| in value: /INTERFACE/Ethernet12|FC00::1~1126" in result.output
-
     def test_intf_vrf_bind_unbind(self):
         runner = CliRunner()
         db = Db()