2 files changed, 17 insertions, 14 deletions
diff --git a/python/vyos/ifconfig/__init__.py b/python/vyos/ifconfig/__init__.py
index d08a8b528..1f9956af0 100644
--- a/python/vyos/ifconfig/__init__.py
+++ b/python/vyos/ifconfig/__init__.py
@@ -36,3 +36,4 @@ from vyos.ifconfig.tunnel import IP6IP6If
 from vyos.ifconfig.tunnel import SitIf
 from vyos.ifconfig.tunnel import Sit6RDIf
 from vyos.ifconfig.wireless import WiFiIf
+from vyos.ifconfig.l2tpv3 import L2TPv3If
diff --git a/python/vyos/ifconfig/l2tpv3.py b/python/vyos/ifconfig/l2tpv3.py
index 07f1cf8a3..f0d64a53d 100644
--- a/python/vyos/ifconfig/l2tpv3.py
+++ b/python/vyos/ifconfig/l2tpv3.py
@@ -41,25 +41,27 @@ class L2TPv3If(Interface):
         }
     }
     options = Interface.options + \
-        ['tunnel_id', 'peer_tunnel_id', 'local_port', 'remote_port', 'encapsulation', 'local_address', 'remote_address']
+        ['tunnel_id', 'peer_tunnel_id', 'local_port', 'remote_port',
+         'encapsulation', 'local_address', 'remote_address', 'session_id',
+         'peer_session_id']
 
     def _create(self):
         # create tunnel interface
-        cmd = 'ip l2tp add tunnel tunnel_id {} '.format(config['tunnel_id'])
-        cmd += 'peer_tunnel_id {} '.format(config['peer_tunnel_id'])
-        cmd += 'udp_sport {} '.format(config['local_port'])
-        cmd += 'udp_dport {} '.format(config['remote_port'])
-        cmd += 'encap {} '.format(config['encapsulation'])
-        cmd += 'local {} '.format(config['local_address'])
-        cmd += 'remote {} '.format(config['remote_address'])
-        self._cmd(cmd)
+        cmd = 'ip l2tp add tunnel tunnel_id {tunnel_id}'
+        cmd += ' peer_tunnel_id {peer_tunnel_id}'
+        cmd += ' udp_sport {local_port}'
+        cmd += ' udp_dport {remote_port}'
+        cmd += ' encap {encapsulation}'
+        cmd += ' local {local_address}'
+        cmd += ' remote {remote_address}'
+        self._cmd(cmd.format(**self.config))
 
         # setup session
-        cmd = 'ip l2tp add session name {} '.format(self.config['ifname'])
-        cmd += 'tunnel_id {} '.format(config['tunnel_id'])
-        cmd += 'session_id {} '.format(config['session_id'])
-        cmd += 'peer_session_id  {} '.format(config['peer_session_id'])
-        self._cmd(cmd)
+        cmd = 'ip l2tp add session name {ifname}'
+        cmd += ' tunnel_id {tunnel_id}'
+        cmd += ' session_id {session_id}'
+        cmd += ' peer_session_id {peer_session_id}'
+        self._cmd(cmd.format(**self.config))
 
         # interface is always A/D down. It needs to be enabled explicitly
         self.set_admin_state('down')