_modules: update

_modules/domain.py

+def pretty_names():
+    domains = {}
+    for domain in __salt__['pillar.get']('domains').values():
+        for domain_code, domain_pretty in domain['domain_names'].items():
+            domains[domain_code] = domain_pretty.decode('utf-8')
+    return domains
+
+
+def domain_codes():
+    codes = []
+    for domain in __salt__['pillar.get']('domains').keys():
+        codes.extend(__salt__['pillar.get'](
+            'domains:%s:domain_names' % domain).keys())
+    return codes
+
+
+def radv_enabled(domain_key):
+    host = __salt__['pillar.get']('radv:enabled', True)
+    domain = __salt__['pillar.get'](
+        'domains:%s:radv:enabled' % domain_key, True)
+
+    return host and domain

_modules/fastd.py

 import logging
 
 # compose mac for fastd interface
-def mac(port, host_id):
-    return ":".join(['02', 'FF', str(port)[:2], str(port)[2:], host_id, '03'])
+
+
+def mac(domain_id, host_id):
+    return ":".join(['FA', 'FF', str(domain_id), '00', str(host_id), '03'])
 
 # enumerate fastd instance names for fastd exporter
+
+
 def all_instances():
     tmp = []
     for domain in __salt__['pillar.get']('domains'):
-        instances = __salt__['pillar.get']('domains:{0}:fastd:instances'.format(domain), [])
-        tmp.extend(["{0}{1}".format(domain, instance['mtu']) for instance in instances])
-    return tmp
-def all_instances_name():
-    tmp = []
-    for domain in __salt__['pillar.get']('domains'):
-        instances = __salt__['pillar.get']('domains:{0}:fastd:instances'.format(domain), [])
-        tmp.extend(["{0}-vpn-{1}".format(domain, instance['mtu']) for instance in instances])
+        domain_id = __salt__['pillar.get'](
+            'domains:{}:domain_id'.format(domain))
+        instances = __salt__['pillar.get'](
+            'domains:{0}:fastd:instances'.format(domain), [])
+        tmp.extend(["dom{0}_{1}".format(domain_id, instance['mtu'])
+                    for instance in instances])
     return tmp
 
 #  enumerate fastd interface names for mesh-announce
+
+
 def ifnames_for_domain(domain):
-    instances = __salt__['pillar.get']('domains:{}:fastd:instances'.format(domain), [])
-    return ["{0}-vpn-{1}".format(domain, instance['mtu']) for instance in instances]
+    domain_id = __salt__['pillar.get']('domains:{}:domain_id'.format(domain))
+    instances = __salt__['pillar.get'](
+        'domains:{}:fastd:instances'.format(domain), [])
+    return ["dom{0}-vpn-{1}".format(domain_id, instance['mtu']) for instance in instances]
 
 # enumerate ports to open up in ferm
+
+
 def ports_for_domain(domain):
-    instances = __salt__['pillar.get']('domains:{}:fastd:instances'.format(domain), [])
+    instances = __salt__['pillar.get'](
+        'domains:{}:fastd:instances'.format(domain), [])
     return [str(instance['port']) for instance in instances]