changes for 3.0

[monitor.git] / getconf.py

diff --git a/getconf.py b/getconf.py
index 155c26f..1008c74 100755 (executable)
--- a/getconf.py
+++ b/getconf.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
-import auth
 import plc
+api = plc.getAuthAPI()
 import sys
 import os
+import config
 
 def getconf(hostname, force=False, media=None):
-       api = plc.PLC(auth.auth, auth.plc)
        n = api.GetNodes(hostname)
        filename = "bootcd/" + hostname + ".txt"
        if not os.path.exists(filename) or force:
@@ -21,33 +21,32 @@ def getconf(hostname, force=False, media=None):
 
        args = {}
        if not media:
-               args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
-               args['url_list'] += "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
+               args['url_list']  = "   http://%s/bootcds/%s-partition.usb\n" % (config.MONITOR_HOSTNAME, hostname)
+               args['url_list'] += "   http://%s/bootcds/%s.iso" % (config.MONITOR_HOSTNAME, hostname)
        else:
                if media == "usb":
-                       args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
+                       args['url_list']  = "   http://%s/bootcds/%s-partition.usb\n" % (config.MONITOR_HOSTNAME, hostname)
                elif media == "iso":
-                       args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
+                       args['url_list']  = "   http://%s/bootcds/%s.iso" % (config.MONITOR_HOSTNAME, hostname)
                else:
-                       args['url_list']  = "   http://monitor.planet-lab.org/bootcds/%s-partition.usb\n" % hostname
-                       args['url_list'] += "   http://monitor.planet-lab.org/bootcds/%s.iso" % hostname
+                       args['url_list']  = "   http://%s/bootcds/%s-partition.usb\n" % (config.MONITOR_HOSTNAME, hostname)
+                       args['url_list'] += "   http://%s/bootcds/%s.iso" % (config.MONITOR_HOSTNAME, hostname)
                        
-       #print "http://monitor.planet-lab.org/bootcds/%s.usb\n" % hostname
 
        return args
 
 if __name__ == '__main__':
-       from config import config as cfg
-       from optparse import OptionParser
-       parser = OptionParser()
+       import parser as parsermodule
+
+       parser = parsermodule.getParser()
        parser.set_defaults(media='both', force=False)
        parser.add_option("", "--media", dest="media", metavar="usb, iso, both", 
                                                help="""Which media to generate the message for.""")
        parser.add_option("", "--force", dest="force", action="store_true", 
                                                help="""Force the recreation of the usb images.""")
+       parser = parsermodule.getParser(['defaults'], parser)
 
-       config = cfg(parser)
-       config.parse_args()
+       config = parsermodule.parse_args(parser)
 
        ret = {'url_list' : ''} 
        for i in config.args: