Changeset d56b168c04c13b76e202cde895cef94dd2121efc for fedkit

Timestamp:

05/24/10 09:23:51 (2 years ago)

Author:

Ted Faber <faber@…>

Children:

301e9417d1e4c65795af6b69250c30f817bcba86

Parents:

8fc06061ceb968f3ad4b66482b703cad6505bb7a

git-committer:

Ted Faber <faber@isi.edu> / 2010-05-24T16:23:51Z+0000

Message:

more general namespace manipulation

Files:

• fedkit/federate.pl (modified) (4 diffs)

fedkit/federate.pl

@@ -23 +23 @@
 my $local_config_dir = "/usr/local/federation/etc";
 my %services;
+my %aliases;
+my @added;
 my $perl;
 
@@ -92 +94 @@
     /ProjectName:\s+(.*)/i && do { $smbproject = $1; };
     /Service:\s+(.*)/i && do { $services{$1}++;};
+    /PortalAlias:\s+(.*)/i && do { $aliases{$1}++;};
+    /AddedNode:\s+(.*)/i && do { push(@added, $1)}++;};
+}
+
+# If nodes have been added with this name, do not alias the name to the portal
+for my $a (@added) {
+    chomp $a;
+    delete $aliases{$a} if $aliases{$a};
 }
 $client->close();
@@ -103 +113 @@
 while (<$hosts>) {
     /^127\.0\.0\.1/ && do { print $new_hosts $_; };
-    /control\./ && $has_control++;
+    # If aliases conflict with existing nodes, delete the alias
+    for my $n (split($_)) {
+        chomp $n;
+        delete $aliases{$n} if $aliases{$n};
+    }
 }
 $hosts->close();
@@ -111 +125 @@
 $config_hosts->close();
 
-# If seer is enabled and no local control node in play, alias the gateway to be
-# control
+# Add gateway aliases
 if ($services{'seer'} && !$has_control ) {
     if ( my $hent = gethostbyname($gateway) ) {
         my $gwip = inet_ntoa($hent->addr_list->[0]);
 
-        print $new_hosts "\n$gwip\tcontrol.$exp.$proj\n";
+        for my $k (keys %aliases) {
+            print $new_hosts "\n$gwip\t$k.$exp.$proj\n";
+        }
     }
 }