Changeset 1b6cc95 for fedd/federation

Timestamp:

Jun 22, 2010 1:06:53 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

181aeb4

Parents:

2b6e64d1

Message:

A couple random bugs that didn't get spotted until we swapped something in for
real.

File:

• fedd/federation/protogeni_access.py (modified) (4 diffs)

fedd/federation/protogeni_access.py

@@ -12 +12 @@
 import random
 import traceback
+import xml.parsers.expat
 
 from threading import Thread, Timer, Lock
@@ -773 +774 @@
             elif self.node_startcommand:
                 # XXX: debug
-                print >>script, "sudo perl -I%s %simport_key.pl /users/%s/.ssh/authorized_keys /root/.ssh/authorized_keys" % (fed_lib_dir, fed_bin_dir, user)
+                print >>script, "sudo perl -I%s %s/import_key.pl /users/%s/.ssh/authorized_keys /root/.ssh/authorized_keys" % (fed_lib_dir, fed_bin_dir, user)
                 # XXX: debug
                 if elem.get_attribute('startup'):
@@ -1007 +1008 @@
         try:
             param = { 'credential': slice_cred }
-            segment_commands.pg_call(self.cm_url, 'DeleteSliver',
+            segment_commands.pg_call(self.cm_url, 'DeleteSlice',
                     param, ctxt)
         except segment_commands.ProtoGENIError, e:
@@ -1246 +1247 @@
             embedding.append({ 
                 'toponame': k,
-                'physname': ["%s%s" %  (n, self.domain)],
+                'physname': [n ],
                 })
         # Grab the log (this is some anal locking, but better safe than