Merge branch 'current' into crux

13 files changed, 664 insertions, 50 deletions

diff --git a/debian/control b/debian/control
index 4cd852687..05b4f5320 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,9 @@ Build-Depends: debhelper (>= 9),
   quilt,
   python3-lxml,
   python3-nose,
-  python3-coverage
+  python3-coverage,
+  whois,
+  libvyosconfig0
 Standards-Version: 3.9.6
 
 Package: vyos-1x
@@ -40,6 +42,7 @@ Depends: python3,
   libvyosconfig0,
   beep,
   isc-dhcp-server,
+  isc-dhcp-relay,
   keepalived (>=2.0.5),
   wireguard,
   tftpd-hpa,
diff --git a/interface-definitions/dhcp-relay.xml b/interface-definitions/dhcp-relay.xml
new file mode 100644
index 000000000..c918d25a3
--- /dev/null
+++ b/interface-definitions/dhcp-relay.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!-- DHCP relay configuration -->
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="dhcp-relay" owner="${vyos_conf_scripts_dir}/dhcp_relay.py">
+        <properties>
+          <help>Host Configuration Protocol (DHCP) relay agent</help>
+          <priority>910</priority>
+        </properties>
+        <children>
+          <leafNode name="interface">
+            <properties>
+              <help>DHCP relay interface [REQUIRED]</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py -b</script>
+              </completionHelp>
+              <multi/>
+            </properties>
+          </leafNode>
+          <node name="relay-options">
+            <properties>
+              <help>Relay options</help>
+            </properties>
+            <children>
+              <leafNode name="hop-count">
+                <properties>
+                  <help>Policy to discard packets that have reached specified hop-count</help>
+                  <valueHelp>
+                    <format>1-255</format>
+                    <description>Hop count (default: 10)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-255"/>
+                  </constraint>
+                  <constraintErrorMessage>hop-count must be a value between 1 and 255</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="max-size">
+                <properties>
+                  <help>Maximum packet size to send to a DHCPv4/BOOTP server</help>
+                  <valueHelp>
+                    <format>64-1400</format>
+                    <description>Maximum packet size (default: 576)</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 64-1400"/>
+                  </constraint>
+                  <constraintErrorMessage>max-size must be a value between 64 and 1400</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="port">
+                <properties>
+                  <help>Port number to listen on</help>
+                  <valueHelp>
+                    <format>1-65535</format>
+                    <description>Port to listen on</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65535"/>
+                  </constraint>
+                  <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage>
+                </properties>
+              </leafNode>
+              <leafNode name="relay-agents-packets">
+                <properties>
+                  <help>Policy to handle incoming DHCPv4 packets which already contain relay agent options (default: forward)</help>
+                  <valueHelp>
+                    <format>append</format>
+                    <description>append own relay options to packet</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>replace</format>
+                    <description>replace existing agent option field</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>forward</format>
+                    <description>forward packet unchanged</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>discard</format>
+                    <description>discard packet (default action if giaddr not set in packet)</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>(append|replace|forward|discard)</regex>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </node>
+          <leafNode name="server">
+            <properties>
+              <help>DHCP server address</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>DHCP server IPv4 address</description>
+              </valueHelp>
+              <multi/>
+              <constraint>
+                <validator name="ipv4-address"/>
+              </constraint>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/dhcpv6-relay.xml b/interface-definitions/dhcpv6-relay.xml
new file mode 100644
index 000000000..d6e6daf51
--- /dev/null
+++ b/interface-definitions/dhcpv6-relay.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<!-- DHCPv6 relay configuration -->
+<interfaceDefinition>
+  <node name="service">
+    <children>
+      <node name="dhcpv6-relay" owner="${vyos_conf_scripts_dir}/dhcpv6_relay.py">
+        <properties>
+          <help>DHCPv6 Relay Agent parameters</help>
+          <priority>900</priority>
+        </properties>
+        <children>
+          <tagNode name="listen-interface">
+            <properties>
+              <help>Interface for DHCPv6 Relay Agent to listen for requests</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <leafNode name="address">
+                <properties>
+                  <help>IPv6 address on listen-interface listen for requests on</help>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address on listen interface</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+          <leafNode name="listen-port">
+            <properties>
+              <help>UDP port to listen for requests on</help>
+              <valueHelp>
+                <format>1-65535</format>
+                <description>Port to listen on</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/>
+              </constraint>
+              <constraintErrorMessage>port must be a value between 1 and 65535</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <leafNode name="max-hop-count">
+            <properties>
+              <help>Maximum hop count for which requests will be processed</help>
+              <valueHelp>
+                <format>1-255</format>
+                <description>Hop count (default: 10)</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-255"/>
+              </constraint>
+              <constraintErrorMessage>max-hop-count must be a value between 1 and 255</constraintErrorMessage>
+            </properties>
+          </leafNode>
+          <tagNode name="upstream-interface">
+            <properties>
+              <help>Interface for DHCPv6 Relay Agent forward requests out</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_interfaces.py</script>
+              </completionHelp>
+            </properties>
+            <children>
+              <leafNode name="address">
+                <properties>
+                    <help>IPv6 address to forward requests to</help>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>IPv6 address of the DHCP server</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+              </leafNode>
+            </children>
+          </tagNode>
+          <leafNode name="use-interface-id-option">
+            <properties>
+              <help>Option to set DHCPv6 interface-ID option</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>
diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml
index 01e8ad7d3..e3d33e8cc 100644
--- a/interface-definitions/dns-forwarding.xml
+++ b/interface-definitions/dns-forwarding.xml
@@ -35,26 +35,26 @@
               <leafNode name="dnssec">
                 <properties>
                   <help>DNSSEC mode</help>
-                    <valueHelp>
-                      <format>off</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>process-no-validate</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>process</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>log-fail</format>
-                      <description></description>
-                    </valueHelp>
-                    <valueHelp>
-                      <format>validate</format>
-                      <description></description>
-                    </valueHelp>
+                  <valueHelp>
+                    <format>off</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>process-no-validate</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>process</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>log-fail</format>
+                    <description/>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>validate</format>
+                    <description/>
+                  </valueHelp>
                   <constraint>
                     <regex>(off|process-no-validate|process|log-fail|validate)</regex>
                   </constraint>
diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml
index c5504453e..c0ce976d6 100644
--- a/interface-definitions/ssh.xml
+++ b/interface-definitions/ssh.xml
@@ -161,11 +161,20 @@
                 <format>1-65535</format>
                 <description>Numeric IP port</description>
               </valueHelp>
+              <multi/>
               <constraint>
                 <validator name="numeric" argument="--range 1-65535"/>
               </constraint>
             </properties>
           </leafNode>
+          <leafNode name="client-keepalive-interval">
+            <properties>
+              <help>how often send keep alives in seconds</help>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/> 
+              </constraint>
+            </properties>
+          </leafNode>
         </children>
       </node>
     </children>
diff --git a/op-mode-definitions/show-bridge.xml b/op-mode-definitions/show-bridge.xml
index a3241951a..b285e2288 100644
--- a/op-mode-definitions/show-bridge.xml
+++ b/op-mode-definitions/show-bridge.xml
@@ -15,19 +15,19 @@
             <script>${vyos_completion_dir}/list_interfaces.py --type bridge</script>
           </completionHelp>
         </properties>
-        <command>/sbin/brctl show '$3'</command>
+        <command>/sbin/brctl show $3</command>
         <children>
           <leafNode name="macs">
             <properties>
               <help>Show bridge Media Access Control (MAC) address table</help>
             </properties>
-            <command>/sbin/brctl showmacs '$3'</command>
+            <command>/sbin/brctl showmacs $3</command>
           </leafNode>
           <leafNode name="spanning-tree">
             <properties>
               <help>Show bridge spanning tree information</help>
             </properties>
-            <command>/sbin/brctl showstp '$3'</command>
+            <command>/sbin/brctl showstp $3</command>
           </leafNode>
         </children>
     </tagNode>
diff --git a/op-mode-definitions/traffic-dump.xml b/op-mode-definitions/traffic-dump.xml
index 00a809a7c..6d86f7423 100644
--- a/op-mode-definitions/traffic-dump.xml
+++ b/op-mode-definitions/traffic-dump.xml
@@ -17,7 +17,7 @@
             </properties>
             <children>
               <tagNode name="filter">
-                <command>sudo tcpdump -n -i $4 $6</command>
+                <command>sudo tcpdump -n -i $4 "${@:6}"</command>
                 <properties>
                   <help>Monitor traffic matching filter conditions</help>
                 </properties>
@@ -29,7 +29,7 @@
                 </properties>
                 <children>
                   <tagNode name="filter">
-                    <command>sudo tcpdump -n -i $4 -w $6 $8</command>
+                    <command>sudo tcpdump -n -i $4 -w $6 "${@:8}"</command>
                     <properties>
                       <help>Save a dump of traffic matching filter conditions to a file</help>
                     </properties>
diff --git a/src/conf_mode/bridge_has_members.py b/src/conf_mode/bridge_has_members.py
new file mode 100755
index 000000000..712a9cc46
--- /dev/null
+++ b/src/conf_mode/bridge_has_members.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2018 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import sys
+
+import vyos.config
+
+if len(sys.argv) < 2:
+    print("Argument (bridge interface name) is required")
+    sys.exit(1)
+else:
+    bridge = sys.argv[1]
+
+c = vyos.config.Config()
+
+members = []
+
+
+# Check in ethernet and bonding interfaces
+for p in ["interfaces ethernet", "interfaces bonding"]:
+    intfs = c.list_nodes(p)
+    for i in intfs:
+        intf_bridge_path = "{0} {1} bridge-group bridge".format(p, i)
+        if c.exists(intf_bridge_path):
+            intf_bridge = c.return_value(intf_bridge_path)
+            if intf_bridge == bridge:
+                members.append(i)
+        # Walk VLANs
+        for v in c.list_nodes("{0} {1} vif".format(p, i)):
+            vif_bridge_path = "{0} {1} vif {2} bridge-group bridge".format(p, i, v)
+            if c.exists(vif_bridge_path):
+                vif_bridge = c.return_value(vif_bridge_path)
+                if vif_bridge == bridge:
+                    members.append("{0}.{1}".format(i, v))
+        # Walk QinQ interfaces
+        for vs in c.list_nodes("{0} {1} vif-s".format(p, i)):
+            vifs_bridge_path = "{0} {1} vif-s {2} bridge-group bridge".format(p, i, vs)
+            if c.exists(vifs_bridge_path):
+                vifs_bridge = c.return_value(vifs_bridge_path)
+                if vifs_bridge == bridge:
+                    members.append("{0}.{1}".format(i, vs))
+            for vc in c.list_nodes("{0} {1} vif-s {2} vif-c".format(p, i, vs)):
+                vifc_bridge_path = "{0} {1} vif-s {2} vif-c {3} bridge-group bridge".format(p, i, vs, vc)
+                if c.exists(vifc_bridge_path):
+                    vifc_bridge = c.return_value(vifc_bridge_path)
+                    if vifc_bridge == bridge:
+                        members.append("{0}.{1}.{2}".format(i, vs, vc))
+
+# Check tunnel interfaces
+for t in c.list_nodes("interfaces tunnel"):
+    tunnel_bridge_path = "interfaces tunnel {0} parameters ip bridge-group bridge".format(t)
+    if c.exists(tunnel_bridge_path):
+        intf_bridge = c.return_value(tunnel_bridge_path)
+        if intf_bridge == bridge:
+            members.append(t)
+
+# Check OpenVPN interfaces
+for o in c.list_nodes("interfaces openvpn"):
+    ovpn_bridge_path = "interfaces openvpn {0} bridge-group bridge".format(o)
+    if c.exists(ovpn_bridge_path):
+        intf_bridge = c.return_value(ovpn_bridge_path)
+        if intf_bridge == bridge:
+            members.append(o)
+
+if members:
+    print("Bridge {0} cannot be deleted because some interfaces are configured as its members".format(bridge))
+    print("The following interfaces are members of {0}: {1}".format(bridge, " ".join(members)))
+    sys.exit(1)
+else:
+    sys.exit(0)
diff --git a/src/conf_mode/dhcp_relay.py b/src/conf_mode/dhcp_relay.py
new file mode 100755
index 000000000..61b494b7e
--- /dev/null
+++ b/src/conf_mode/dhcp_relay.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2018 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import sys
+import os
+import jinja2
+
+from vyos.config import Config
+from vyos import ConfigError
+
+config_file = r'/etc/default/isc-dhcp-relay'
+
+# Please be careful if you edit the template.
+config_tmpl = """
+### Autogenerated by dhcp_relay.py ###
+
+# Defaults for isc-dhcp-relay initscript
+# sourced by /etc/init.d/isc-dhcp-relay
+
+#
+# This is a POSIX shell fragment
+#
+
+# What servers should the DHCP relay forward requests to?
+SERVERS="{{ server | join(' ') }}"
+
+# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests?
+INTERFACES="{{ interface | join(' ') }}"
+
+# Additional options that are passed to the DHCP relay daemon?
+OPTIONS="-4 {% if port -%} -p {{ port }}{%- endif %} {{ options | join(' ') }}"
+"""
+
+default_config_data = {
+    'interface': [],
+    'server': [],
+    'options': [],
+    'port': '',
+    'hop_count': '10',
+    'relay_agent_packets': 'forward'
+}
+
+def get_config():
+    relay = default_config_data
+    conf = Config()
+    if not conf.exists('service dhcp-relay'):
+        return None
+    else:
+        conf.set_level('service dhcp-relay')
+
+    # Network interfaces to listen on
+    if conf.exists('interface'):
+        relay['interface'] = conf.return_values('interface')
+
+    # Servers equal to the address of the DHCP server(s)
+    if conf.exists('server'):
+        relay['server'] = conf.return_values('server')
+
+    conf.set_level('service dhcp-relay relay-options')
+
+    if conf.exists('hop-count'):
+        count = '-c ' + conf.return_value('hop-count')
+        relay['options'].append(count)
+
+    # Specify the maximum packet size to send to a DHCPv4/BOOTP server.
+    # This might be done to allow sufficient space for addition of relay agent
+    # options while still fitting into the Ethernet MTU size.
+    #
+    # Available in DHCPv4 mode only:
+    if conf.exists('max-size'):
+        size = '-A ' + conf.return_value('max-size')
+        relay['options'].append(size)
+
+    # Listen and transmit on port <xy>. This is mostly useful for debugging
+    # purposes. Default is port 67 for DHCPv4/BOOTP, or port 547 for DHCPv6.
+    if conf.exists('port'):
+        relay['port'] = conf.return_value('port')
+
+    # Control the handling of incoming DHCPv4 packets which already contain
+    # relay agent options. If such a packet does not have giaddr set in its
+    # header, the DHCP standard requires that the packet be discarded. However,
+    # if giaddr is set, the relay agent may handle the situation in four ways:
+    # It may append its own set of relay options to the packet, leaving the
+    # supplied option field intact; it may replace the existing agent option
+    # field; it may forward the packet unchanged; or, it may discard it.
+    #
+    # Available in DHCPv4 mode only:
+    if conf.exists('relay-agents-packets'):
+        pkt = '-m ' + conf.return_value('relay-agents-packets')
+        relay['options'].append(pkt)
+
+    return relay
+
+def verify(relay):
+    # bail out early - looks like removal from running config
+    if relay is None:
+        return None
+
+    if len(relay['interface']) < 2:
+        # We can only issue a warning otherwise old configurations might break
+        print('WARNING: At least two interfaces are required for DHCP relay\n' \
+              'to work\n')
+
+    if 'lo' in relay['interface']:
+        raise ConfigError('DHCP relay does not support the loopback interface.')
+
+    if len(relay['server']) == 0:
+        raise ConfigError('No DHCP relay server(s) configured.\n' \
+                          'At least one DHCP relay server required.')
+
+    return None
+
+def generate(relay):
+    # bail out early - looks like removal from running config
+    if relay is None:
+        return None
+
+    tmpl = jinja2.Template(config_tmpl)
+    config_text = tmpl.render(relay)
+    with open(config_file, 'w') as f:
+        f.write(config_text)
+
+    return None
+
+def apply(relay):
+    if relay is not None:
+        os.system('sudo systemctl restart isc-dhcp-relay.service')
+    else:
+        # DHCP relay support is removed in the commit
+        os.system('sudo systemctl stop isc-dhcp-relay.service')
+        os.unlink(config_file)
+
+    return None
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        sys.exit(1)
diff --git a/src/conf_mode/dhcpv6_relay.py b/src/conf_mode/dhcpv6_relay.py
new file mode 100755
index 000000000..959bf0496
--- /dev/null
+++ b/src/conf_mode/dhcpv6_relay.py
@@ -0,0 +1,124 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2018 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+
+import sys
+import os
+import jinja2
+
+from vyos.config import Config
+from vyos import ConfigError
+
+config_file = r'/etc/default/isc-dhcpv6-relay'
+
+# Please be careful if you edit the template.
+config_tmpl = """
+### Autogenerated by dhcpv6_relay.py ###
+
+# Defaults for isc-dhcpv6-relay initscript sourced by /etc/init.d/isc-dhcpv6-relay
+
+OPTIONS="-6 -l {{ listen_addr | join('-l ') }} {% if port -%} -p {{ port }}{%- endif %} {{ options | join(' ') }} -u {{ upstream_addr | join('-u ') }}"
+"""
+
+default_config_data = {
+    'listen_addr': [],
+    'upstream_addr': [],
+    'port': '',
+    'options': [],
+}
+
+def get_config():
+    relay = default_config_data
+    conf = Config()
+    if not conf.exists('service dhcpv6-relay'):
+        return None
+    else:
+        conf.set_level('service dhcpv6-relay')
+
+    # Network interfaces/address to listen on for DHCPv6 query(s)
+    if conf.exists('listen-interface'):
+        interfaces = conf.list_nodes('listen-interface')
+        for intf in interfaces:
+            addr = conf.return_value('listen-interface {0} address'.format(intf))
+            listen = addr + '%' + intf
+            relay['listen_addr'].append(listen)
+
+    # Upstream interface/address for remote DHCPv6 server
+    if conf.exists('upstream-interface'):
+        interfaces = conf.list_nodes('upstream-interface')
+        for intf in interfaces:
+            addr = conf.return_value('upstream-interface {0} address'.format(intf))
+            server = addr + '%' + intf
+            relay['upstream_addr'].append(server)
+
+    # Listen and transmit on port <xy>. This is mostly useful for debugging
+    # purposes. Default is port 67 for DHCPv4/BOOTP, or port 547 for DHCPv6.
+    if conf.exists('listen-port'):
+        relay['port'] = conf.return_value('listen-port')
+
+    # Maximum hop count. When forwarding packets, dhcrelay discards packets
+    # which have reached a hop count of COUNT. Default is 10. Maximum is 255.
+    if conf.exists('max-hop-count'):
+        count = '-c ' + conf.return_value('max-hop-count')
+        relay['options'].append(count)
+
+    if conf.exists('use-interface-id-option'):
+        relay['options'].append('-I')
+
+    return relay
+
+def verify(relay):
+    # bail out early - looks like removal from running config
+    if relay is None:
+        return None
+
+    if len(relay['listen_addr']) == 0 or len(relay['upstream_addr']) == 0:
+        raise ConfigError('Must set at least one listen and upstream interface.')
+
+    return None
+
+def generate(relay):
+    # bail out early - looks like removal from running config
+    if relay is None:
+        return None
+
+    tmpl = jinja2.Template(config_tmpl)
+    config_text = tmpl.render(relay)
+    with open(config_file, 'w') as f:
+        f.write(config_text)
+
+    return None
+
+def apply(relay):
+    if relay is not None:
+        os.system('sudo systemctl restart isc-dhcpv6-relay.service')
+    else:
+        # DHCPv6 relay support is removed in the commit
+        os.system('sudo systemctl stop isc-dhcpv6-relay.service')
+        os.unlink(config_file)
+
+    return None
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        sys.exit(1)
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index cbca72a85..7d695bb4c 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -47,7 +47,7 @@ OIDs = {
     'des' : '.1.3.6.1.6.3.10.1.2.2',
     'none': '.1.3.6.1.6.3.10.1.2.1'
 }
-# SNMPS template - be careful if you edit the template.
+# SNMP template (/etc/snmp/snmp.conf) - be careful if you edit the template.
 client_config_tmpl = """
 ### Autogenerated by snmp.py ###
 {% if trap_source -%}
@@ -56,7 +56,7 @@ clientaddr {{ trap_source }}
 
 """
 
-# SNMPS template - be careful if you edit the template.
+# SNMP template (/usr/share/snmp/snmpd.conf) - be careful if you edit the template.
 access_config_tmpl = """
 ### Autogenerated by snmp.py ###
 {%- for u in v3_users %}
@@ -67,7 +67,7 @@ rwuser {{ vyos_user }}
 
 """
 
-# SNMPS template - be careful if you edit the template.
+# SNMP template (/var/lib/snmp/snmpd.conf) - be careful if you edit the template.
 user_config_tmpl = """
 ### Autogenerated by snmp.py ###
 # user
@@ -87,7 +87,7 @@ oldEngineID {{ v3_engineid }}
 {%- endif %}
 """
 
-# SNMPS template - be careful if you edit the template.
+# SNMP template (/etc/snmp/snmpd.conf) - be careful if you edit the template.
 daemon_config_tmpl = """
 ### Autogenerated by snmp.py ###
 
@@ -95,15 +95,10 @@ daemon_config_tmpl = """
 sysObjectID 1.3.6.1.4.1.44641
 sysServices 14
 master agentx
-agentXPerms 0755 0755
+agentXPerms 0777 0777
 pass .1.3.6.1.2.1.31.1.1.1.18 /opt/vyatta/sbin/if-mib-alias
 smuxpeer .1.3.6.1.2.1.83
 smuxpeer .1.3.6.1.2.1.157
-smuxpeer .1.3.6.1.4.1.3317.1.2.2
-smuxpeer .1.3.6.1.4.1.3317.1.2.3
-smuxpeer .1.3.6.1.4.1.3317.1.2.5
-smuxpeer .1.3.6.1.4.1.3317.1.2.8
-smuxpeer .1.3.6.1.4.1.3317.1.2.9
 smuxsocket localhost
 
 # linkUp/Down configure the Event MIB tables to monitor
@@ -209,6 +204,7 @@ group {{ u.group }} tsm {{ u.name }}
 {%- endif %}
 """
 
+# SNMP template (/etc/default/snmpd) - be careful if you edit the template.
 init_config_tmpl = """
 ### Autogenerated by snmp.py ###
 # This file controls the activity of snmpd
@@ -834,6 +830,9 @@ def apply(snmp):
                     os.system('vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_delete service snmp v3 user "{0}" auth plaintext-key > /dev/null'.format(cfg['user']))
                     os.system('vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_delete service snmp v3 user "{0}" privacy plaintext-key > /dev/null'.format(cfg['user']))
 
+    # Enable AgentX in FRR
+    os.system('vtysh -c "configure terminal" -c "agentx"')
+
     return None
 
 if __name__ == '__main__':
diff --git a/src/conf_mode/ssh.py b/src/conf_mode/ssh.py
index 9b6c5cea5..2a5cba99a 100755
--- a/src/conf_mode/ssh.py
+++ b/src/conf_mode/ssh.py
@@ -67,7 +67,13 @@ UseDNS {{ host_validation }}
 
 # Specifies the port number that sshd listens on.  The default is 22.
 # Multiple options of this type are permitted.
+{% if mport|length != 0 %}
+{% for p in mport %}
+Port {{ p }}
+{% endfor %}
+{% else %}
 Port {{ port }}
+{% endif %}
 
 # Gives the verbosity level that is used when logging messages from sshd
 LogLevel {{ log_level }}
@@ -78,64 +84,80 @@ PermitRootLogin no
 # Specifies whether password authentication is allowed
 PasswordAuthentication {{ password_authentication }}
 
-{% if listen_on -%}
+{% if listen_on %}
 # Specifies the local addresses sshd should listen on
-{% for a in listen_on -%}
+{% for a in listen_on %}
 ListenAddress {{ a }}
-{% endfor -%}
+{% endfor %}
+{{ "\n" }}
 {% endif %}
 
-{% if ciphers -%}
+{%- if ciphers %}
 # Specifies the ciphers allowed. Multiple ciphers must be comma-separated.
 #
 # NOTE: As of now, there is no 'multi' node for 'ciphers', thus we have only one :/
 Ciphers {{ ciphers | join(",") }}
+{{ "\n" }}
 {% endif %}
 
-{% if mac -%}
+{%- if mac %}
 # Specifies the available MAC (message authentication code) algorithms. The MAC
 # algorithm is used for data integrity protection. Multiple algorithms must be
 # comma-separated.
 #
 # NOTE: As of now, there is no 'multi' node for 'mac', thus we have only one :/
 MACs {{ mac | join(",") }}
+{{ "\n" }}
 {% endif %}
 
-{% if key_exchange -%}
+{%- if key_exchange %}
 # Specifies the available KEX (Key Exchange) algorithms. Multiple algorithms must
 # be comma-separated.
 #
 # NOTE: As of now, there is no 'multi' node for 'key-exchange', thus we have only one :/
 KexAlgorithms {{ key_exchange | join(",") }}
+{{ "\n" }}
 {% endif %}
 
-{% if allow_users -%}
+{%- if allow_users %}
 # This keyword can be followed by a list of user name patterns, separated by spaces.
 # If specified, login is allowed only for user names that match one of the patterns. 
 # Only user names are valid, a numerical user ID is not recognized.
 AllowUsers {{ allow_users | join(" ") }}
+{{ "\n" }}
 {% endif %}
 
-{% if allow_groups -%}
+{%- if allow_groups %}
 # This keyword can be followed by a list of group name patterns, separated by spaces.
 # If specified, login is allowed only for users whose primary group or supplementary
 # group list matches one of the patterns. Only group names are valid, a numerical group
 # ID is not recognized.
 AllowGroups {{ allow_groups | join(" ") }}
+{{ "\n" }}
 {% endif %}
 
-{% if deny_users -%}
+{%- if deny_users %}
 # This keyword can be followed by a list of user name patterns, separated by spaces.
 # Login is disallowed for user names that match one of the patterns. Only user names
 # are valid, a numerical user ID is not	recognized.
 DenyUsers {{ deny_users | join(" ") }}
+{{ "\n" }}
 {% endif %}
 
-{% if deny_groups -%}
+{%- if deny_groups %}
 # This keyword can be followed by a list of group name patterns, separated by spaces.
 # Login is disallowed for users whose primary group or supplementary group list matches
 # one of the patterns. Only group names are valid, a numerical group ID is not recognized.
 DenyGroups {{ deny_groups | join(" ") }}
+{{ "\n" }}
+{% endif %}
+
+{%- if client_keepalive %}
+# Sets a timeout interval in seconds after which if no data has been received from the client,
+# sshd will send a message through the encrypted channel to request a response from the client.
+# The default is 0, indicating that these messages will not be sent to the client.
+# This option applies to protocol version 2 only. 
+ClientAliveInterval {{ client_keepalive }}
 {% endif %}
 """
 
@@ -204,8 +226,17 @@ def get_config():
         ssh['mac'] = mac
 
     if conf.exists('port'):
-        port = conf.return_value('port')
-        ssh['port'] = port
+        ports = conf.return_values('port')
+        mport = []
+
+        for prt in ports:
+            mport.append(prt)
+
+        ssh['mport'] = mport
+
+    if conf.exists('client-keepalive-interval'):
+        client_keepalive = conf.return_value('client-keepalive-interval')
+        ssh['client_keepalive'] = client_keepalive
 
     return ssh
 
@@ -224,7 +255,7 @@ def generate(ssh):
     if ssh is None:
         return None
 
-    tmpl = jinja2.Template(config_tmpl)
+    tmpl = jinja2.Template(config_tmpl, trim_blocks=True)
     config_text = tmpl.render(ssh)
     with open(config_file, 'w') as f:
         f.write(config_text)
diff --git a/src/op_mode/show_dhcp.py b/src/op_mode/show_dhcp.py
index e76fc3a14..0005d62a3 100755
--- a/src/op_mode/show_dhcp.py
+++ b/src/op_mode/show_dhcp.py
@@ -142,7 +142,12 @@ if __name__ == '__main__':
         for p in pools:
             size = get_pool_size(config, p)
             leases = len(get_leases(lease_file, state='active', pool=args.pool))
-            use_percentage = round(leases / size) * 100
+
+            if size != 0:
+                use_percentage = round(leases / size) * 100
+            else:
+                use_percentage = 0
+
             if args.json:
                 pool_stats = {"pool": p, "size": size, "leases": leases,
                               "available": (size - leases), "percentage": use_percentage}