summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-03-30 16:41:05 +0200
committerGitHub <noreply@github.com>2020-03-30 16:41:05 +0200
commit84c2b27ed3148ff17ffeb2f4e034ffef6ddc0b0b (patch)
tree31763e439c140f5ca859c1b187f531bbd02e28d1
parentb183d43341fed17033c2526f1cd5c9c70bf10e0e (diff)
parent1648b91dd89fb7fdd9b914ba58ac902962795c5b (diff)
downloadvyos-1x-84c2b27ed3148ff17ffeb2f4e034ffef6ddc0b0b.tar.gz
vyos-1x-84c2b27ed3148ff17ffeb2f4e034ffef6ddc0b0b.zip
Merge pull request #285 from DmitriyEshenko/cur-proxy-arp
ifconfig: T2166: Recovery Proxy ARP for vlans
-rw-r--r--python/vyos/configdict.py5
-rw-r--r--python/vyos/ifconfig_vlan.py2
2 files changed, 7 insertions, 0 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 66da52ff3..24fe174d2 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -123,6 +123,7 @@ def vlan_to_dict(conf):
'ip_enable_arp_accept': 0,
'ip_enable_arp_announce': 0,
'ip_enable_arp_ignore': 0,
+ 'ip_proxy_arp': 0,
'ipv6_autoconf': 0,
'ipv6_forwarding': 1,
'ipv6_dup_addr_detect': 1,
@@ -190,6 +191,10 @@ def vlan_to_dict(conf):
if conf.exists('ip enable-arp-ignore'):
vlan['ip_enable_arp_ignore'] = 1
+ # Enable Proxy ARP
+ if conf.exists('ip enable-proxy-arp'):
+ vlan['ip_proxy_arp'] = 1
+
# Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)
if conf.exists('ipv6 address autoconf'):
vlan['ipv6_autoconf'] = 1
diff --git a/python/vyos/ifconfig_vlan.py b/python/vyos/ifconfig_vlan.py
index 00270cf58..ed22646c1 100644
--- a/python/vyos/ifconfig_vlan.py
+++ b/python/vyos/ifconfig_vlan.py
@@ -64,6 +64,8 @@ def apply_vlan_config(vlan, config):
vlan.set_arp_announce(config['ip_enable_arp_announce'])
# configure ARP ignore
vlan.set_arp_ignore(config['ip_enable_arp_ignore'])
+ # configure Proxy ARP
+ vlan.set_proxy_arp(config['ip_proxy_arp'])
# IPv6 address autoconfiguration
vlan.set_ipv6_autoconf(config['ipv6_autoconf'])
# IPv6 forwarding