Changeset 8622 in genesis for tools

Timestamp:

Oct 31, 2010, 9:24:42 PM (14 years ago)

Author:

rick

Message:

• Haasje over tussen verschillende functies in files om ze op de juiste locatie te zetten.

• staticDNS.yaml is makkelijker te parsen en better te lezen

Location:

tools

Files:

• cardgen.sh (deleted)
• gformat.py (modified) (4 diffs)
• rdnap.py (added)

tools/gformat.py

@@ -4 +4 @@
 # Wireless Leiden configuration generator, based on yaml files'
 # Rick van der Zwet <info@rickvanderzwet.nl>
+
+# Hack to make the script directory is also threated as a module search path.
+import sys
+import os
+sys.path.append(os.path.dirname(__file__))
+
 import cgi
 import cgitb
 import copy
 import glob
-import os
 import socket
 import string
 import subprocess
-import sys
 import time
-import make_map
+import rdnap
 from pprint import pprint
 try:
@@ -31 +35 @@
   
 
-NODE_DIR = os.path.dirname(os.path.realpath(__file__))
+NODE_DIR = os.getcwd()
 __version__ = '$Id$'
 
@@ -608 +612 @@
   ## roomburgh=CNodeRoomburgh1
   ## apkerk1.CNodeVosko=172.17.176.8 ;this as well
-  f = open('../dns/staticDNS.conf','r')
-  for l in f.readlines():
-    # Get rid of comments
-    l = l.strip().split(';')[0].strip()
-    if l:
-      k,v = l.split('=')
+  dns = yaml.load(open('../dns/staticDNS.yaml','r'))
+  for comment, block in dns.iteritems():
+    for k,v in block.iteritems():
       if valid_addr(v):
         wleiden_zone[k] = v
       else:
         wleiden_cname[k] = v
-  f.close()
       
   details = dict()
@@ -734 +734 @@
         datadumps[get_fqdn(datadump)] = datadump
       
-        datadump['latitude'], datadump['longitude'] = make_map.rd2etrs(datadump['rdnap_x'], datadump['rdnap_y'])
+        datadump['latitude'], datadump['longitude'] = rdnap.rd2etrs(datadump['rdnap_x'], datadump['rdnap_y'])
         write_yaml(host, datadump)
     else: