Changeset 6a50b78

Timestamp:

Feb 5, 2012 7:29:57 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

25930db

Parents:

e8979e2

Message:

Initial benito plug in. Fixed bug pickling topdl as well

Location:

fedd

Files:

• deter/topdl.py (modified) (4 diffs)
• federation/benito_access.py (added)
• federation/benito_segment.py (added)
• federation/deter_impl.py (modified) (2 diffs)
• federation/experiment_control.py (modified) (3 diffs)

fedd/deter/topdl.py

@@ -250 +250 @@
         return rv
 
+    def __getstate__(self):
+        d = self.__dict__.copy()
+        del d['interfaces']
+        return d
+
+    def __setstate__(self, d):
+        # Import everything from the pickle dict (except what we excluded in
+        # __getstate__)
+        self.__dict__.update(d)
+        self.interfaces = []
+
 class CPU(base):
     def __init__(self, type, attribute=[]):
@@ -417 +428 @@
                     for a in self.attribute], "")
         return rv
+
+    def __getstate__(self):
+        d = self.__dict__.copy()
+        del d['subs']
+        return d
+
+    def __setstate__(self, d):
+        # Import everything from the pickle dict (except what we excluded in
+        # __getstate__)
+        self.__dict__.update(d)
+        self.subs = []
 
 
@@ -813 +835 @@
         return rv
 
+    def __setstate__(self, d):
+        # Import everything from the pickle dict and call incorporate to
+        # connect them.
+        self.__dict__.update(d)
+        self.incorporate_elements()
+
 
 def topology_from_xml(string=None, file=None, filename=None, top="topology"):
@@ -891 +919 @@
         xp.ParseFile(file)
     elif string:
-        xp.Parse(string, isfinal=True)
+        xp.Parse(string, True)
     else:
         return None

fedd/federation/deter_impl.py

@@ -7 +7 @@
 import protogeni_access
 import deter_internal_access
+import benito_access
 import skeleton_access
 
@@ -86 +87 @@
                     self.access = deter_internal_access.access(config,
                             self.auth)
+                if self.access_type == "benito":
+                    self.access = benito_access.access(config, self.auth)
                 elif self.access_type == "skel":
                     self.access = skeleton_access.access(config, self.auth)

fedd/federation/experiment_control.py

@@ -2038 +2038 @@
                 try:
                     vis = self.genviz(
-                            topdl.topology_to_vtopo(self.state[key].topo))
+                            topdl.topology_to_vtopo(self.state[key].top))
                 except service_error, e:
                     self.state_lock.release()
@@ -2297 +2297 @@
         if key in self.state:
             if force or self.state[key].older_than(self.info_cache_limit):
-                top = self.state[key].top 
+                top = self.state[key].top
                 if top is not None: top = top.clone()
                 d1, info_params, cert, d2 = \
@@ -2368 +2368 @@
             # Copy the topo if we need legacy annotations
             if legacy:
-                top = self.state[key].top 
+                top = self.state[key].top
                 if top is not None: top = top.clone()
         self.state_lock.release()