i...think it's ready to test.

utils/he_ipv6/tunnel.py

@@ -104,23 +104,23 @@ class Allocation(object):
 
 
 class Tunnel(object):
-    def __init__(self, tun_xml, he_tunnels):
+    def __init__(self, tun_xml, he_tunnel, creds):
         self.xml = tun_xml
+        self.creds = creds
+        self.he = he_tunnel
+        self.update_key = self.he.creds.password
         self.id = None
         self.client = None
         self.server = None
-        self.creds = None
-        self.creds_id = None
         self.radvd = None
         self.enable_radvd = None
         self.radvd_dns = None
         self.allocations = {}  # This is a dict of {}[alloc.id] = Allocation obj
         self.assignments = []  # This is a list of Assignment objs
-        self.heconf = he_tunnels
         self.parse()
 
     def _allocations(self):
-        self.allocations = self.heconf[self.id].allocations
+        self.allocations = self.he.allocations
         return(None)
 
     def _assignments(self):