Changeset 47 for trunk/pxeconfig

Timestamp:

12/13/04 16:02:35 (19 years ago)

Author:

bas

Message:

pxeconfig:

• Added hostname support instead of C-class types

File:

• trunk/pxeconfig/pxeconfig (modified) (9 diffs)

trunk/pxeconfig/pxeconfig

@@ -32 +32 @@
  [-V|--version]
  [-n|--net <C-net> -s|--start <number> -e|--end <number> -f|--file <filename>]
+ [hostname(s)]
 
 With this program you can configure which PXE configuration file a node
@@ -60 +61 @@
 import glob
 import getopt
+import socket
 
 # DEBUG
@@ -72 +74 @@
 START='start'
 END='end'
-VERSION='0.4.4'
+VERSION='0.5'
 
 SHORTOPT_LIST='hVd:n:s:e:f:'
@@ -142 +144 @@
 
 
-def check_network(net, prefix=''):
+def convert_network(net, prefix=''):
   """
   This function checks if the give network is a Class C-network and will
@@ -201 +203 @@
 
   network = raw_input('Give network address (xxx.xxx.xxx): ') 
-  naddr = check_network(network)
+  naddr = convert_network(network)
 
   start = raw_input('Starting number: ') 
@@ -233 +235 @@
 def check_args(argv, binfo):
   """
-  This function parses the command line options:
-    argv : a list of command line options.
-    binfo: returning a dict with the netinfo. if used non-interactively
+  This function parses the command line options and returns the rest as
+  an list of hostnames:
+    argv     : a list of command line options.
+    binfo    : returning a dict with the netinfo. if used non-interactively
+    hostnames: the rest of the command lines options that are not-parseble.
   """
   global PXE_CONF_DIR
@@ -258 +262 @@
     elif opt in ['-n', '--net']:
       network = value
-      binfo[NETWORK] = check_network(value, opt)
+      binfo[NETWORK] = convert_network(value, opt)
 
     elif opt in ['-s', '--start']:
@@ -277 +281 @@
       sys.exit(0)
 
+    if args:
+        return args
+
+def hosts_links(hosts, binfo):
+        for host in hosts:
+                try:
+                        addr = socket.gethostbyname(host)
+                except socket.error,detail:
+                        print '%s not an valid hostname: %s' %(host,detail)
+                        sys.exit(1)
+                        
+                net = string.splitfields(addr, '.')
+                cnet = string.joinfields(net[0:3], '.')
+
+                binfo[NETWORK] = convert_network(cnet)
+                binfo[START] = int(net[3])
+                binfo[END] =  int(net[3])
+                create_links(binfo)
+
 
 def main():
@@ -282 +305 @@
   #
   bootinfo = {}
-  check_args(sys.argv, bootinfo)
-
-  if bootinfo:    
-    check_cmd_line(bootinfo)
+
+  hostnames = check_args(sys.argv, bootinfo)
+
+
+  # If we supplied args then make links for the supplied hosts
+  # else make links for class C-networks
+  #
+  if hostnames:
+        if not bootinfo.has_key(FILENAME):
+                bootinfo[FILENAME] = select_pxe_configfile()
+        hosts_links(hostnames,bootinfo)
   else:
-    interactive(bootinfo)
-
-  create_links(bootinfo)
+        if bootinfo:    
+                check_cmd_line(bootinfo)
+        else:
+                interactive(bootinfo)
+        create_links(bootinfo)
 
 if __name__ == '__main__':