Changeset 8296 in genesis

Timestamp:

Aug 10, 2010, 1:52:07 PM (14 years ago)

Author:

rick

Message:

• Allow generation of all config files for testing purposes

Location:

nodes

Files:

• gformat.py (modified) (5 diffs)
• make-map.py (modified) (2 diffs)
• make-network-graph.py (modified) (1 diff)

nodes/gformat.py

@@ -46 +46 @@
   return nodelist
 
+def get_hostlist():
+  """ Combined hosts and proxy list"""
+  return get_nodelist() + get_proxylist()
 
 
@@ -72 +75 @@
   """ % items
 
-  for node in sorted(nodelist):
+  for node in nodelist:
     items['node'] = node
     output += '<tr><td><a href="%(root)s/%(node)s">%(node)s</a></td>' % items
@@ -395 +398 @@
   if not uri[0]:
     output += "Content-type:text/html\r\n\r\n"
-    output += generate_title(get_nodelist())
+    output += generate_title(get_hostlist())
   elif len(uri) == 1:
     output += "Content-type:text/plain\r\n\r\n"
@@ -408 +411 @@
 
 def usage():
-  print """Usage: %s <standalone [port] |test [test arguments]>
+  print """Usage: %s <standalone [port] |test [test arguments]|static>
 Examples:
 \tstandalone                   =  Run configurator webserver [default port=8000]
+\tstatic                       =  Generate all config files and store on disk
+\t                                with format ./static/%%NODE%%/%%FILE%%
 \ttest CNodeRick dnsmasq.conf  =  Receive output of CGI script 
 \t                                for arguments CNodeRick/dnsmasq.conf
@@ -453 +458 @@
       os.environ['SCRIPT_NAME'] = __file__
       process_cgi_request()
+    elif sys.argv[1] == "static":
+      items = dict()
+      for node in get_hostlist():
+        items['node'] = node
+        items['wdir'] = "./static/%(node)s" % items
+        if not os.path.isdir(items['wdir']):
+          os.makedirs(items['wdir'])
+        for config in files:
+          items['config'] = config
+          print "## Generating %(node)s %(config)s" % items
+          f = open("%(wdir)s/%(config)s" % items, "w")
+          f.write(generate_config(node, config))
+          f.close()
     else:
       usage()

nodes/make-map.py

@@ -94 +94 @@
   write_yaml(CACHE_FILE, coordinates)
   return (lam, phi)
-
-OUTFILE = 'network.png'
 
 def make_graph():
@@ -136 +134 @@
   links = []
   try:
-    for host in gformat.get_proxylist() + gformat.get_nodelist():
+    for host in gformat.get_hostlist():
       print "## Processing host", host
       datadump = gformat.get_yaml(host)

nodes/make-network-graph.py

@@ -17 +17 @@
   link_type = {}
   try:
-    for host in gformat.get_proxylist() + gformat.get_nodelist():
+    for host in gformat.get_hostlist():
       print "## Processing host", host
       datadump = gformat.get_yaml(host)