Changeset 4addf9d

Timestamp:

Sep 12, 2007 11:06:22 AM (17 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

9c00d41

Parents:

c23025e

Message:

remove special case for localhost

File:

• fedkit/splitter.pl (modified) (5 diffs)

fedkit/splitter.pl

@@ -33 +33 @@
 
     # XXX system with a relative pathname is sort of gross
-    # if ( $host ne "localhost") {
-        #system ("ssh $user\@$host $cmd");
-        #}
-    #else {
-        #system ("$cmd");
-        #}
     system ("ssh $user\@$host $cmd");
     if ($?) {
@@ -83 +77 @@
 
     # Determine the status of the remote experiment
-    #if ( $host ne "localhost") {
-#       open(STATUS, "ssh $user\@$host /usr/testbed/bin/expinfo $pid $eid|") || 
-#           die "Can't ssh to $user\@$host:$!\n";
-#    }
-#    else {
-#       open(STATUS, "/usr/testbed/bin/expinfo $pid $eid|") || 
-#           die "Can't call expinfo locally";
-#    }
     open(STATUS, "ssh $user\@$host /usr/testbed/bin/expinfo $pid $eid|") || 
         die "Can't ssh to $user\@$host:$!\n";
@@ -102 +88 @@
 
     # Copy the experiment definition data over (unless the host is local)
-    #if ( $host ne "localhost") {
-#       &scp_file("$tmpdir/$tb/$tclfile", "$user\@$host") || return 0;
-#    }
-#    else {
-#       # XXX this ain't quite right
-#       system("cp $tmpdir/$tb/$tclfile .");
-#    }
-
     &scp_file("$tmpdir/$tb/$tclfile", "$user\@$host") || return 0;
     # Remote experiment is active.  Modify it.
@@ -313 +291 @@
         my($ddomain) = $domain{$dtb};           # domain for the destination
 
+        $sdomain = ".$eid.$project{$gateways}$sdomain";
+        $ddomain = ".$eid.$project{$dtb}$ddomain";
+
         # If either end of this link is in the master side of the testbed, that
         # side is the active end. Otherwise the first testbed encountered in
@@ -350 +331 @@
         s/EXPSTART/$expstart{$ctb}/g;
     }
+    # XXX: oh is this bad
+    s#GWCONF#FEDDIR\`hostname\`.gw.conf#g;
+    s#FEDDIR#/proj/$project{$ctb}/exp/$eid/tmp/#g;
     print FILE;
 }