Changeset eee2b2e for fedd/fedd_config_file.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_config_file.py (modified) (7 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