Merge pull request #111 from svenauhagen/feature/xfrm

[mirror_ifupdown2.git] / ifupdown2 / ifupdownaddons / LinkUtils.py

diff --git a/ifupdown2/ifupdownaddons/LinkUtils.py b/ifupdown2/ifupdownaddons/LinkUtils.py
index 7326cd2cd2feb337cff1c186cd650dde2dd0f433..d973cbc2ba8219740bbb67abb2eb6982aeefee70 100644 (file)
--- a/ifupdown2/ifupdownaddons/LinkUtils.py
+++ b/ifupdown2/ifupdownaddons/LinkUtils.py
@@ -873,11 +873,11 @@ class LinkUtils(utilsBase):
             return
         cmd = 'addr del %s' % address
         if broadcast:
-            cmd += 'broadcast %s' % broadcast
+            cmd += ' broadcast %s' % broadcast
         if peer:
-            cmd += 'peer %s' % peer
+            cmd += ' peer %s' % peer
         if scope:
-            cmd += 'scope %s' % scope
+            cmd += ' scope %s' % scope
         cmd += ' dev %s' % ifacename
         utils.exec_command('%s %s' % (utils.ip_cmd, cmd))
         self._cache_delete([ifacename, 'addrs', address])
@@ -1130,7 +1130,7 @@ class LinkUtils(utilsBase):
                    (utils.ip_cmd, vrf, gateway))
         # Add metric
         if metric:
-            cmd += 'metric %s' % metric
+            cmd += ' metric %s' % metric
         cmd += ' dev %s' % ifacename
 
         if onlink:
@@ -1274,12 +1274,12 @@ class LinkUtils(utilsBase):
 
         cmd = ''
         if '6' in mode:
-            cmd = ' -6 '
+            cmd = ' -6'
 
         if mode in ['gretap']:
-            cmd += 'link add %s type %s' % (tunnelname, mode)
+            cmd += ' link add %s type %s' % (tunnelname, mode)
         else:
-            cmd += 'tunnel add %s mode %s' % (tunnelname, mode)
+            cmd += ' tunnel add %s mode %s' % (tunnelname, mode)
 
         if attrs:
             for k, v in attrs.iteritems():