Changeset 10702 in genesis

Timestamp:

May 7, 2012, 6:41:36 AM (13 years ago)

Author:

rick

Message:

Only set the defaults if the hybrid is set, else the cleanup does not work anymore.

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -98 +98 @@
 
   # Use some boring defaults
-  datadump = { 'service_proxy_normal' : False, 'service_proxy_ileiden' : False, 'service_accesspoint' : True }
+  datadump = {}
   f = open(gfile, 'r')
   datadump.update(yaml.load(f,Loader=Loader))
+  if datadump['nodetype'] == 'Hybrid':
+    defaults = { 'service_proxy_normal' : False, 'service_proxy_ileiden' : False, 'service_accesspoint' : True }
+    for (key,value) in defaults.iteritems():
+      if not datadump.has_key(key):
+        datadump[key] = value
   f.close()