slapformat: WIP: Cleanup tap code

slapos/format.py

@@ -501,7 +501,6 @@ class Tap(object):
       self.ipv6_address = addressFromNetwork(ipv6_gateway.network, -1)
 
   def format(self, interface, user):
-    tap = self.name
     conf = interface.conf
     # Create/ensure tap interface
     self.ensureTap(user, conf)
@@ -525,7 +524,7 @@ class Tap(object):
       if owner_id != user_id:
         conf.abort(
           "Wrong owner of tap %s, expected %s (%s) got %s",
-          self.name, user_id, user, owner_id
+          tap, user_id, user, owner_id
         )
     else:
       call(['ip', 'tuntap', 'add', 'dev', tap, 'mode', 'tap', 'user', user])