From adc09e4ecaf91bc93b3994eac4f2f2ac2786a1c7 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 25 Mar 2020 19:41:54 +0100
Subject: ipv6: T1831: use integers over bool in interface configuration

---
 python/vyos/configdict.py         | 8 ++++----
 python/vyos/ifconfig/interface.py | 6 +++---
 python/vyos/ifconfig_vlan.py      | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'python')

diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py
index 705fecd9b..b0214ded4 100644
--- a/python/vyos/configdict.py
+++ b/python/vyos/configdict.py
@@ -123,8 +123,8 @@ def vlan_to_dict(conf):
         'ip_enable_arp_accept': 0,
         'ip_enable_arp_announce': 0,
         'ip_enable_arp_ignore': 0,
-        'ipv6_forwarding': True,
-        'ipv6_dup_addr_detect': '1',
+        'ipv6_forwarding': 1,
+        'ipv6_dup_addr_detect': 1,
         'ingress_qos': '',
         'ingress_qos_changed': False,
         'mac': '',
@@ -191,11 +191,11 @@ def vlan_to_dict(conf):
 
     # Disable IPv6 forwarding on this interface
     if conf.exists('ipv6 disable-forwarding'):
-        vlan['ipv6_forwarding'] = False
+        vlan['ipv6_forwarding'] = 0
 
     # IPv6 Duplicate Address Detection (DAD) tries
     if conf.exists('ipv6 dup-addr-detect-transmits'):
-        vlan['ipv6_dup_addr_detect'] = conf.return_value('dup-addr-detect-transmits')
+        vlan['ipv6_dup_addr_detect'] = int(conf.return_value('ipv6 dup-addr-detect-transmits'))
 
     # Media Access Control (MAC) address
     if conf.exists('mac'):
diff --git a/python/vyos/ifconfig/interface.py b/python/vyos/ifconfig/interface.py
index ae0b652b0..da6b54e69 100644
--- a/python/vyos/ifconfig/interface.py
+++ b/python/vyos/ifconfig/interface.py
@@ -116,11 +116,11 @@ class Interface(DHCP):
             'location': '/proc/sys/net/ipv4/conf/{ifname}/arp_ignore',
         },
         'ipv6_forwarding': {
-            'validate': assert_boolean,
+            'validate': lambda fwd: assert_range(fwd,0,2),
             'location': '/proc/sys/net/ipv6/conf/{ifname}/forwarding',
         },
         'ipv6_dad_transmits': {
-            'validate': assert_boolean,
+            'validate': assert_positive,
             'location': '/proc/sys/net/ipv6/conf/{ifname}/dad_transmits',
         },
         'proxy_arp': {
@@ -409,7 +409,7 @@ class Interface(DHCP):
         """
         return self.set_interface('ipv6_forwarding', forwarding)
 
-    def set_dad_messages(self, dad):
+    def set_ipv6_dad_messages(self, dad):
         """
         The amount of Duplicate Address Detection probes to send.
         Default: 1
diff --git a/python/vyos/ifconfig_vlan.py b/python/vyos/ifconfig_vlan.py
index 11143f0bf..b3c5f3b76 100644
--- a/python/vyos/ifconfig_vlan.py
+++ b/python/vyos/ifconfig_vlan.py
@@ -65,9 +65,9 @@ def apply_vlan_config(vlan, config):
     # configure ARP ignore
     vlan.set_arp_ignore(config['ip_enable_arp_ignore'])
     # Disable IPv6 forwarding on this interface
-    vlan.ipv6_forwarding(bond['ipv6_forwarding'])
+    vlan.set_ipv6_forwarding(config['ipv6_forwarding'])
     # IPv6 Duplicate Address Detection (DAD) tries
-    vlan.ipv6_dad_messages(bond['ipv6_dup_addr_detect'])
+    vlan.set_ipv6_dad_messages(config['ipv6_dup_addr_detect'])
     # Maximum Transmission Unit (MTU)
     vlan.set_mtu(config['mtu'])
 
-- 
cgit v1.2.3