Changeset 8d4e4fbcae7a2e91f87e7d36ad3aecc64cb498f6 for fedkit

Timestamp:

02/10/10 10:29:18 (2 years ago)

Author:

Ted Faber <faber@…>

Children:

bbd00399d41bbe4da7582776a71d47bc5e0f0a82

Parents:

b73cc45c6ebf1b7485b5d0532772c42a6eb4f79a

git-committer:

Ted Faber <faber@isi.edu> / 2010-02-10T18:29:18Z+0000

Message:

Add support for parameters via files in a standard emulab location

Also moved combo_active.pl to combo.pl and added support for passive gateways.

Location:

fedkit

Files:

• Makefile (modified) (1 diff)
• active_config.pl (modified) (3 diffs)
• combo.pl (moved) (moved from fedkit/combo_active.pl) (3 diffs)
• gateway_lib.pm (modified) (3 diffs)
• prep_gateway.pl (modified) (2 diffs)

fedkit/Makefile

@@ -1 +1 @@
 BINARIES=federate.sh smbmount.FreeBSD.pl smbmount.Linux.pl \
          make_hosts fed-tun.pl fed_evrepeater rc.fedaccounts \
-         config_from_tunnelip.pl active_config.pl combo_active.pl \
+         config_from_tunnelip.pl active_config.pl combo.pl \
          prep_gateway.pl port_forward.pl setup_bridge.pl
 
 LIBRARIES=gateway_lib.pm 
 
-fedkit.tgz:     ${BINARIES} ${PATCHES}
+fedkit.tgz:     ${LIBRARIES} ${BINARIES} ${PATCHES}
         mkdir -p /tmp/fedkit/local/federation/bin
         mkdir -p /tmp/fedkit/local/federation/lib

fedkit/active_config.pl

@@ -15 +15 @@
 my $fedkit_dir= "/usr/local/federation";
 my $perl = "/usr/bin/perl";
-my $iface_file;
+my $iface_file = "/var/emulab/boot/ifmap";
 my $ssh = "/usr/bin/ssh";
+my $use_file;
 
-exit(20) unless GetOptions(
+my %opts = (
     'ssh_pubkey=s' => \$ssh_pubkey,
     'ssh_privkey=s' => \$ssh_privkey,
@@ -27 +28 @@
     'interfaces=s' => \$iface_file,
     'ssh=s' => \$ssh,
+    'use_file' => \$use_file,
 );
 
+exit(20) unless GetOptions(%opts);
+
+gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
+    if $use_file;
 
 my $tunnelparam = $tunnelip ? '--tunnelip' : '';
@@ -109 +115 @@
 connectivity information
 
+=item B<use_file>
+
+If given read additional parameters from the file in
+/proj/I<project>/exp/I<experiment/tmp/I<hostname>.gw/conf where those are the
+current testbed project and experiment and the hostname is before the first
+dot.  The file is option: value.
+
+
 =back
 

fedkit/combo.pl

@@ -11 +11 @@
 my $ssh_pubkey;
 my $ssh_privkey;
+my $active;
 my $tunnelip;
 my $peer;
 my $fedkit_dir= "/usr/local/federation";
 my $perl = "/usr/bin/perl";
-my $iface_file;
+my $iface_file = "/var/emulab/boot/ifmap";
 my $ssh = "/usr/bin/ssh";
 my @ports;
+my $use_file;
 
-exit(20) unless GetOptions(
+my %opts = (
     'ssh_pubkey=s' => \$ssh_pubkey,
     'ssh_privkey=s' => \$ssh_privkey,
@@ -28 +30 @@
     'interfaces=s' => \$iface_file,
     'ssh=s' => \$ssh,
-    'port=s', \@ports,
+    'port=s' => \@ports,
+    'active' => \$active, 
+    'use_file' => \$use_file,
 );
 
+exit(20) unless GetOptions(%opts);
+
+gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
+    if $use_file;
 
 my $tunnelparam = $tunnelip ? '--tunnelip' : '';
-my $portparam = join(" --port=", @ports);
+if ($active) {
+    my $portparam = join(" --port=", @ports);
 
-# join doesn't prefix the first one
-$portparam="--port=$portparam" if $portparam;
+    # join doesn't prefix the first one
+    $portparam="--port=$portparam" if $portparam;
 
-system("$perl -I$fedkit_dir/lib $fedkit_dir/bin/active_config.pl " .
-    "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " .
-    " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " .
-    "--ssh=$ssh --interfaces=$iface_file");
-exit(20) if $?;
+    system("$perl -I$fedkit_dir/lib $fedkit_dir/bin/active_config.pl " .
+        "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " .
+        " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " .
+        "--ssh=$ssh --interfaces=$iface_file");
+    exit(20) if $?;
 
-system("$perl -I$fedkit_dir/lib $fedkit_dir/bin/port_forward.pl " .
-    "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " .
-    " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " .
-    "--ssh=$ssh $portparam");
-exit(20) if $?;
+    system("$perl -I$fedkit_dir/lib $fedkit_dir/bin/port_forward.pl " .
+        "--peer=$peer --ssh_pubkey=$ssh_pubkey --ssh_privkey=$ssh_privkey " .
+        " $tunnelparam --fedkit=$fedkit_dir --perl=$perl " .
+        "--ssh=$ssh $portparam");
+    exit(20) if $?;
+}
+else {
+    system("$perl -I$fedkit_dir/lib $fedkit_dir/bin/prep_gateway.pl " . 
+        "--peer=$peer --ssh_pubkey=$ssh_pubkey $tunnelparam");
+    exit(20) if $?;
+}
 
 =pod
@@ -108 +123 @@
 connectivity information
 
+=item B<use_file>
+
+If given read additional parameters from the file in
+/proj/I<project>/exp/I<experiment/tmp/I<hostname>.gw/conf where those are the
+current testbed project and experiment and the hostname is before the first
+dot.  The file is option: value.
+
 =back
 

fedkit/gateway_lib.pm

@@ -9 +9 @@
 @EXPORT_OK=qw(set_sshd_params import_key wait_for_DNS deter_tunnelip 
     configure_outgoing_iface add_route bind_tap_to_iface iface_to_addr
-    dest_to_iface addr_to_iface);
+    dest_to_iface addr_to_iface read_config emulab_config_filename);
+
 
 use strict;
@@ -24 +25 @@
 my $TMCC = "/usr/local/etc/emulab/tmcc";
 my $FINDIF = "/usr/local/etc/emulab/findif";
+my $TMCC = "/usr/local/etc/emulab/tmcc";
 
 # Takes an ssh config file and a reference to a hash of keys whose values must
@@ -242 +244 @@
 }
 
+# untested
+sub read_config {
+    my($file, $map) = @_;
+    my %param;
+    my %keywords;
+    my $f;
+
+    foreach my $k (keys %{$map}) {
+        if ( $k =~ /(\S+)=[si]/ ) {
+            $keywords{$1} = $map->{$k};
+            $param{$1}++;
+        }
+        else {
+            $keywords{$k} = $map->{$k};
+        }
+    }
+
+    $f = new IO::File($file) || die "Can't open $file: $!\n";
+    while (<$f>) {
+        /^\s*([^:]+):\s*(.*)/ && do {
+            my $keyw = $1;
+            my $val = $2;
+
+            $keyw =~ tr [A-Z] [a-z];
+
+            if ($keywords{$keyw} ) {
+                if ( $param{$keyw} ) { 
+                    if ( ref($keywords{$keyw}) eq 'SCALAR') {
+                        ${$keywords{$keyw}} = $val;
+                    }
+                    elsif( ref($keywords{$keyw}) eq 'ARRAY') {
+                        push(@{$keywords{$keyw}}, $val);
+                    }
+                    else {
+                        die "Unknown variable type for $keyw\n";
+                    }
+                }
+                else  { ${$keywords{$keyw}}++; }
+            }
+            next;
+        };
+    }
+    $f->close();
+}
+
+
+sub emulab_config_filename {
+    # Find the configuration file in the usual place, which depends on what
+    # experiment and project we're in.
+    my $pid;
+    my $eid;
+    my $filename;
+    my $tmcd = new IO::Pipe() || die "Can't create pipe: $!\n";
+
+    $tmcd->reader("$TMCC status");
+
+    while (<$tmcd>) {
+        chomp;
+        /ALLOCATED=([^\/]+)\/(\S+)/ && do {
+            $pid = $1;
+            $eid = $2;
+        };
+    }
+    $tmcd->close();
+    my $hn = `hostname`;
+    chomp $hn;
+    $hn =~ s/\..*//;
+    $filename = "/proj/$pid/exp/$eid/tmp/$hn.gw.conf"
+        if $pid and $eid;
+
+    return $filename;
+}
+
 1;

fedkit/prep_gateway.pl

@@ -10 +10 @@
 my $tunnelip;
 my $peer;
-
-exit(20) unless GetOptions('ssh_pubkey=s' => \$ssh_pubkey,
+my $use_file;
+my %opts = (
+    'ssh_pubkey=s' => \$ssh_pubkey,
     'tunnelip' => \$tunnelip,
     'peer=s' => \$peer,
+    'use_file' => \$use_file,
 );
+
+exit(20) unless GetOptions(%opts);
+
+gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
+    if $use_file;
 
 gateway_lib::set_sshd_params( 
@@ -64 +71 @@
 connectivity information
 
+=item B<use_file>
+
+If given read additional parameters from the file in
+/proj/I<project>/exp/I<experiment/tmp/I<hostname>.gw/conf where those are the
+current testbed project and experiment and the hostname is before the first
+dot.  The file is option: value.
+
+
 =back