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

8 files changed, 407 insertions, 70 deletions

diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py
index 4aea84c44..0ef22110f 100755
--- a/src/conf_mode/accel_pppoe.py
+++ b/src/conf_mode/accel_pppoe.py
@@ -45,15 +45,22 @@ pppoe_config = '''
 log_syslog
 pppoe
 ippool
+{% if client_ipv6_pool %}
+ipv6pool
+{% endif %}
 chap-secrets
 auth_pap
 auth_chap_md5
 auth_mschap_v1
 auth_mschap_v2
-pppd_compat
-shaper
+#pppd_compat
+#shaper
+{% if snmp == 'enable' or snmp == 'enable-ma' %}
 net-snmp
+{% endif %}
+{% if limits %}
 connlimit
+{% endif %}
 {% if authentication['mode'] == 'radius' %}
 radius
 {% endif %}
@@ -66,8 +73,10 @@ syslog=accel-pppoe,daemon
 copy=1
 level=5
 
+{% if snmp == 'enable-ma' %}
 [snmp]
 master=1
+{% endif %}
 
 [client-ip-range]
 disable
@@ -78,6 +87,16 @@ disable
 {% endif %}
 gw-ip-address={{ppp_gw}}
 
+{% if client_ipv6_pool %}
+[ipv6-pool]
+{% for prfx in client_ipv6_pool['prefix']: %}
+{{prfx}}
+{% endfor %}
+{% for prfx in client_ipv6_pool['delegate-prefix']: %}
+delegate={{prfx}}
+{% endfor %}
+{% endif %}
+
 {% if dns %}
 [dns]
 {% if dns[0] %}
@@ -88,6 +107,13 @@ dns2={{dns[1]}}
 {% endif %}
 {% endif %}
 
+{% if dnsv6 %}
+[dnsv6]
+{% for srv in dnsv6: %}
+dns={{srv}}
+{% endfor %}
+{% endif %}
+
 {% if wins %}
 [wins]
 {% if wins[0] %}
@@ -106,27 +132,83 @@ chap-secrets=/etc/accel-ppp/pppoe/chap-secrets
 {% if authentication['mode'] == 'radius' %}
 [radius]
 {% for rsrv in authentication['radiussrv']: %}
-server={{rsrv}},{{authentication['radiussrv'][rsrv]}}
+server={{rsrv}},{{authentication['radiussrv'][rsrv]['secret']}},\
+req-limit={{authentication['radiussrv'][rsrv]['req-limit']}},\
+fail-time={{authentication['radiussrv'][rsrv]['fail-time']}}
 {% endfor %}
-timeout=10
-acct-timeout=3
+{% if authentication['radiusopt']['timeout'] %}
+timeout={{authentication['radiusopt']['timeout']}}
+{% endif %}
+{% if authentication['radiusopt']['acct-timeout'] %}
+acct-timeout={{authentication['radiusopt']['acct-timeout']}}
+{% endif %}
+{% if authentication['radiusopt']['max-try'] %}
+max-try={{authentication['radiusopt']['max-try']}}
+{% endif %}
+{% if authentication['radiusopt']['nas-id'] %}
+nas-identifier={{authentication['radiusopt']['nas-id']}}
+{% endif %}
+{% if authentication['radiusopt']['nas-ip'] %}
+nas-ip-address={{authentication['radiusopt']['nas-ip']}}
+{% endif %}
+{% if authentication['radiusopt']['dae-srv'] %}
+dae-server={{authentication['radiusopt']['dae-srv']['ip-addr']}}:\
+{{authentication['radiusopt']['dae-srv']['port']}},\
+{{authentication['radiusopt']['dae-srv']['secret']}}
+{% endif %}
 gw-ip-address={{ppp_gw}}
 verbose=1
 {% endif %}
 
 [ppp]
 verbose=1
-min-mtu={{mtu}}
-mtu={{mtu}}
-mru=1400
-check-ip=1
-mppe=prefer
-ipv4=require
 check-ip=1
 single-session=replace
+{% if ppp_options['ccp'] %}
+ccp=1
+{% endif %}
+{% if ppp_options['min-mtu'] %}
+min-mtu={{ppp_options['min-mtu']}}
+{% else %}
+min-mtu={{mtu}}
+{% endif %}
+{% if ppp_options['mru'] %}
+mru={{ppp_options['mru']}}
+{% endif %}
+{% if ppp_options['mppe'] %}
+mppe={{ppp_options['mppe']}}
+{% else %}
 mppe=prefer
+{% endif %}
+{% if ppp_options['lcp-echo-interval'] %}
+lcp-echo-interval={{ppp_options['lcp-echo-interval']}}
+{% else %}
 lcp-echo-interval=30
+{% endif %}
+{% if ppp_options['lcp-echo-timeout'] %}
+lcp-echo-timeout={{ppp_options['lcp-echo-timeout']}}
+{% endif %}
+{% if ppp_options['lcp-echo-failure'] %}
+lcp-echo-failure={{ppp_options['lcp-echo-failure']}}
+{% else %}
 lcp-echo-failure=3
+{% endif %}
+{% if ppp_options['ipv4'] %}
+ipv4={{ppp_options['ipv4']}}
+{% endif %}
+{% if ppp_options['ipv6'] %}
+ipv6={{ppp_options['ipv6']}}
+{% if ppp_options['ipv6-intf-id'] %}
+ipv6-intf-id={{ppp_options['ipv6-intf-id']}}
+{% endif %}
+{% if ppp_options['ipv6-peer-intf-id'] %}
+ipv6-peer-intf-id={{ppp_options['ipv6-peer-intf-id']}}
+{% endif %}
+{% if ppp_options['ipv6-accept-peer-intf-id'] %}
+ipv6-accept-peer-intf-id={{ppp_options['ipv6-accept-peer-intf-id']}}
+{% endif %}
+{% endif %}
+mtu={{mtu}}
 
 [pppoe]
 verbose=1
@@ -141,12 +223,15 @@ interface={{int}}
 {% if svc_name %}
 service-name={{svc_name}}
 {% endif %}
+pado-delay=0
+# maybe: called-sid, tr101, padi-limit etc.
 
-
+{% if limits %}
 [connlimit]
-limit=10/min
-burst=3
-timeout=60
+limit={{limits['conn-limit']}}
+burst={{limits['burst']}}
+timeout={{limits['timeout']}}
+{% endif %}
 
 [cli]
 tcp=127.0.0.1:2001
@@ -210,24 +295,30 @@ def get_config():
     return None
 
   config_data = {
-    'concentrator'    : 'vyos-ac',
-    'authentication'  : {
-      'local-users'   : {
+    'concentrator'      : 'vyos-ac',
+    'authentication'    : {
+      'local-users'     : {
       },
-      'mode'          : 'local',
-      'radiussrv'     : {}
+      'mode'            : 'local',
+      'radiussrv'       : {},
+      'radiusopt'       : {}
     },
-    'client_ip_pool'  : '',
-    'interface'       : [],
-    'ppp_gw'          : '',
-    'svc_name'        : '',
-    'dns'             : [],
-    'wins'            : [],
-    'mtu'             : '1492'
+    'client_ip_pool'    : '',
+    'client_ipv6_pool'  : {},
+    'interface'         : [],
+    'ppp_gw'            : '',
+    'svc_name'          : '',
+    'dns'               : [],
+    'dnsv6'             : [],
+    'wins'              : [],
+    'mtu'               : '1492',
+    'ppp_options'       : {},
+    'limits'            : {},
+    'snmp'              : 'disable'
   }
 
   c.set_level('service pppoe-server')
-    
+  ### general options 
   if c.exists('access-concentrator'):
     config_data['concentrator'] = c.return_value('access-concentrator')
   if c.exists('service-name'):
@@ -241,6 +332,13 @@ def get_config():
       config_data['dns'].append(c.return_value('dns-servers server-1'))
     if c.return_value('dns-servers server-2'):
       config_data['dns'].append(c.return_value('dns-servers server-2'))
+  if c.exists('dnsv6-servers'):
+    if c.return_value('dnsv6-servers server-1'):
+      config_data['dnsv6'].append(c.return_value('dnsv6-servers server-1'))
+    if c.return_value('dnsv6-servers server-2'):
+      config_data['dnsv6'].append(c.return_value('dnsv6-servers server-2'))
+    if c.return_value('dnsv6-servers server-3'):
+      config_data['dnsv6'].append(c.return_value('dnsv6-servers server-3'))
   if c.exists('wins-servers'):
     if c.return_value('wins-servers server-1'):
       config_data['wins'].append(c.return_value('wins-servers server-1'))
@@ -253,42 +351,128 @@ def get_config():
       config_data['client_ip_pool'] += '-' + re.search('[0-9]+$', c.return_value('client-ip-pool stop')).group(0)
     else:
       raise ConfigError('client ip pool stop required')
+  if c.exists('client-ipv6-pool prefix'):
+    config_data['client_ipv6_pool']['prefix'] = c.return_values('client-ipv6-pool prefix')
+    if c.exists('client-ipv6-pool delegate-prefix'):
+      config_data['client_ipv6_pool']['delegate-prefix'] = c.return_values('client-ipv6-pool delegate-prefix')
+  if c.exists('limits'):
+    if c.exists('limits burst'):
+      config_data['limits']['burst'] = str(c.return_value('limits burst'))
+    if c.exists('limits timeout'):
+      config_data['limits']['timeout'] = str(c.return_value('limits timeout'))
+    if c.exists('limits connection-limit'):
+      config_data['limits']['conn-limit'] = str(c.return_value('limits connection-limit'))
+  if c.exists('snmp'):
+    config_data['snmp'] = 'enable'
+  if c.exists('snmp master-agent'):
+    config_data['snmp'] = 'enable-ma'
 
   #### authentication mode local
-  if c.exists('authentication'):
-    if c.return_value('authentication mode') == 'local':
-      if c.exists('authentication local-users username'):
-        for usr in c.list_nodes('authentication local-users username'):
-          config_data['authentication']['local-users'].update(
+
+  if c.exists('authentication mode local'):
+    if c.exists('authentication local-users username'):
+      for usr in c.list_nodes('authentication local-users username'):
+        config_data['authentication']['local-users'].update(
+          {
+            usr : {
+              'passwd' : '',
+              'state'  : 'enabled',
+              'ip'     : '*'
+            }
+          }
+        )
+        if c.exists('authentication local-users username ' + usr + ' password'):
+          config_data['authentication']['local-users'][usr]['passwd'] = c.return_value('authentication local-users username ' + usr + ' password')
+        if c.exists('authentication local-users username ' + usr + ' disable'):
+          config_data['authentication']['local-users'][usr]['state'] = 'disable'
+        if c.exists('authentication local-users username ' + usr + ' static-ip'):
+          config_data['authentication']['local-users'][usr]['ip'] = c.return_value('authentication local-users username ' + usr + ' static-ip')
+   
+    ### authentication mode radius servers and settings
+
+  if c.exists('authentication mode radius'):
+    config_data['authentication']['mode'] = 'radius'
+    rsrvs = c.list_nodes('authentication radius-server')
+    for rsrv in rsrvs:
+      if c.return_value('authentication radius-server ' + rsrv + ' fail-time') == None:
+        ftime = '0'
+      else:
+        ftime = str(c.return_value('authentication radius-server ' + rsrv + ' fail-time'))
+      if c.return_value('authentication radius-server ' + rsrv + ' req-limit') == None:
+        reql = '0'
+      else:
+        reql = str(c.return_value('authentication radius-server ' + rsrv + ' req-limit'))
+      config_data['authentication']['radiussrv'].update(
+        {
+          rsrv  : {
+            'secret'  : c.return_value('authentication radius-server ' + rsrv + ' secret'),
+            'fail-time' : ftime,
+            'req-limit' : reql 
+            }
+        }
+      )
+
+  #### advanced radius-setting
+      if c.exists('authentication radius-settings'): 
+        if c.exists('authentication radius-settings acct-timeout'):
+          config_data['authentication']['radiusopt']['acct-timeout'] = c.return_value('authentication radius-settings acct-timeout')
+        if c.exists('authentication radius-settings max-try'):
+          config_data['authentication']['radiusopt']['max-try'] = c.return_value('authentication radius-settings max-try') 
+        if c.exists('authentication radius-settings timeout'):
+          config_data['authentication']['radiusopt']['timeout'] = c.return_value('authentication radius-settings timeout')
+        if c.exists('authentication radius-settings nas-identifier'):
+          config_data['authentication']['radiusopt']['nas-id'] = c.return_value('authentication radius-settings nas-identifier')
+        if c.exists('authentication radius-settings nas-ip-address'):
+          config_data['authentication']['radiusopt']['nas-ip'] = c.return_value('authentication radius-settings nas-ip-address')
+        if c.exists('authentication radius-settings dae-server'):
+          config_data['authentication']['radiusopt'].update(
             {
-              usr : {
-                'passwd' : '',
-                'state'  : 'enabled',
-                'ip'     : '*'
+              'dae-srv' : {
+                'ip-addr' : c.return_value('authentication radius-settings dae-server ip-address'),
+                'port'    : c.return_value('authentication radius-settings dae-server port'), 
+                'secret'  : str(c.return_value('authentication radius-settings dae-server secret'))
               }
             }
           )
-          if c.exists('authentication local-users username ' + usr + ' password'):
-            config_data['authentication']['local-users'][usr]['passwd'] = c.return_value('authentication local-users username ' + usr + ' password')
-          if c.exists('authentication local-users username ' + usr + ' disable'):
-            config_data['authentication']['local-users'][usr]['state'] = 'disable'
-          if c.exists('authentication local-users username ' + usr + ' static-ip'):
-            config_data['authentication']['local-users'][usr]['ip'] = c.return_value('authentication local-users username ' + usr + ' static-ip')
-   
-    ### authentication mode radius
-    if c.return_value('authentication mode') == 'radius':
-      config_data['authentication']['mode'] = 'radius'
-      rsrvs = c.list_nodes('authentication radius-server')
-      for rsrv in rsrvs:
-        config_data['authentication']['radiussrv'].update(
-          {
-            rsrv  : str(c.return_value('authentication radius-server ' + rsrv + ' key')) 
-          }
-        )
 
   if c.exists('mtu'):
     config_data['mtu'] = c.return_value('mtu')
 
+  ### ppp_options
+  ppp_options = {}
+  if c.exists('ppp-options'):
+    if c.exists('ppp-options ccp'):
+      ppp_options['ccp'] = c.return_value('ppp-options ccp')
+    if c.exists('ppp-options min-mtu'):
+      ppp_options['min-mtu'] = c.return_value('ppp-options min-mtu')
+    if c.exists('ppp-options mru'):
+      ppp_options['mru'] = c.return_value('ppp-options mru')
+    if c.exists('ppp-options mppe deny'):
+      ppp_options['mppe'] = 'deny'
+    if c.exists('ppp-options mppe require'):
+      ppp_options['mppe'] = 'requre'
+    if c.exists('ppp-options mppe prefer'):
+      ppp_options['mppe'] = 'prefer'
+    if c.exists('ppp-options lcp-echo-failure'):
+      ppp_options['lcp-echo-failure'] = c.return_value('ppp-options lcp-echo-failure')
+    if c.exists('ppp-options lcp-echo-interval'):
+      ppp_options['lcp-echo-interval'] = c.return_value('ppp-options lcp-echo-interval')
+    if c.exists('ppp-options ipv4'):
+      ppp_options['ipv4'] = c.return_value('ppp-options ipv4')
+    if c.exists('ppp-options ipv6'):
+      ppp_options['ipv6'] = c.return_value('ppp-options ipv6')
+    if c.exists('ppp-options ipv6-accept-peer-intf-id'):
+      ppp_options['ipv6-accept-peer-intf-id']= 1
+    if c.exists('ppp-options ipv6-intf-id'):
+      ppp_options['ipv6-intf-id'] = c.return_value('ppp-options ipv6-intf-id') 
+    if c.exists('ppp-options ipv6-peer-intf-id'):
+      ppp_options['ipv6-peer-intf-id'] = c.return_value('ppp-options ipv6-peer-intf-id')
+    if c.exists('ppp-options lcp-echo-timeout'):
+      ppp_options['lcp-echo-timeout'] = c.return_value('ppp-options lcp-echo-timeout')
+
+  if len(ppp_options) !=0:
+    config_data['ppp_options'] = ppp_options
+
   return config_data
 
 def verify(c):
@@ -305,6 +489,9 @@ def verify(c):
   if c['authentication']['mode'] == 'radius':
     if len(c['authentication']['radiussrv']) == 0:
       raise ConfigError('radius server required')
+    for rsrv in c['authentication']['radiussrv']:
+      if c['authentication']['radiussrv'][rsrv]['secret'] == None:
+        raise ConfigError('radius server ' + rsrv + ' needs a secret configured')
 
 def generate(c):
   if c == None:
@@ -347,11 +534,6 @@ def apply(c):
     accel_cmd('restart')
     sl.syslog(sl.LOG_NOTICE, "reloading config via daemon restart")
 
-  #if c['state'] == 'update':
-   # accel_cmd('restart')
-   # sl.syslog(sl.LOG_NOTICE, "reloading config via daemon restart") 
-   # ## check that config reload actually works
-
 if __name__ == '__main__':
   try:
     c = get_config()
diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index 0abb2746a..68a046939 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -108,8 +108,6 @@ def get_config():
                 "name": node,
                 "options": []
             }
-            if conf.exists('server {0} dynamic'.format(node)):
-                options.append('dynamic')
             if conf.exists('server {0} noselect'.format(node)):
                 options.append('noselect')
             if conf.exists('server {0} preempt'.format(node)):
diff --git a/src/conf_mode/syslog.py b/src/conf_mode/syslog.py
index f652cf3d0..f8f8d9457 100755
--- a/src/conf_mode/syslog.py
+++ b/src/conf_mode/syslog.py
@@ -30,6 +30,12 @@ from vyos import ConfigError
 configs = '''
 ## generated by syslog.py ##
 ## file based logging
+{% if files['global']['marker'] %}
+$ModLoad immark
+{% if files['global']['marker-interval'] %}
+$MarkMessagePeriod  {{files['global']['marker-interval']}} 
+{% endif %}
+{% endif %}
 {% for file in files %}
 $outchannel {{file}},{{files[file]['log-file']}},{{files[file]['max-size']}},{{files[file]['action-on-max-size']}}
 {{files[file]['selectors']}} :omfile:${{file}}
@@ -80,10 +86,10 @@ def get_config():
   c.set_level('system syslog')  
 
   config_data = {
-    'files' : {},
+    'files'   : {},
     'console' : {},
-    'hosts' : {},
-    'user'  : {}
+    'hosts'   : {},
+    'user'    : {}
   }
 
   #####
@@ -102,13 +108,16 @@ def get_config():
     }
   )
 
+  if c.exists('global marker'):
+    config_data['files']['global']['marker'] = True
+    if c.exists('global marker interval'):
+      config_data['files']['global']['marker-interval'] = c.return_value('global marker interval') 
   if c.exists('global facility'):
     config_data['files']['global']['selectors'] = generate_selectors(c, 'global facility')
   if c.exists('global archive size'):
     config_data['files']['global']['max-size'] = int(c.return_value('global archive size'))* 1024
   if c.exists('global archive files'):
     config_data['files']['global']['max-files'] = c.return_value('global archive files')
-
   ###
   # set system syslog file
   ###
@@ -217,14 +226,12 @@ def generate_selectors(c, config_node):
 def generate(c):
   tmpl = jinja2.Template(configs, trim_blocks=True)
   config_text = tmpl.render(c)
-  #print (config_text)
   with open('/etc/rsyslog.d/vyos-rsyslog.conf', 'w') as f:
     f.write(config_text)
 
   ## eventually write for each file its own logrotate file, since size is defined it shouldn't matter
   tmpl = jinja2.Template(logrotate_configs, trim_blocks=True)
   config_text = tmpl.render(c)
-  #print (config_text)
   with open('/etc/logrotate.d/vyos-rsyslog', 'w') as f:
     f.write(config_text)
 
@@ -247,6 +254,7 @@ def verify(c):
   fac = ['*','auth','authpriv','cron','daemon','kern','lpr','mail','mark','news','protocols','security',\
         'syslog','user','uucp','local0','local1','local2','local3','local4','local5','local6','local7']
   lvl = ['emerg','alert','crit','err','warning','notice','info','debug','*']
+
   for conf in c:
     if c[conf]:
       for item in c[conf]:
diff --git a/src/migration-scripts/l2tp/0-to-1 b/src/migration-scripts/l2tp/0-to-1
index 65adbbe77..f6c716df1 100755
--- a/src/migration-scripts/l2tp/0-to-1
+++ b/src/migration-scripts/l2tp/0-to-1
@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 
-# Delete "set service dhcp-relay relay-options port" option
-# Delete "set service dhcpv6-relay listen-port" option
+# Unclutter L2TP VPN configuiration - move radius-server top level tag
+# nodes to a regular node which now also configures the radius source address
+# used when querying a radius server
 
 import sys
 
diff --git a/src/migration-scripts/ntp/0-to-1 b/src/migration-scripts/ntp/0-to-1
new file mode 100755
index 000000000..9c66f3109
--- /dev/null
+++ b/src/migration-scripts/ntp/0-to-1
@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+# Delete "set system ntp server <n> dynamic" option
+
+import sys
+
+from vyos.configtree import ConfigTree
+
+if (len(sys.argv) < 1):
+    print("Must specify file name!")
+    sys.exit(1)
+
+file_name = sys.argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+config = ConfigTree(config_file)
+
+if not config.exists(['system', 'ntp']):
+    # Nothing to do
+    sys.exit(0)
+else:
+    # Delete abandoned leaf node if found inside tag node for
+    # "set system ntp server <n> dynamic"
+    base = ['system', 'ntp', 'server']
+    for server in config.list_nodes(base):
+        if config.exists(base + [server, 'dynamic']):
+            config.delete(base + [server, 'dynamic'])
+
+    try:
+        with open(file_name, 'w') as f:
+            f.write(config.to_string())
+    except OSError as e:
+        print("Failed to save the modified config: {}".format(e))
+        sys.exit(1)
diff --git a/src/migration-scripts/pptp/0-to-1 b/src/migration-scripts/pptp/0-to-1
new file mode 100755
index 000000000..d0c7a83b5
--- /dev/null
+++ b/src/migration-scripts/pptp/0-to-1
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+
+# Unclutter PPTP VPN configuiration - move radius-server top level tag
+# nodes to a regular node which now also configures the radius source address
+# used when querying a radius server
+
+import sys
+
+from vyos.configtree import ConfigTree
+
+if (len(sys.argv) < 1):
+    print("Must specify file name!")
+    sys.exit(1)
+
+file_name = sys.argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+config = ConfigTree(config_file)
+
+cfg_base = ['vpn', 'pptp', 'remote-access', 'authentication']
+if not config.exists(cfg_base):
+    # Nothing to do
+    sys.exit(0)
+else:
+    # Migrate "vpn pptp authentication radius-source-address" to new
+    # "vpn pptp authentication radius source-address"
+    if config.exists(cfg_base + ['radius-source-address']):
+        address = config.return_value(cfg_base + ['radius-source-address'])
+        # delete old configuration node
+        config.delete(cfg_base + ['radius-source-address'])
+        # write new configuration node
+        config.set(cfg_base + ['radius', 'source-address'], value=address)
+
+    # Migrate "vpn pptp authentication radius-server" tag node to new
+    # "vpn pptp authentication radius server" tag node
+    for server in config.list_nodes(cfg_base + ['radius-server']):
+        base_server = cfg_base + ['radius-server', server]
+        key = config.return_value(base_server + ['key'])
+
+        # delete old configuration node
+        config.delete(base_server)
+        # write new configuration node
+        config.set(cfg_base + ['radius', 'server', server, 'key'], value=key)
+
+        # format as tag node
+        config.set_tag(cfg_base + ['radius', 'server'])
+
+    # delete top level tag node
+    if config.exists(cfg_base + ['radius-server']):
+        config.delete(cfg_base + ['radius-server'])
+
+    try:
+        with open(file_name, 'w') as f:
+            f.write(config.to_string())
+    except OSError as e:
+        print("Failed to save the modified config: {}".format(e))
+        sys.exit(1)
diff --git a/src/op_mode/restart_dhcp_relay.py b/src/op_mode/restart_dhcp_relay.py
new file mode 100755
index 000000000..ab02d1eb3
--- /dev/null
+++ b/src/op_mode/restart_dhcp_relay.py
@@ -0,0 +1,53 @@
+#!/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/>.
+
+# File: restart_dhcp_relay.py
+# Purpose:
+#    Restart IPv4 and IPv6 DHCP relay instances of dhcrelay service
+
+import sys
+import argparse
+import os
+
+import vyos.config
+
+parser = argparse.ArgumentParser()
+parser.add_argument("--ipv4", action="store_true", help="Restart IPv4 DHCP relay")
+parser.add_argument("--ipv6", action="store_true", help="Restart IPv6 DHCP relay")
+
+if __name__ == '__main__':
+    args = parser.parse_args()
+    c = vyos.config.Config()
+
+    if args.ipv4:
+        # Do nothing if service is not configured
+        if not c.exists_effective('service dhcp-relay'):
+            print("DHCP relay service not configured")
+        else:
+            os.system('sudo systemctl restart isc-dhcp-relay.service')
+
+        sys.exit(0)
+    elif args.ipv6:
+        # Do nothing if service is not configured
+        if not c.exists_effective('service dhcpv6-relay'):
+            print("DHCPv6 relay service not configured")
+        else:
+            os.system('sudo systemctl restart isc-dhcpv6-relay.service')
+
+        sys.exit(0)
+    else:
+        parser.print_help()
+        sys.exit(1)
diff --git a/src/op_mode/show-igmpproxy.py b/src/op_mode/show_igmpproxy.py
index a021fcdde..5ccc16287 100755
--- a/src/op_mode/show-igmpproxy.py
+++ b/src/op_mode/show_igmpproxy.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# File: show-igmpproxy
+# File: show_igmpproxy.py
 # Purpose:
 #    Display istatistics from IPv4 IGMP proxy.
 #    Used by the "run show ip multicast" command tree.