Changeset eee2b2e

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

Location:

fedd

Files:

• fedd_config_file.py (modified) (7 diffs)
• fedd_experiment_control.py (modified) (8 diffs)

fedd/fedd_config_file.py

@@ -29 +29 @@
             "create_experiment_cert_file", "create_experiment_cert_pwd",
             "create_experiment_trusted_certs", "federation_script_dir",
-            "ssh_pubkey_file")
+            "ssh_pubkey_file", "experiment_state_file")
+    id_list_attrs = ("restricted",)
 
 
@@ -43 +44 @@
         for a in config_file.emulab_attrs + config_file.id_attrs:
             setattr(self, a, None)
+        
+        for a in config_file.id_list_attrs:
+            setattr(self, a, [])
 
         self.attrs = { }
@@ -48 +52 @@
         self.fedid_default = "user"
         self.access = { }
-        self.restricted = []
 
         if config:
@@ -144 +147 @@
                 '|'.join(config_file.emulab_attrs + config_file.id_attrs) + \
                 '):\s*(.*)', re.IGNORECASE)
+        list_re = re.compile("(" + '|'.join(config_file.id_list_attrs) + \
+                "):\s*(.*)", re.IGNORECASE)
         attr_re = re.compile('attribute:\s*([\._\-a-z0-9]+)\s+value:\s*(.*)',
                 re.IGNORECASE)
@@ -150 +155 @@
                 access_name + '\s*\)', re.IGNORECASE)
         trustfile_re = re.compile("trustfile:\s*(.*)", re.IGNORECASE)
-        restricted_re = re.compile("restricted:\s*(.*)", re.IGNORECASE)
 
         def parse_name(n):
@@ -177 +181 @@
                 continue
 
+            # List attributes
+            m = list_re.match(line)
+            if m != None:
+                attr, val = m.group(1,2)
+                l = getattr(self, attr.lower())
+                l.append(val)
+                continue
+
+
             # Extended (attribute: x value: y) attribute line
             m = attr_re.match(line)
@@ -206 +219 @@
             if m != None:
                 self.read_trust(m.group(1))
-                continue
-            # Restricted node types
-
-            m = restricted_re.match(line)
-            if m != None:
-                self.restricted.append(m.group(1))
                 continue
 

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: