Changeset 10053 in genesis for tools

Timestamp:

Mar 7, 2012, 10:08:06 PM (13 years ago)

Author:

rick

Message:

Serious hacking and cleanups to get all keys in the right format and stored to the proper files.

Please do mind that I remove the Bullet2,etc... information now, I will dynamically add this at an later stage.

Related-To: ticket:117

Location:

tools

Files:

• genesis-to-yaml.pl (modified) (1 diff)
• gformat.py (modified) (7 diffs)

tools/genesis-to-yaml.pl

@@ -80 +80 @@
 } else {
   print "ileiden   : no\n";
+}
+
+foreach $key  ('internalif', 'nat', 'internalroute', 'remote_access', 'gateway', 'firewall_block') {
+  if ($$key) {
+    print "$key: $$key\n";
+  }
 }
 

tools/gformat.py

@@ -277 +277 @@
     output += "tproxy_enable='NO'\n"
 
+  # Extra Proxy configuration
+  if datadump['nodetype'] == 'Proxy':
+    output += '\n# Disable routing\ngateway_enable="no"\n'
+
+  output += '\ninternalif="%s"\n' % datadump['internalif']
+
   output += '\n'
   # lo0 configuration:
@@ -366 +372 @@
   datadump = yaml.load(f,Loader=Loader)
   datadump['autogen_iface_keys'] = get_interface_keys(datadump)
+  datadump['autogen_item'] = item
   f.close()
 
@@ -372 +379 @@
 def store_yaml(datadump):
   """ Store configuration yaml for 'item'"""
+  item = datadump['autogen_item'] 
   gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
 
   f = open(gfile, 'w')
-  del datadump['autogen_iface_keys']
   f.write(generate_wleiden_yaml(datadump))
   f.close()
@@ -412 +419 @@
 
 
-def write_yaml(item, datadump):
-  """ Write configuration yaml for 'item'"""
-  gfile = os.path.join(NODE_DIR,item,'wleiden.yaml')
-
-  f = open(gfile, 'w')
-  f.write(format_wleiden_yaml(datadump))
-  f.close()
-
-
-
 def generate_resolv_conf(datadump):
   """ Generate configuration file '/etc/resolv.conf' """
@@ -429 +426 @@
 # Try local (cache) first
 nameserver 127.0.0.1
-
+"""
+  if datadump['nodetype'] == 'Proxy':
+    output += """\
+nameserver 8.8.8.8   # Google Public NameServer
+nameserver 8.8.4.4   # Google Public NameServer
+"""
+  else:
+    output += """\
 # Proxies are recursive nameservers
 # needs to be in resolv.conf for dnsmasq as well
 """ % datadump
-
-  for proxy in get_proxylist():
-    proxy_ip = get_yaml(proxy)['masterip']
-    output += "nameserver %-15s # %s\n" % (proxy_ip, proxy)
+    for proxy in get_proxylist():
+      proxy_ip = get_yaml(proxy)['masterip']
+      output += "nameserver %-15s # %s\n" % (proxy_ip, proxy)
+
   return output
 
@@ -478 +482 @@
 def generate_wleiden_yaml(datadump):
   """ Generate (petty) version of wleiden.yaml"""
+  for key in datadump.keys():
+    if key.startswith('autogen_'):
+      del datadump[key]
+
   output = generate_header("#")
   output += format_wleiden_yaml(datadump)
@@ -843 +851 @@
         datadumps[get_fqdn(datadump)] = datadump
 
+      for key,datadump in datadumps.iteritems():
         datadump['latitude'], datadump['longitude'] = rdnap.rd2etrs(datadump['rdnap_x'], datadump['rdnap_y'])
-        write_yaml(host, datadump)
+        store_yaml(datadump)
     elif sys.argv[1] == "list":
       if sys.argv[2] == "nodes":