Changeset 51 for devel/dploy-dhcp

Timestamp:

05/02/08 16:00:33 (4 years ago)

Author:

bruno

Message:

• Use pb functions in scripts
• Update of concept doc
• Check errors in dploy-add2dhcp

File:

• devel/dploy-dhcp/bin/dploy-add2dhcp (modified) (5 diffs)

devel/dploy-dhcp/bin/dploy-add2dhcp

@@ -15 +15 @@
 use Getopt::Long qw(:config auto_abbrev no_ignore_case);
 use Data::Dumper;
+use ProjectBuilder::Base;
+use Dploy::Base;
 
 my $logfile = "/var/log/dploy.err";
 my $dhcpmain = "/etc/dhcpd.conf";
-my $dhcpsub = "";
+my $dploydir = "/etc/dploy";
+
+my $dhcpsub = undef;
 my %opts;
-my $mac = "";
-my $ip = "";
-my $gw = "";
-my $dns = "";
-my $pxe = "";
-my $ntp = "";
-my $netmask = "";
-my $iprange = "";
-my $cidr = "";
+my $mac = undef;
+my $iprange = undef;
+my $cidr = undef;
+
+=pod
+
+=head1 NAME
+
+dploy-add2dhcp - Update DHCP configuration file for dploy.org
+
+=head1 DESCRIPTION
+
+dploy-add2dhcp helps you keeping your DHCP configuration up to date 
+
+=head1 SYNOPSIS
+
+dploy-add2dhcp -m MAC-address -i IP-address -n IP-netmask [-g IP-Gateway -d IP-dns-server -p IP-PXE-server -t IP-NTP-server]
+
+dploy-add2dhcp --mac MAC-address --ip IP-address --netmask IP-netmask [--gw IP-Gateway --dns IP-dns-server --pxe IP-PXE-server --time IP-NTP-server]
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-h|--help>
+
+Print a brief help message and exits.
+
+=cut
+
+pb_syntax_init("dploy-add2dhcp Version PBVER-PBREV\n");
 
 GetOptions("help|?|h" => \$opts{'h'},
-            "mac|m=s" => \$opts{'mac'},
+        "mac|m=s" => \$opts{'mac'},
         "ip|i=s" => \$opts{'ip'},
         "netmask|n=s" => \$opts{'mask'},
@@ -38 +64 @@
         "pxe|p=s" => \$opts{'pxe'},
         "time|t=s" => \$opts{'ntp'},
-    ) || dploy_syntax(-1,0);
-
-# Mac address check
-if (defined $opts{'mac'}) {
-  $mac = $opts{'mac'};
-  if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
-    print "Syntax: dploy-add2dhcp MAC ip\n";
-    exit(-1);
-  }
-}
-# only lowercase for homogeneity in mac address
-$mac =~ tr/A-Z/a-z/;
-
-# newmac replaces : separator with - and only lowercase for dhcpd
-my $newmac = $mac;
-$newmac =~ s/:/-/g;
-
-# IP address check
-if (defined $opts{'ip'}) {
-  $ip = $opts{'ip'};
-  if ($ip !~ /^([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/) {
-    print "Syntax: dploy-add2dhcp mac IP\n";
-    exit(-1);
-  }
-}
+    ) || pb_syntax(-1,0);
 
 # Other Parameters
 if (defined $opts{'h'}) {
-  dploy_syntax(0,1);
-}
-if (defined $opts{'mask'}) {
-  $netmask = $opts{'mask'};
-}
-if (defined $opts{'gw'}) {
-  $gw = $opts{'gw'};
-}
-if (defined $opts{'pxe'}) {
-  $pxe = $opts{'pxe'};
-}
+    pb_syntax(0,1);
+}
+
+# Mandatory params checks
+$mac = dploy_check_mac($opts{'mac'});
+dploy_check_ip($opts{'ip'},"Wrong IP address");
+dploy_check_ip($opts{'mask'},"Wrong Netmask");
 
 # Calculate IP subnet
-my  $block = new Net::Netmask ($ip, $netmask);
+my  $block = new Net::Netmask($opts{'ip'}, $opts{'mask'});
 $iprange = $block->base();
 $cidr = $block->bits(); 
 
 # Check if a DHCP conf file already exist for the subnet
-$dhcpsub="/etc/dploy/dhcp-$iprange-$cidr.conf";
-if (! -d "/etc/dploy" ) {
-  mkdir ("/etc/dploy",0755);
-}
+pb_mkdir_p("$dploydir");
+$dhcpsub="$dploydir/dhcp-$iprange-$cidr.conf";
 
 if (! -e "$dhcpsub" ) {
-  # Create a DHCP file for the IP subnet
-  open(DHCPSUBNEW,"> $dhcpsub.new") || die "Unable to create $dhcpsub.new: $!";
-    print DHCPSUBNEW "subnet $iprange netmask $netmask {\n";
-    print DHCPSUBNEW "  option routers              $gw;\n";
-    if (defined $opts{'dns'}) {
-      $dns = $opts{'dns'};
-      print DHCPSUBNEW "  option domain-name-servers  $dns;\n";
-    }
-    if (defined $opts{'ntp'}) {
-      $ntp = $opts{'ntp'};
-      print DHCPSUBNEW "  option ntp-servers          $ntp;\n";
-    }
-    print DHCPSUBNEW "  next-server                 $pxe;\n";
-    print DHCPSUBNEW "  authoritative;\n";
-    print DHCPSUBNEW "  if substring(option vendor-class-identifier, 0, 20) = \"PXEClient:Arch:00000\" {\n";
-    print DHCPSUBNEW "    filename \"pxelinux.bin\";\n";
-    print DHCPSUBNEW "  } else if substring(option vendor-class-identifier, 0, 20) = \"PXEClient:Arch:00002\" {\n";
-    print DHCPSUBNEW "    filename \"elilo-ia64.efi\";\n";
-    print DHCPSUBNEW "  }\n";
-    print DHCPSUBNEW "}\n";
-  close DHCPSUBNEW;
-  move("$dhcpsub.new",$dhcpsub);
+    # there are then more mandatory parameters
+    dploy_check_ip($opts{'gw'},"Wrong IP address for GW server");
+    my $gwobj = new Net::Netmask($opts{'gw'},$opts{'mask'});
+    if (($iprange != $gwobj->base()) || ($cidr != $gwobj->bits())) {
+        print "Gateway is not in the correct subnet \n";
+        pb_syntax(-1,0);
+    }
+    # Create a DHCP file for the IP subnet
+    open(DHCPSUBNEW,"> $dhcpsub.new") || die "Unable to create $dhcpsub.new: $!";
+    print DHCPSUBNEW "subnet $iprange netmask $opts{'mask'} {\n";
+    print DHCPSUBNEW "  option routers              $opts{'gw'};\n";
+    if (defined $opts{'dns'}) {
+        dploy_check_ip($opts{'dns'},"Wrong IP address for DNS server");
+        print DHCPSUBNEW "  option domain-name-servers  $opts{'dns'};\n";
+    }
+    if (defined $opts{'ntp'}) {
+        dploy_check_ip($opts{'ntp'},"Wrong IP address for NTP server");
+        print DHCPSUBNEW "  option ntp-servers          $opts{'ntp'};\n";
+    }
+    if (defined $opts{'pxe'}) {
+        dploy_check_ip($opts{'pxe'},"Wrong IP address for PXE server");
+        print DHCPSUBNEW "  next-server                 $opts{'pxe'};\n";
+        print DHCPSUBNEW "  authoritative;\n";
+        print DHCPSUBNEW "  if substring(option vendor-class-identifier, 0, 20) = \"PXEClient:Arch:00000\" {\n";
+        print DHCPSUBNEW "    filename \"pxelinux.bin\";\n";
+        print DHCPSUBNEW "  } else if substring(option vendor-class-identifier, 0, 20) = \"PXEClient:Arch:00002\" {\n";
+        print DHCPSUBNEW "    filename \"elilo-ia64.efi\";\n";
+        print DHCPSUBNEW "  }\n";
+    }
+    print DHCPSUBNEW "}\n";
+    close DHCPSUBNEW;
+    move("$dhcpsub.new",$dhcpsub);
 }
 
@@ -149 +155 @@
         $bracket--;
     }
-    if (/host host-$newmac {/ .. /}\n/) {
+    if (/host host-$mac {/ .. /}\n/) {
         # We need to replace the old content with the new one
         print "Skip $_";
@@ -161 +167 @@
 }
 
-print DHCPSUBNEW "  host host-$newmac {\n";
-print DHCPSUBNEW "  hardware ethernet $mac;\n";
-print DHCPSUBNEW "  fixed-address $ip;\n";
+print DHCPSUBNEW "  host host-$mac {\n";
+print DHCPSUBNEW "  hardware ethernet $opts{'mac'};\n";
+print DHCPSUBNEW "  fixed-address $opts{'ip'};\n";
 print DHCPSUBNEW "  }\n";
 print DHCPSUBNEW $lastline;
@@ -172 +178 @@
 
 # Relaunch DHCP server
-system("sudo /etc/init.d/dhcpd restart");
+pb_system("sudo /etc/init.d/dhcpd restart","Restarting DHCP server");
+
+=back 
+
+=head1 WEB SITES
+
+The main Web site of the project is available at L<http://www.dploy.org/>. Bug reports should be filled using the trac instance of the project at L<http://trac.dploy.org/>.
+
+=head1 USER MAILING LIST
+
+None exists for the moment.
+
+=head1 AUTHORS
+
+The dploy.org team L<http://trac.dploy.org/>.
+
+=head1 COPYRIGHT
+
+dploy.org is distributed under the GPL v2.0 license
+described in the file C<COPYING> included with the distribution.
+
+=cut
+