in set_pl_info/set_geni_info, if argument is a list assume the info we want is in...

[sfa.git] / geni / util / record.py

diff --git a/geni/util/record.py b/geni/util/record.py
index 6552961..80384d9 100644 (file)
--- a/geni/util/record.py
+++ b/geni/util/record.py
@@ -5,8 +5,9 @@
 ##
 
 import report
+from types import StringTypes
 from gid import *
-
+from geni.util.rspec import *
 ##
 # The GeniRecord class implements a Geni Record. A GeniRecord is a tuple
 # (Name, GID, Type, Info).
@@ -75,7 +76,7 @@ class GeniRecord:
     # @param gid is a GID object or the string representation of a GID object
 
     def set_gid(self, gid):
-        if isinstance(gid, str):
+        if isinstance(gid, StringTypes):
             self.gid = gid
         else:
             self.gid = gid.save_to_string(save_parents=True)
@@ -105,6 +106,8 @@ class GeniRecord:
     # @param pl_info is a dictionary containing planetlab info
 
     def set_pl_info(self, pl_info):
+        if isinstance(pl_info, list):
+            pl_info = pl_info[0]
         self.pl_info = pl_info
         self.dirty = True
 
@@ -114,6 +117,8 @@ class GeniRecord:
     # @param geni_info is a dictionary containing geni info
 
     def set_geni_info(self, geni_info):
+        if isinstance(geni_info, list):
+            geni_info = geni_info[0]
         self.geni_info = geni_info
         self.dirty = True
 
@@ -229,7 +234,6 @@ class GeniRecord:
 
     def load_from_dict(self, dict):
         self.set_name(dict['name'])
-
         gidstr = dict.get("gid", None)
         if gidstr:
             self.set_gid(dict['gid'])
@@ -246,8 +250,12 @@ class GeniRecord:
     # the record.
 
     def save_to_string(self):
+
         dict = self.as_dict()
-        str = xmlrpclib.dumps((dict,), allow_none=True)
+        record = RecordSpec()
+        record.parseDict(dict)
+        str = record.toxml()
+        #str = xmlrpclib.dumps((dict,), allow_none=True)
         return str
 
     ##
@@ -255,8 +263,13 @@ class GeniRecord:
     # representation of the record.
 
     def load_from_string(self, str):
-        dict = xmlrpclib.loads(str)[0][0]
-        self.load_from_dict(dict)
+        #dict = xmlrpclib.loads(str)[0][0]
+        
+        record = RecordSpec()
+        record.parseString(str)
+        record_dict = record.toDict()
+        geni_dict = record_dict['record']
+        self.load_from_dict(geni_dict)
 
     ##
     # Dump the record to stdout