Changeset eee2b2e for fedd/fedd_experiment_control.py

Timestamp:

Oct 6, 2008 4:00:19 PM (16 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:

a97394b

Parents:

ea0a821

Message:

save state

File:

• fedd/fedd_experiment_control.py (modified) (8 diffs)

fedd/fedd_experiment_control.py

@@ -16 +16 @@
 import tempfile
 import copy
+import pickle
 
 import traceback
@@ -113 +114 @@
         self.trusted_certs = None
 
-        if config.create_experiment_cert_file:
-            self.cert_file = config.create_experiment_cert_file
-            self.cert_pwd = config.create_experiment_cert_pwd
-        if config.create_experiment_trusted_certs:
-            self.trusted_certs = config.create_experiment_trusted_certs
-
-        if config.proxy_cert_file:
-            if not self.cert_file:
-                self.cert_file = config.proxy_cert_file
-                self.cert_pwd = config.proxy_cert_pwd
-        if config.proxy_trusted_certs:
-            if not self.trusted_certs:
-                self.trusted_certs = config.proxy_trusted_certs
-
-        if config.cert_file:
-            if not self.cert_file:
-                self.cert_file = config.cert_file
-                self.cert_pwd = config.cert_pwd
-        if config.trusted_certs:
-            if not self.trusted_certs:
-                self.trusted_certs = config.trusted_certs
+        # Walk through the various relevant certificat specifying config
+        # attributes until the local certificate attributes can be resolved.
+        # The walk is from omst specific to most general specification.
+        for p in ("create_experiment_", "proxy_", ""):
+            filen = "%scert_file" % p
+            pwn = "%scert_pwd" % p
+            trustn = "%strusted_certs" % p
+
+            if getattr(config, filen, None):
+                if not self.cert_file:
+                    self.cert_file = getattr(config, filen, None)
+                    self.cert_pwd = getattr(config, pwn, None)
+
+            if getattr(config, trustn, None):
+                if not self.trusted_certs:
+                    self.trusted_certs = getattr(config, trustn, None)
 
         self.exp_stem = "fed-stem"
@@ -150 +146 @@
         self.ssh_type = "rsa"
         self.state = { }
+        self.state_filename = config.experiment_state_file
         self.tclsh = "/usr/local/bin/otclsh"
         self.tcl_splitter = "/usr/testbed/lib/ns2ir/parse.tcl"
@@ -178 +175 @@
                 raise service_error(service_error.internal,
                         "Cannot read sshpubkey")
+
+        # Grab saved state
+        if self.state_filename:
+            self.read_state()
 
         # Confirm federation scripts in the right place
@@ -250 +251 @@
         s.close()
         d.close()
+
+    def write_state(self):
+        if os.access(self.state_filename, os.W_OK):
+            self.copy_file(self.state_filename, \
+                    "%s.bak" % self.state_filename)
+        try:
+            f = open(self.state_filename, 'w')
+            pickle.dump(self.state, f)
+        except IOError, e:
+            print >>sys.stderr, "Can't write file %s: %s" % \
+                    (self.state_filename, e)
+        except pickle.PicklingError, e:
+            print >>sys.stderr, "Pickling problem: %s" % e
+
+    def read_state(self):
+        try:
+            f = open(self.state_filename, "r")
+            self.state = pickle.load(f)
+        except IOError, e:
+            print >>sys.stderr, "Can't open %s: %s" % \
+                    (self.state_filename, e)
+        except pickle.UnpicklingError, e:
+            print >>sys.stderr, "Unpickling failed: %s" % e
 
     def scp_file(self, file, user, host, dest=""):
@@ -1381 +1405 @@
                 }
         self.state[eid] = self.state[expid]
+        if self.state_filename: self.write_state()
         return resp
 
@@ -1486 +1511 @@
 
         if fed_exp:
+            ids = []
+            #  experimentID is a list of dicts that are self-describing
+            #  identifiers.  This finds all the fedids and localnames - the
+            #  keys of self.state - and puts them into ids.
+            for id in fed_exp.get('experimentID', []):
+                if id.has_key('fedid'): ids.append(id['fedid'])
+                if id.has_key('localname'): ids.append(id['localname'])
+
             # Construct enough of the tbparams to make the stop_segment calls
             # work
@@ -1516 +1549 @@
             for tb in tbparams.keys():
                 self.stop_segment(tb, tbparams[tb]['eid'], tbparams)
+
+            for id in ids:
+                if self.state.has_key(id): del self.state[id]
+
+            if self.state_filename: self.write_state()
             return { 'experiment': exp }
         else: