Changeset 2ee4226 for fedd/federation/emulab_access.py

Timestamp:

Apr 26, 2010 6:10:57 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

05fceef

Parents:

d8442da

Message:

More attempts to make the SSL more reliable on users. Not completely
successful.

File:

• fedd/federation/emulab_access.py (modified) (5 diffs)

fedd/federation/emulab_access.py

@@ -172 +172 @@
 
         self.call_SetValue = service_caller('SetValue')
-        self.call_GetValue = service_caller('GetValue')
+        self.call_GetValue = service_caller('GetValue', log=self.log)
 
         if not config.has_option("allocate", "uri"):
@@ -1307 +1307 @@
         """
 
-        call_SetValue = service_caller('SetValue', log=self.log)
         for c in connInfo:
             for p in [ p for p in c.get('parameter', []) \
@@ -1321 +1320 @@
                         self.log.debug("Setting %s to %s on %s" % \
                                 (k, value, surl))
-                        call_SetValue(surl, req, cf)
+                        self.call_SetValue(surl, req, cf)
                     else:
                         self.log.error("Bad export request: %s" % p)
@@ -1331 +1330 @@
                         self.log.debug("Setting %s to %s on %s" % \
                                 (k, self.ssh_port, surl))
-                        call_SetValue(surl, req, cf)
+                        self.call_SetValue(surl, req, cf)
                     else:
                         self.log.error("Bad export request: %s" % p)
@@ -1356 +1355 @@
                     self.log.debug("Waiting for %s (%s) from %s" % \
                             (name, key, store))
-                    call_GetValue = service_caller('GetValue')
-                    r = call_GetValue(store, req, cf)
+                    r = self.call_GetValue(store, req, cf)
                     r = r.get('GetValueResponseBody', None)
                     if r :