Merge pull request #4982 from natali-rs1985/T8252

vpp: T8252: Change ACL node 'macip' to 'mac'

2 files changed, 25 insertions, 25 deletions

diff --git a/src/conf_mode/interfaces_ethernet.py b/src/conf_mode/interfaces_ethernet.py
index 2a65855a4..97902c6e4 100755
--- a/src/conf_mode/interfaces_ethernet.py
+++ b/src/conf_mode/interfaces_ethernet.py
@@ -367,7 +367,7 @@ def verify_vpp_remove_vif(ethernet: dict):
         r'(interfaces\.bridge\.br(\d)+\.member\.interface)|'
         r'(interfaces\.xconnect\.xcon(\d)+\.member\.interface)|'
         r'(acl\.ip\.interface)|'
-        r'(acl\.macip\.interface)'
+        r'(acl\.mac\.interface)'
     )
     ifname = ethernet['ifname']
 
diff --git a/src/conf_mode/vpp_acl.py b/src/conf_mode/vpp_acl.py
index f075f9f5e..4d9ada4a1 100644
--- a/src/conf_mode/vpp_acl.py
+++ b/src/conf_mode/vpp_acl.py
@@ -115,7 +115,7 @@ def create_ip_rules_list(rules):
     return rules_list
 
 
-def create_macip_rules_list(rules):
+def create_mac_rules_list(rules):
     rules_list = []
     for rule in rules.values():
         r = {
@@ -171,9 +171,9 @@ def get_config(config=None) -> dict:
         expand_nodes=Diff.DELETE | Diff.ADD,
     )
 
-    changed_macip_ifaces = node_changed(
+    changed_mac_ifaces = node_changed(
         conf,
-        base + ['macip', 'interface'],
+        base + ['mac', 'interface'],
         key_mangling=('-', '_'),
         recursive=True,
         expand_nodes=Diff.DELETE | Diff.ADD,
@@ -182,7 +182,7 @@ def get_config(config=None) -> dict:
     config.update(
         {
             'changed_ip_ifaces': changed_ip_ifaces,
-            'changed_macip_ifaces': changed_macip_ifaces,
+            'changed_mac_ifaces': changed_mac_ifaces,
             'vpp_ifaces': cli_ifaces_list(conf),
         }
     )
@@ -197,7 +197,7 @@ def verify(config):
     if 'remove' in config or 'remove_vpp' in config:
         return None
 
-    for acl_type in ['ip', 'macip']:
+    for acl_type in ['ip', 'mac']:
         if acl_type in config:
             acl = config.get(acl_type)
             if 'tag_name' not in acl:
@@ -306,8 +306,8 @@ def verify(config):
                             )
                         used_names.append(name)
 
-    if 'macip' in config:
-        acl = config.get('macip')
+    if 'mac' in config:
+        acl = config.get('mac')
         for iface, iface_config in acl.get('interface', {}).items():
             if 'tag_name' not in iface_config:
                 raise ConfigError(f'"tag-name" is required for interface {iface}')
@@ -342,18 +342,18 @@ def apply(config):
                 if acl_name not in config.get('ip', {}).get('tag_name', {}):
                     acl.delete_acl(acl_name)
 
-        # Delete ACL macip
-        if 'macip' in config.get('effective'):
-            remove_config_macip = config.get('effective').get('macip')
+        # Delete ACL mac
+        if 'mac' in config.get('effective'):
+            remove_config_mac = config.get('effective').get('mac')
 
             # Delete ACL interfaces
-            for interface in config.get('changed_macip_ifaces'):
-                acl.delete_acl_macip_interface(interface)
+            for interface in config.get('changed_mac_ifaces'):
+                acl.delete_acl_mac_interface(interface)
 
-            # Delete ACL macip
-            for acl_name in remove_config_macip.get('tag_name'):
-                if acl_name not in config.get('macip', {}).get('tag_name', {}):
-                    acl.delete_acl_macip(acl_name)
+            # Delete ACL mac
+            for acl_name in remove_config_mac.get('tag_name'):
+                if acl_name not in config.get('mac', {}).get('tag_name', {}):
+                    acl.delete_acl_mac(acl_name)
 
     if 'remove' in config:
         return None
@@ -377,16 +377,16 @@ def apply(config):
         ]
         acl.add_acl_interface(iface, input_tags, output_tags)
 
-    # Add or replace ACL macip
-    config_macip = config.get('macip', {})
-    for acl_name in config_macip.get('tag_name', {}):
-        rules = create_macip_rules_list(
-            config_macip.get('tag_name').get(acl_name).get('rule')
+    # Add or replace ACL mac
+    config_mac = config.get('mac', {})
+    for acl_name in config_mac.get('tag_name', {}):
+        rules = create_mac_rules_list(
+            config_mac.get('tag_name').get(acl_name).get('rule')
         )
-        acl.add_replace_acl_macip(acl_name, rules)
+        acl.add_replace_acl_mac(acl_name, rules)
 
-    for iface, iface_config in config_macip.get('interface', {}).items():
-        acl.add_acl_macip_interface(iface, iface_config.get('tag_name'))
+    for iface, iface_config in config_mac.get('interface', {}).items():
+        acl.add_acl_mac_interface(iface, iface_config.get('tag_name'))
 
 
 if __name__ == '__main__':