Changeset 8d4e4fb for fedkit/combo.pl

Timestamp:

Feb 10, 2010 10:29:18 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

bbd0039

Parents:

b73cc45

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.

File:

• fedkit/combo.pl (moved) (moved from fedkit/combo_active.pl) (3 diffs)

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