configdict: T2372: interfaces must reuse interface_default_data

This is to remove the amount of duplicated entries in dictionaries. It's one
more part to move to a unified interface management.

5 files changed, 13 insertions, 124 deletions

diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index 93d2adbd6..40fadad27 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -22,53 +22,29 @@ from netifaces import interfaces
 
 from vyos.ifconfig import BondIf
 from vyos.ifconfig_vlan import apply_all_vlans, verify_vlan_config
-from vyos.configdict import list_diff, intf_to_dict, add_to_dict
+from vyos.configdict import list_diff, intf_to_dict, add_to_dict, interface_default_data
 from vyos.config import Config
 from vyos.util import call, cmd
 from vyos.validate import is_member, has_address_configured
 from vyos import ConfigError
 
 default_config_data = {
-    'address': [],
-    'address_remove': [],
+    **interface_default_data,
     'arp_mon_intvl': 0,
     'arp_mon_tgt': [],
-    'description': '',
     'deleted': False,
-    'dhcp_client_id': '',
-    'dhcp_hostname': '',
-    'dhcp_vendor_class_id': '',
-    'dhcpv6_prm_only': False,
-    'dhcpv6_temporary': False,
-    'disable': False,
-    'disable_link_detect': 1,
     'hash_policy': 'layer2',
     'intf': '',
     'ip_arp_cache_tmo': 30,
-    'ip_disable_arp_filter': 1,
-    'ip_enable_arp_accept': 0,
-    'ip_enable_arp_announce': 0,
-    'ip_enable_arp_ignore': 0,
-    'ip_proxy_arp': 0,
     'ip_proxy_arp_pvlan': 0,
-    'ipv6_accept_ra': 1,
-    'ipv6_autoconf': 0,
-    'ipv6_eui64_prefix': [],
-    'ipv6_eui64_prefix_remove': [],
-    'ipv6_forwarding': 1,
-    'ipv6_dup_addr_detect': 1,
-    'is_bridge_member': False,
-    'mac': '',
     'mode': '802.3ad',
     'member': [],
     'shutdown_required': False,
-    'mtu': 1500,
     'primary': '',
     'vif_s': {},
     'vif_s_remove': [],
     'vif': {},
     'vif_remove': [],
-    'vrf': ''
 }
 
 
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 217ba95e1..d55639019 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -22,47 +22,26 @@ from netifaces import interfaces
 
 from vyos.ifconfig import BridgeIf, Section
 from vyos.ifconfig.stp import STP
-from vyos.configdict import list_diff
+from vyos.configdict import list_diff, interface_default_data
 from vyos.validate import is_member, has_address_configured
 from vyos.config import Config
 from vyos.util import cmd, get_bridge_member_config
 from vyos import ConfigError
 
 default_config_data = {
-    'address': [],
-    'address_remove': [],
+    **interface_default_data,
     'aging': 300,
     'arp_cache_tmo': 30,
-    'description': '',
     'deleted': False,
-    'dhcp_client_id': '',
-    'dhcp_hostname': '',
-    'dhcp_vendor_class_id': '',
-    'dhcpv6_prm_only': False,
-    'dhcpv6_temporary': False,
-    'disable': False,
-    'disable_link_detect': 1,
     'forwarding_delay': 14,
     'hello_time': 2,
-    'ip_disable_arp_filter': 1,
-    'ip_enable_arp_accept': 0,
-    'ip_enable_arp_announce': 0,
-    'ip_enable_arp_ignore': 0,
-    'ipv6_accept_ra': 1,
-    'ipv6_autoconf': 0,
-    'ipv6_eui64_prefix': [],
-    'ipv6_eui64_prefix_remove': [],
-    'ipv6_forwarding': 1,
-    'ipv6_dup_addr_detect': 1,
     'igmp_querier': 0,
     'intf': '',
-    'mac' : '',
     'max_age': 20,
     'member': [],
     'member_remove': [],
     'priority': 32768,
-    'stp': 0,
-    'vrf': ''
+    'stp': 0
 }
 
 def get_config():
diff --git a/src/conf_mode/interfaces-ethernet.py b/src/conf_mode/interfaces-ethernet.py
index 5f7b0014e..97a631158 100755
--- a/src/conf_mode/interfaces-ethernet.py
+++ b/src/conf_mode/interfaces-ethernet.py
@@ -22,44 +22,21 @@ from netifaces import interfaces
 
 from vyos.ifconfig import EthernetIf
 from vyos.ifconfig_vlan import apply_all_vlans, verify_vlan_config
-from vyos.configdict import list_diff, intf_to_dict, add_to_dict
+from vyos.configdict import list_diff, intf_to_dict, add_to_dict, interface_default_data
 from vyos.validate import is_member
 from vyos.config import Config
 from vyos import ConfigError
 
 default_config_data = {
-    'address': [],
-    'address_remove': [],
-    'description': '',
+    **interface_default_data,
     'deleted': False,
-    'dhcp_client_id': '',
-    'dhcp_hostname': '',
-    'dhcp_vendor_class_id': '',
-    'dhcpv6_prm_only': False,
-    'dhcpv6_temporary': False,
-    'disable': False,
-    'disable_link_detect': 1,
     'duplex': 'auto',
     'flow_control': 'on',
     'hw_id': '',
     'ip_arp_cache_tmo': 30,
-    'ip_disable_arp_filter': 1,
-    'ip_enable_arp_accept': 0,
-    'ip_enable_arp_announce': 0,
-    'ip_enable_arp_ignore': 0,
-    'ip_proxy_arp': 0,
     'ip_proxy_arp_pvlan': 0,
-    'ipv6_accept_ra': 1,
-    'ipv6_autoconf': 0,
-    'ipv6_eui64_prefix': [],
-    'ipv6_eui64_prefix_remove': [],
-    'ipv6_forwarding': 1,
-    'ipv6_dup_addr_detect': 1,
-    'is_bridge_member': False,
     'is_bond_member': False,
     'intf': '',
-    'mac': '',
-    'mtu': 1500,
     'offload_gro': 'off',
     'offload_gso': 'off',
     'offload_sg': 'off',
@@ -73,6 +50,7 @@ default_config_data = {
     'vrf': ''
 }
 
+
 def get_config():
     # determine tagNode instance
     if 'VYOS_TAGNODE_VALUE' not in os.environ:
diff --git a/src/conf_mode/interfaces-pseudo-ethernet.py b/src/conf_mode/interfaces-pseudo-ethernet.py
index a050ae80b..b2f78bcc4 100755
--- a/src/conf_mode/interfaces-pseudo-ethernet.py
+++ b/src/conf_mode/interfaces-pseudo-ethernet.py
@@ -21,41 +21,19 @@ from sys import exit
 from netifaces import interfaces
 
 from vyos.config import Config
-from vyos.configdict import list_diff, intf_to_dict, add_to_dict
+from vyos.configdict import list_diff, intf_to_dict, add_to_dict, interface_default_data
 from vyos.ifconfig import MACVLANIf, Section
 from vyos.ifconfig_vlan import apply_all_vlans, verify_vlan_config
 from vyos import ConfigError
 
 default_config_data = {
-    'address': [],
-    'address_remove': [],
-    'description': '',
+    **interface_default_data,
     'deleted': False,
-    'dhcp_client_id': '',
-    'dhcp_hostname': '',
-    'dhcp_vendor_class_id': '',
-    'dhcpv6_prm_only': False,
-    'dhcpv6_temporary': False,
-    'disable': False,
-    'disable_link_detect': 1,
     'intf': '',
     'ip_arp_cache_tmo': 30,
-    'ip_disable_arp_filter': 1,
-    'ip_enable_arp_accept': 0,
-    'ip_enable_arp_announce': 0,
-    'ip_enable_arp_ignore': 0,
-    'ip_proxy_arp': 0,
     'ip_proxy_arp_pvlan': 0,
-    'ipv6_accept_ra': 1,
-    'ipv6_autoconf': 0,
-    'ipv6_eui64_prefix': [],
-    'ipv6_eui64_prefix_remove': [],
-    'ipv6_forwarding': 1,
-    'ipv6_dup_addr_detect': 1,
-    'is_bridge_member': False,
     'source_interface': '',
     'source_interface_changed': False,
-    'mac': '',
     'mode': 'private',
     'vif_s': {},
     'vif_s_remove': [],
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 70d46d061..c802fdcea 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -24,7 +24,7 @@ from netifaces import interfaces
 from netaddr import EUI, mac_unix_expanded
 
 from vyos.config import Config
-from vyos.configdict import list_diff, intf_to_dict, add_to_dict
+from vyos.configdict import list_diff, intf_to_dict, add_to_dict, interface_default_data
 from vyos.ifconfig import WiFiIf, Section
 from vyos.ifconfig_vlan import apply_all_vlans, verify_vlan_config
 from vyos.template import render
@@ -33,8 +33,7 @@ from vyos.validate import is_member
 from vyos import ConfigError
 
 default_config_data = {
-    'address': [],
-    'address_remove': [],
+    **interface_default_data,
     'cap_ht' : False,
     'cap_ht_40mhz_incapable' : False,
     'cap_ht_powersave' : False,
@@ -69,33 +68,13 @@ default_config_data = {
     'cap_vht_vht_cf' : False,
     'channel': '',
     'country_code': '',
-    'description': '',
     'deleted': False,
-    'dhcp_client_id': '',
-    'dhcp_hostname': '',
-    'dhcp_vendor_class_id': '',
-    'dhcpv6_prm_only': False,
-    'dhcpv6_temporary': False,
-    'disable': False,
     'disable_broadcast_ssid' : False,
     'disable_link_detect' : 1,
     'expunge_failing_stations' : False,
     'hw_id' : '',
     'intf': '',
     'isolate_stations' : False,
-    'ip_disable_arp_filter': 1,
-    'ip_enable_arp_accept': 0,
-    'ip_enable_arp_announce': 0,
-    'ip_enable_arp_ignore': 0,
-    'ip_proxy_arp': 0,
-    'ipv6_accept_ra': 1,
-    'ipv6_autoconf': 0,
-    'ipv6_eui64_prefix': [],
-    'ipv6_eui64_prefix_remove': [],
-    'ipv6_forwarding': 1,
-    'ipv6_dup_addr_detect': 1,
-    'is_bridge_member': False,
-    'mac' : '',
     'max_stations' : '',
     'mgmt_frame_protection' : 'disabled',
     'mode' : 'g',
@@ -113,8 +92,7 @@ default_config_data = {
     'vif': {},
     'vif_remove': [],
     'vif_s': {},
-    'vif_s_remove': [],
-    'vrf': ''
+    'vif_s_remove': []
 }
 
 def get_conf_file(conf_type, intf):