Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  openvpn: bridge: T1556: remove obsolete bridge-group definition
  ifconfig: T1849: fix DHCPv6 startup
  Python/VyOS validate: T1849: handle is_ipv6()/is_ipv6() exceptions
  ifconfig: T1793: remove dhcpv6 client debug output
  ddclient: T1853: bugfix TypeError exception
  syslog: T1845: syslog host no longer accepts a port
  syslog: code formatting
  syslog: T1845: syslog host no longer accepts a port
  syslog: renaming files and conf script to fit new scheme
  T1855, T1826: clean up the reboot/shutdown script.
  wireguard: T1853: disable peer doesn't work
  Revert "syslog: T1845: syslog host no longer accepts a port"
  dmvpn: T1784: Add swanctl load call
  syslog: T1845: syslog host no longer accepts a port
  [vyos.config] T1847: correctly set_level for path given as empty string

3 files changed, 44 insertions, 38 deletions

diff --git a/python/vyos/config.py b/python/vyos/config.py
index 5bd8fb072..c7bd96e2f 100644
--- a/python/vyos/config.py
+++ b/python/vyos/config.py
@@ -160,7 +160,10 @@ class Config(object):
         # and path supplied as method argument
         # XXX: for small strings in-place concatenation is not a problem
         if isinstance(path, str):
-            self._level = re.split(r'\s+', path)
+            if path:
+                self._level = re.split(r'\s*', path)
+            else:
+                self._level = []
         elif isinstance(path, list):
             self._level = path
         else:
diff --git a/python/vyos/ifconfig.py b/python/vyos/ifconfig.py
index f487e6a5b..72f11c04d 100644
--- a/python/vyos/ifconfig.py
+++ b/python/vyos/ifconfig.py
@@ -615,8 +615,6 @@ class Interface:
         >>> j.set_dhcpv6()
         """
         dhcpv6 = self.get_dhcpv6_options()
-        import pprint
-        pprint.pprint(dhcpv6)
 
         # better save then sorry .. should be checked in interface script
         # but if you missed it we are safe!
@@ -629,33 +627,32 @@ class Interface:
         with open(self._dhcpv6_cfg_file, 'w') as f:
             f.write(dhcpv6_text)
 
-        if self.get_state() == 'up':
-            # https://bugs.launchpad.net/ubuntu/+source/ifupdown/+bug/1447715
-            #
-            # wee need to wait for IPv6 DAD to finish once and interface is added
-            # this suxx :-(
-            sleep(5)
-
-            # no longer accept router announcements on this interface
-            self._write_sysfs('/proc/sys/net/ipv6/conf/{}/accept_ra'
-                  .format(self._ifname), 0)
-
-            # assemble command-line to start DHCPv6 client (dhclient)
-            cmd  = 'start-stop-daemon --start --quiet --pidfile ' + \
-                self._dhcpv6_pid_file
-            cmd += ' --exec /sbin/dhclient --'
-            # now pass arguments to dhclient binary
-            cmd += ' -6 -nw -cf {} -pf {} -lf {}'.format(
-                self._dhcpv6_cfg_file, self._dhcpv6_pid_file, self._dhcpv6_lease_file)
-
-            # add optional arguments
-            if dhcpv6['dhcpv6_prm_only']:
-                cmd += ' -S'
-            if dhcpv6['dhcpv6_temporary']:
-                cmd += ' -T'
-
-            cmd += ' {}'.format(self._ifname)
-            return self._cmd(cmd)
+        # https://bugs.launchpad.net/ubuntu/+source/ifupdown/+bug/1447715
+        #
+        # wee need to wait for IPv6 DAD to finish once and interface is added
+        # this suxx :-(
+        sleep(5)
+
+        # no longer accept router announcements on this interface
+        self._write_sysfs('/proc/sys/net/ipv6/conf/{}/accept_ra'
+              .format(self._ifname), 0)
+
+        # assemble command-line to start DHCPv6 client (dhclient)
+        cmd  = 'start-stop-daemon --start --quiet --pidfile ' + \
+            self._dhcpv6_pid_file
+        cmd += ' --exec /sbin/dhclient --'
+        # now pass arguments to dhclient binary
+        cmd += ' -6 -nw -cf {} -pf {} -lf {}'.format(
+            self._dhcpv6_cfg_file, self._dhcpv6_pid_file, self._dhcpv6_lease_file)
+
+        # add optional arguments
+        if dhcpv6['dhcpv6_prm_only']:
+            cmd += ' -S'
+        if dhcpv6['dhcpv6_temporary']:
+            cmd += ' -T'
+
+        cmd += ' {}'.format(self._ifname)
+        return self._cmd(cmd)
 
 
     def _del_dhcpv6(self):
diff --git a/python/vyos/validate.py b/python/vyos/validate.py
index 258f7f76a..3f3166022 100644
--- a/python/vyos/validate.py
+++ b/python/vyos/validate.py
@@ -29,10 +29,13 @@ def is_ipv4(addr):
 
     # With the below statement we can check for IPv4 networks and host
     # addresses at the same time
-    if ipaddress.ip_address(addr.split(r'/')[0]).version == 4:
-        return True
-    else:
-        return False
+    try:
+        if ipaddress.ip_address(addr.split(r'/')[0]).version == 4:
+            return True
+    except:
+        pass
+
+    return False
 
 def is_ipv6(addr):
     """
@@ -41,10 +44,13 @@ def is_ipv6(addr):
 
     # With the below statement we can check for IPv4 networks and host
     # addresses at the same time
-    if ipaddress.ip_network(addr.split(r'/')[0]).version == 6:
-        return True
-    else:
-        return False
+    try:
+        if ipaddress.ip_network(addr.split(r'/')[0]).version == 6:
+            return True
+    except:
+        pass
+
+    return False
 
 def is_intf_addr_assigned(intf, addr):
     """