T5160: firewall refactor: change firewall ip to firewall ipv4

3 files changed, 112 insertions, 71 deletions

diff --git a/src/conf_mode/firewall.py b/src/conf_mode/firewall.py
index 4c5341e22..a50ae2ec6 100755
--- a/src/conf_mode/firewall.py
+++ b/src/conf_mode/firewall.py
@@ -101,7 +101,7 @@ def geoip_updated(conf, firewall):
         if path[1] == 'ipv6_name':
             set_name = f'GEOIP_CC_name6_{path[2]}_{path[4]}'
 
-        if (path[0] == 'ip') and ( path[1] == 'forward' or path[1] == 'input' or path[1] == 'output' or path[1] == 'name' ):
+        if (path[0] == 'ipv4') and ( path[1] == 'forward' or path[1] == 'input' or path[1] == 'output' or path[1] == 'name' ):
             out['name'].append(set_name)
         elif (path[0] == 'ipv6') and ( path[1] == 'forward' or path[1] == 'input' or path[1] == 'output' or path[1] == 'ipv6_name' ):
             out['ipv6_name'].append(set_name)
@@ -133,6 +133,47 @@ def get_config(config=None):
                                     get_first_key=True,
                                     with_recursive_defaults=True)
 
+    # We have gathered the dict representation of the CLI, but there are
+    # default options which we need to update into the dictionary retrived.
+    # XXX: T2665: we currently have no nice way for defaults under tag
+    # nodes, thus we load the defaults "by hand"
+    default_values = defaults(base)
+
+    for family in ['ipv4', 'ipv6']:
+        for tmp in ['name', 'ipv6_name', 'forward', 'input', 'output', 'prerouting']:
+            if tmp in default_values[family]:
+                del default_values[family][tmp]
+
+
+    firewall = dict_merge(default_values, firewall)
+
+    # Merge in defaults for IPv4 ruleset
+    if 'name' in firewall['ipv4']:
+        default_values = defaults(base + ['ipv4'] + ['name'])
+        for name in firewall['ipv4']['name']:
+            firewall['ipv4']['name'][name] = dict_merge(default_values,
+                                                firewall['ipv4']['name'][name])
+    for hook in ['forward', 'input', 'output', 'prerouting']:
+        if hook in firewall['ipv4']:
+            for priority in ['filter', 'mangle', 'raw']:
+                if priority in firewall['ipv4'][hook]:
+                    default_values = defaults(base + ['ipv4'] + [hook] + [priority])
+                    firewall['ipv4'][hook][priority] = dict_merge(default_values,
+                                                        firewall['ipv4'][hook][priority])
+
+    # Merge in defaults for IPv6 ruleset
+    if 'ipv6_name' in firewall['ipv6']:
+        default_values = defaults(base + ['ipv6'] + ['ipv6-name'])
+        for ipv6_name in firewall['ipv6']['ipv6_name']:
+            firewall['ipv6']['ipv6_name'][ipv6_name] = dict_merge(default_values,
+                                                          firewall['ipv6']['ipv6_name'][ipv6_name])
+    for hook in ['forward', 'input', 'output', 'prerouting']:
+        if hook in firewall['ipv6']:
+            for priority in ['filter', 'mangle', 'raw']:
+                if priority in firewall['ipv6'][hook]:
+                    default_values = defaults(base + ['ipv6'] + [hook] + [priority])
+                    firewall['ipv6'][hook][priority] = dict_merge(default_values,
+                                                        firewall['ipv6'][hook][priority])
 
     firewall['group_resync'] = bool('group' in firewall or node_changed(conf, base + ['group']))
     if firewall['group_resync']:
@@ -165,7 +206,7 @@ def verify_rule(firewall, rule_conf, ipv6):
             raise ConfigError('jump-target defined, but action jump needed and it is not defined')
         target = rule_conf['jump_target']
         if not ipv6:
-            if target not in dict_search_args(firewall, 'ip', 'name'):
+            if target not in dict_search_args(firewall, 'ipv4', 'name'):
                 raise ConfigError(f'Invalid jump-target. Firewall name {target} does not exist on the system')
         else:
             if target not in dict_search_args(firewall, 'ipv6', 'ipv6_name'):
@@ -297,10 +338,10 @@ def verify(firewall):
                 for group_name, group in groups.items():
                     verify_nested_group(group_name, group, groups, [])
 
-    if 'ip' in firewall:
+    if 'ipv4' in firewall:
         for name in ['name','forward','input','output']:
-            if name in firewall['ip']:
-                for name_id, name_conf in firewall['ip'][name].items():
+            if name in firewall['ipv4']:
+                for name_id, name_conf in firewall['ipv4'][name].items():
                     if 'jump' in name_conf['default_action'] and 'default_jump_target' not in name_conf:
                         raise ConfigError('default-action set to jump, but no default-jump-target specified')
                     if 'default_jump_target' in name_conf:
@@ -310,7 +351,7 @@ def verify(firewall):
                         if name_conf['default_jump_target'] == name_id:
                             raise ConfigError(f'Loop detected on default-jump-target.')
                         ## Now need to check that default-jump-target exists (other firewall chain/name)
-                        if target not in dict_search_args(firewall['ip'], 'name'):
+                        if target not in dict_search_args(firewall['ipv4'], 'name'):
                             raise ConfigError(f'Invalid jump-target. Firewall name {target} does not exist on the system')
 
                     if 'rule' in name_conf:
diff --git a/src/migration-scripts/firewall/10-to-11 b/src/migration-scripts/firewall/10-to-11
index b2880afac..9dad86b62 100755
--- a/src/migration-scripts/firewall/10-to-11
+++ b/src/migration-scripts/firewall/10-to-11
@@ -20,22 +20,22 @@
 #  set firewall name <name> ...
 #  set firewall ipv6-name <name> ...
 #  To
-#  set firewall ip name <name> 
+#  set firewall ipv4 name <name> 
 #  set firewall ipv6 ipv6-name <name> 
 
 ## Also from 'firewall interface' removed.
 ## in and out:
     # set firewall interface <iface> [in|out] [name | ipv6-name] <name>
     # To
-    # set firewall [ip | ipv6] forward filter rule <5,10,15,...> [inbound-interface | outboubd-interface] interface-name <iface>
-    # set firewall [ip | ipv6] forward filter rule <5,10,15,...> action jump
-    # set firewall [ip | ipv6] forward filter rule <5,10,15,...> jump-target <name>
+    # set firewall [ipv4 | ipv6] forward filter rule <5,10,15,...> [inbound-interface | outboubd-interface] interface-name <iface>
+    # set firewall [ipv4 | ipv6] forward filter rule <5,10,15,...> action jump
+    # set firewall [ipv4 | ipv6] forward filter rule <5,10,15,...> jump-target <name>
 ## local:
     # set firewall interface <iface> local [name | ipv6-name] <name>
     # To
-    # set firewall [ip | ipv6] input filter rule <5,10,15,...> inbound-interface interface-name <iface>
-    # set firewall [ip | ipv6] input filter rule <5,10,15,...> action jump
-    # set firewall [ip | ipv6] input filter rule <5,10,15,...> jump-target <name>
+    # set firewall [ipv4 | ipv6] input filter rule <5,10,15,...> inbound-interface interface-name <iface>
+    # set firewall [ipv4 | ipv6] input filter rule <5,10,15,...> action jump
+    # set firewall [ipv4 | ipv6] input filter rule <5,10,15,...> jump-target <name>
 
 import re
 
@@ -63,7 +63,7 @@ if not config.exists(base):
 
 ### Migration of state policies
 if config.exists(base + ['state-policy']):
-    for family in ['ip', 'ipv6']:
+    for family in ['ipv4', 'ipv6']:
         for hook in ['forward', 'input', 'output']:
             for priority in ['filter']:
                 # Add default-action== accept for compatibility reasons:
@@ -89,11 +89,11 @@ for option in ['all-ping', 'broadcast-ping', 'config-trap', 'ip-src-route', 'ipv
 
 ### Migration of firewall name and ipv6-name
 if config.exists(base + ['name']):
-    config.set(['firewall', 'ip', 'name'])
-    config.set_tag(['firewall', 'ip', 'name'])
+    config.set(['firewall', 'ipv4', 'name'])
+    config.set_tag(['firewall', 'ipv4', 'name'])
 
     for ipv4name in config.list_nodes(base + ['name']):
-        config.copy(base + ['name', ipv4name], base + ['ip', 'name', ipv4name])
+        config.copy(base + ['name', ipv4name], base + ['ipv4', 'name', ipv4name])
     config.delete(base + ['name'])
 
 if config.exists(base + ['ipv6-name']):
@@ -117,8 +117,8 @@ if config.exists(base + ['interface']):
                     target = config.return_value(base + ['interface', iface, direction, 'name'])
                     if direction == 'in':
                         # Add default-action== accept for compatibility reasons:
-                        config.set(base + ['ip', 'forward', 'filter', 'default-action'], value='accept')
-                        new_base = base + ['ip', 'forward', 'filter', 'rule']
+                        config.set(base + ['ipv4', 'forward', 'filter', 'default-action'], value='accept')
+                        new_base = base + ['ipv4', 'forward', 'filter', 'rule']
                         config.set(new_base)
                         config.set_tag(new_base)
                         config.set(new_base + [fwd_ipv4_rule, 'inbound-interface', 'interface-name'], value=iface)
@@ -127,8 +127,8 @@ if config.exists(base + ['interface']):
                         fwd_ipv4_rule = fwd_ipv4_rule + 5
                     elif direction == 'out':
                         # Add default-action== accept for compatibility reasons:
-                        config.set(base + ['ip', 'forward', 'filter', 'default-action'], value='accept')
-                        new_base = base + ['ip', 'forward', 'filter', 'rule']
+                        config.set(base + ['ipv4', 'forward', 'filter', 'default-action'], value='accept')
+                        new_base = base + ['ipv4', 'forward', 'filter', 'rule']
                         config.set(new_base)
                         config.set_tag(new_base)
                         config.set(new_base + [fwd_ipv4_rule, 'outbound-interface', 'interface-name'], value=iface)
@@ -137,8 +137,8 @@ if config.exists(base + ['interface']):
                         fwd_ipv4_rule = fwd_ipv4_rule + 5
                     else:
                         # Add default-action== accept for compatibility reasons:
-                        config.set(base + ['ip', 'input', 'filter', 'default-action'], value='accept')
-                        new_base = base + ['ip', 'input', 'filter', 'rule']
+                        config.set(base + ['ipv4', 'input', 'filter', 'default-action'], value='accept')
+                        new_base = base + ['ipv4', 'input', 'filter', 'rule']
                         config.set(new_base)
                         config.set_tag(new_base)
                         config.set(new_base + [inp_ipv4_rule, 'inbound-interface', 'interface-name'], value=iface)
@@ -197,20 +197,20 @@ if config.exists(base + ['zone']):
         if config.exists(base + ['zone', zone, 'local-zone']):
             local_zone = 'True'
             # Add default-action== accept for compatibility reasons:
-            config.set(base + ['ip', 'input', 'filter', 'default-action'], value='accept')
+            config.set(base + ['ipv4', 'input', 'filter', 'default-action'], value='accept')
             config.set(base + ['ipv6', 'input', 'filter', 'default-action'], value='accept')
-            config.set(base + ['ip', 'output', 'filter', 'default-action'], value='accept')
+            config.set(base + ['ipv4', 'output', 'filter', 'default-action'], value='accept')
             config.set(base + ['ipv6', 'output', 'filter', 'default-action'], value='accept')
             for from_zone in config.list_nodes(base + ['zone', zone, 'from']):
                 group_name = 'IG_' + from_zone
                 if config.exists(base + ['zone', zone, 'from', from_zone, 'firewall', 'name']):
                     # ipv4 input ruleset
                     target_ipv4_chain = config.return_value(base + ['zone', zone, 'from', from_zone, 'firewall', 'name'])
-                    config.set(base + ['ip', 'input', 'filter', 'rule'])
-                    config.set_tag(base + ['ip', 'input', 'filter', 'rule'])
-                    config.set(base + ['ip', 'input', 'filter', 'rule', inp_ipv4_rule, 'inbound-interface', 'interface-group'], value=group_name)
-                    config.set(base + ['ip', 'input', 'filter', 'rule', inp_ipv4_rule, 'action'], value='jump')
-                    config.set(base + ['ip', 'input', 'filter', 'rule', inp_ipv4_rule, 'jump-target'], value=target_ipv4_chain)
+                    config.set(base + ['ipv4', 'input', 'filter', 'rule'])
+                    config.set_tag(base + ['ipv4', 'input', 'filter', 'rule'])
+                    config.set(base + ['ipv4', 'input', 'filter', 'rule', inp_ipv4_rule, 'inbound-interface', 'interface-group'], value=group_name)
+                    config.set(base + ['ipv4', 'input', 'filter', 'rule', inp_ipv4_rule, 'action'], value='jump')
+                    config.set(base + ['ipv4', 'input', 'filter', 'rule', inp_ipv4_rule, 'jump-target'], value=target_ipv4_chain)
                     inp_ipv4_rule = inp_ipv4_rule + 5
                 if config.exists(base + ['zone', zone, 'from', from_zone, 'firewall', 'ipv6-name']):
                     # ipv6 input ruleset
@@ -228,21 +228,21 @@ if config.exists(base + ['zone']):
                 local_def_action = config.return_value(base + ['zone', zone, 'default-action'])
             else:
                 local_def_action = 'drop'
-            config.set(base + ['ip', 'input', 'filter', 'rule'])
-            config.set_tag(base + ['ip', 'input', 'filter', 'rule'])
-            config.set(base + ['ip', 'input', 'filter', 'rule', inp_ipv4_rule, 'action'], value=local_def_action)
+            config.set(base + ['ipv4', 'input', 'filter', 'rule'])
+            config.set_tag(base + ['ipv4', 'input', 'filter', 'rule'])
+            config.set(base + ['ipv4', 'input', 'filter', 'rule', inp_ipv4_rule, 'action'], value=local_def_action)
             config.set(base + ['ipv6', 'input', 'filter', 'rule'])
             config.set_tag(base + ['ipv6', 'input', 'filter', 'rule'])
             config.set(base + ['ipv6', 'input', 'filter', 'rule', inp_ipv6_rule, 'action'], value=local_def_action)
             if config.exists(base + ['zone', zone, 'enable-default-log']):
-                config.set(base + ['ip', 'input', 'filter', 'rule', inp_ipv4_rule, 'log'], value='enable')
+                config.set(base + ['ipv4', 'input', 'filter', 'rule', inp_ipv4_rule, 'log'], value='enable')
                 config.set(base + ['ipv6', 'input', 'filter', 'rule', inp_ipv6_rule, 'log'], value='enable')
 
         else:
         # It's not a local zone
             group_name = 'IG_' + zone
             # Add default-action== accept for compatibility reasons:
-            config.set(base + ['ip', 'forward', 'filter', 'default-action'], value='accept')
+            config.set(base + ['ipv4', 'forward', 'filter', 'default-action'], value='accept')
             config.set(base + ['ipv6', 'forward', 'filter', 'default-action'], value='accept')
             # intra-filtering migration. By default accept
             intra_zone_ipv4_action = 'accept'
@@ -258,11 +258,11 @@ if config.exists(base + ['zone']):
                 if config.exists(base + ['zone', zone, 'intra-zone-filtering', 'firewall', 'ipv6-name']):
                     intra_zone_ipv6_target = config.return_value(base + ['zone', zone, 'intra-zone-filtering', 'firewall', 'ipv6-name'])
                     intra_zone_ipv6_action = 'jump'
-            config.set(base + ['ip', 'forward', 'filter', 'rule'])
-            config.set_tag(base + ['ip', 'forward', 'filter', 'rule'])
-            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
-            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'inbound-interface', 'interface-group'], value=group_name)
-            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'action'], value=intra_zone_ipv4_action)
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule'])
+            config.set_tag(base + ['ipv4', 'forward', 'filter', 'rule'])
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'inbound-interface', 'interface-group'], value=group_name)
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'action'], value=intra_zone_ipv4_action)
             config.set_tag(base + ['ipv6', 'forward', 'filter', 'rule'])
             config.set(base + ['ipv6', 'forward', 'filter', 'rule', fwd_ipv6_rule, 'outbound-interface', 'interface-group'], value=group_name)
             config.set(base + ['ipv6', 'forward', 'filter', 'rule', fwd_ipv6_rule, 'inbound-interface', 'interface-group'], value=group_name)
@@ -270,7 +270,7 @@ if config.exists(base + ['zone']):
             if intra_zone_ipv4_action == 'jump':
                 if config.exists(base + ['zone', zone, 'intra-zone-filtering', 'firewall', 'name']):
                     intra_zone_ipv4_target = config.return_value(base + ['zone', zone, 'intra-zone-filtering', 'firewall', 'name'])
-                    config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'jump-target'], value=intra_zone_ipv4_target)
+                    config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'jump-target'], value=intra_zone_ipv4_target)
             if intra_zone_ipv6_action == 'jump':
                 if config.exists(base + ['zone', zone, 'intra-zone-filtering', 'firewall', 'ipv6-name']):
                     intra_zone_ipv6_target = config.return_value(base + ['zone', zone, 'intra-zone-filtering', 'firewall', 'ipv6-name'])
@@ -293,20 +293,20 @@ if config.exists(base + ['zone']):
                         target_ipv4_chain = config.return_value(base + ['zone', zone, 'from', from_zone, 'firewall', 'name'])
                         if config.exists(base + ['zone', from_zone, 'local-zone']):
                             # It's from LOCAL zone -> Output filtering 
-                            config.set(base + ['ip', 'output', 'filter', 'rule'])
-                            config.set_tag(base + ['ip', 'output', 'filter', 'rule'])
-                            config.set(base + ['ip', 'output', 'filter', 'rule', out_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
-                            config.set(base + ['ip', 'output', 'filter', 'rule', out_ipv4_rule, 'action'], value='jump')
-                            config.set(base + ['ip', 'output', 'filter', 'rule', out_ipv4_rule, 'jump-target'], value=target_ipv4_chain)
+                            config.set(base + ['ipv4', 'output', 'filter', 'rule'])
+                            config.set_tag(base + ['ipv4', 'output', 'filter', 'rule'])
+                            config.set(base + ['ipv4', 'output', 'filter', 'rule', out_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
+                            config.set(base + ['ipv4', 'output', 'filter', 'rule', out_ipv4_rule, 'action'], value='jump')
+                            config.set(base + ['ipv4', 'output', 'filter', 'rule', out_ipv4_rule, 'jump-target'], value=target_ipv4_chain)
                             out_ipv4_rule = out_ipv4_rule + 5
                         else:
                             # It's not LOCAL zone -> forward filtering
-                            config.set(base + ['ip', 'forward', 'filter', 'rule'])
-                            config.set_tag(base + ['ip', 'forward', 'filter', 'rule'])
-                            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
-                            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'inbound-interface', 'interface-group'], value=from_group)
-                            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'action'], value='jump')
-                            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'jump-target'], value=target_ipv4_chain)
+                            config.set(base + ['ipv4', 'forward', 'filter', 'rule'])
+                            config.set_tag(base + ['ipv4', 'forward', 'filter', 'rule'])
+                            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
+                            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'inbound-interface', 'interface-group'], value=from_group)
+                            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'action'], value='jump')
+                            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'jump-target'], value=target_ipv4_chain)
                             fwd_ipv4_rule = fwd_ipv4_rule + 5
                     if config.exists(base + ['zone', zone, 'from', from_zone, 'firewall', 'ipv6-name']):
                         target_ipv6_chain = config.return_value(base + ['zone', zone, 'from', from_zone, 'firewall', 'ipv6-name'])
@@ -333,12 +333,12 @@ if config.exists(base + ['zone']):
                 def_action = config.return_value(base + ['zone', zone, 'default-action'])
             else:
                 def_action = 'drop'
-            config.set(base + ['ip', 'forward', 'filter', 'rule'])
-            config.set_tag(base + ['ip', 'forward', 'filter', 'rule'])
-            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
-            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'action'], value=def_action)
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule'])
+            config.set_tag(base + ['ipv4', 'forward', 'filter', 'rule'])
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'outbound-interface', 'interface-group'], value=group_name)
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'action'], value=def_action)
             description = 'zone_' + zone + ' default-action'
-            config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'description'], value=description)
+            config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'description'], value=description)
             config.set(base + ['ipv6', 'forward', 'filter', 'rule'])
             config.set_tag(base + ['ipv6', 'forward', 'filter', 'rule'])
             config.set(base + ['ipv6', 'forward', 'filter', 'rule', fwd_ipv6_rule, 'outbound-interface', 'interface-group'], value=group_name)
@@ -346,7 +346,7 @@ if config.exists(base + ['zone']):
             config.set(base + ['ipv6', 'forward', 'filter', 'rule', fwd_ipv6_rule, 'description'], value=description)
 
             if config.exists(base + ['zone', zone, 'enable-default-log']):
-                config.set(base + ['ip', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'log'], value='enable')
+                config.set(base + ['ipv4', 'forward', 'filter', 'rule', fwd_ipv4_rule, 'log'], value='enable')
                 config.set(base + ['ipv6', 'forward', 'filter', 'rule', fwd_ipv6_rule, 'log'], value='enable')
             fwd_ipv4_rule = fwd_ipv4_rule + 5
             fwd_ipv6_rule = fwd_ipv6_rule + 5
@@ -354,9 +354,9 @@ if config.exists(base + ['zone']):
     # Migrate default-action (force to be drop in output chain) if local zone is defined
     if local_zone == 'True':
         # General drop in output change if needed
-        config.set(base + ['ip', 'output', 'filter', 'rule'])
-        config.set_tag(base + ['ip', 'output', 'filter', 'rule'])
-        config.set(base + ['ip', 'output', 'filter', 'rule', out_ipv4_rule, 'action'], value=local_def_action)
+        config.set(base + ['ipv4', 'output', 'filter', 'rule'])
+        config.set_tag(base + ['ipv4', 'output', 'filter', 'rule'])
+        config.set(base + ['ipv4', 'output', 'filter', 'rule', out_ipv4_rule, 'action'], value=local_def_action)
         config.set(base + ['ipv6', 'output', 'filter', 'rule'])
         config.set_tag(base + ['ipv6', 'output', 'filter', 'rule'])
         config.set(base + ['ipv6', 'output', 'filter', 'rule', out_ipv6_rule, 'action'], value=local_def_action)
diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py
index 8eb883f81..ff7e2f398 100755
--- a/src/op_mode/firewall.py
+++ b/src/op_mode/firewall.py
@@ -27,7 +27,7 @@ from vyos.utils.dict import dict_search_args
 def get_config_firewall(conf, hook=None, priority=None, ipv6=False, interfaces=True):
     config_path = ['firewall']
     if hook:
-        config_path += ['ipv6' if ipv6 else 'ip', hook]
+        config_path += ['ipv6' if ipv6 else 'ipv4', hook]
         if priority:
             config_path += [priority]
 
@@ -160,9 +160,9 @@ def show_firewall():
     if not firewall:
         return
 
-    if 'ip' in firewall:
-        for hook, hook_conf in firewall['ip'].items():
-            for prior, prior_conf in firewall['ip'][hook].items():
+    if 'ipv4' in firewall:
+        for hook, hook_conf in firewall['ipv4'].items():
+            for prior, prior_conf in firewall['ipv4'][hook].items():
                 output_firewall_name(hook, prior, prior_conf, ipv6=False)
 
     if 'ipv6' in firewall:
@@ -265,9 +265,9 @@ def show_summary():
     v4_out = []
     v6_out = []
 
-    if 'ip' in firewall:
-        for hook, hook_conf in firewall['ip'].items():
-            for prior, prior_conf in firewall['ip'][hook].items():
+    if 'ipv4' in firewall:
+        for hook, hook_conf in firewall['ipv4'].items():
+            for prior, prior_conf in firewall['ipv4'][hook].items():
                 description = prior_conf.get('description', '')
                 v4_out.append([hook, prior, description])
 
@@ -296,9 +296,9 @@ def show_statistics():
     if not firewall:
         return
 
-    if 'ip' in firewall:
-        for hook, hook_conf in firewall['ip'].items():
-            for prior, prior_conf in firewall['ip'][hook].items():
+    if 'ipv4' in firewall:
+        for hook, hook_conf in firewall['ipv4'].items():
+            for prior, prior_conf in firewall['ipv4'][hook].items():
                 output_firewall_name_statistics(hook,prior, prior_conf, ipv6=False)
 
     if 'ipv6' in firewall: