Changeset 75 for trunk

Timestamp:

03/28/07 12:50:40 (17 years ago)

Author:

bas

Message:

pxeconfig:

• added configparser function

pxeconfig.conf:

• New Config File

Location:

trunk

Files:

• pxeconfig (modified) (7 diffs)
• pxeconfig.conf (added)

trunk/pxeconfig

@@ -30 +30 @@
 Usage: pxeconfig 
 
- [-d|--directory <pxe_config_dir>]
  [-f|--file <filename>] [hostname(s)]
  [-i|--interactive]
@@ -82 +81 @@
 INTERACTIVE='interactive'
 
-SHORTOPT_LIST='hVd:n:s:e:f:ri'
-LONGOPT_LIST=['help', 'version', 'directory=', 'net=', 'start=', 'end=', 'file=', 'remove', 'debug' , 'interactive' ]
-
-def ReadConfig(file, name):
+SHORTOPT_LIST='hVn:s:e:f:ri'
+LONGOPT_LIST=['help', 'version', 'net=', 'start=', 'end=', 'file=', 'remove', 'debug' , 'interactive' ]
+
+def ReadConfig(file):
         """
         Parse the config file
@@ -93 +92 @@
                 sys.exit(1)
 
-        config = ConfigParser.ConfigParser()
+        config = ConfigParser.RawConfigParser()
         try:
                 config.read(file)
@@ -100 +99 @@
                 sys.exit(1)
 
-        # Use given project name else use defaults
+        # Not yet uses
         #
-        if name:
-                if not config.has_section(name):
-                        print "Not a valid project name: %s" %name
-                        print "Valid names: %s" %config.sections()
-                        sys.exit(1) 
-
-                project =  dict()
-                for option in  config.options(name):
-                        project[option] = config.get(name, option) 
-        else:
-                project = config.defaults() 
-
-        return project
+        #projects = {}
+        #for section in config.sections():
+        #       projects[section] = {}
+        #       for option in  config.options(section):
+        #       projects[section][option] = config.get(section, option) 
+
+        stanza = config.defaults() 
+        return stanza
 
 def select_pxe_configfile():
@@ -282 +276 @@
     hostnames: the rest of the command lines options that are not-parseble.
   """
-  global PXE_CONF_DIR
-  global DEBUG
-
   try:
     opts, args = getopt.getopt(argv[1:], SHORTOPT_LIST, LONGOPT_LIST)
@@ -295 +286 @@
   #
   for opt,value in opts:
-
-    if opt in ['-d', '--directory']:
-      if os.path.isdir(value):
-        PXE_CONF_DIR = value
-      else:
-        print 'Directory %s does not exists\n' %value
-        sys.exit(1)
-
     elif opt in ['-i', '--interactive']:
       binfo[INTERACTIVE] = 1
@@ -356 +339 @@
   # A dictionary holding the boot info
   #
+  global PXE_CONF_DIR
+  global DEBUG
+
   bootinfo = {}
   bootinfo[REMOVE] = 0
 
-  project_name = None
   configfile = 'pxeconfig.conf'
-  settings = ReadConfig(configfile, project_name)
-  print settings
-  sys.exit(1)
+  settings = ReadConfig(configfile)
+
+  try:
+        PXE_CONF_DIR = settings['pxe_config_dir']
+        DEBUG = settings['debug']
+  except KeyError:
+        pass
+
   hostnames = check_args(sys.argv, bootinfo)