X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfidata.py;h=1a326c686876a0ec5c48472551ec759d58bbb5be;hp=fb98ac5541d5ac0094775802bfeb82d8cf6d5d7a;hb=c359089db117441b09eba6b6a05313f17bc1ac61;hpb=37dfde8c6c59f3c33d1225d3c73cb5ec11c12306

diff --git a/sface/sfidata.py b/sface/sfidata.py
index fb98ac5..1a326c6 100644
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -1,10 +1,12 @@
+import json
 import os
+import pickle
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 from lxml import etree
-from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
-from sfa.rspecs.rspec_parser import parse_rspec
+from sfa.util.xrn import hrn_to_urn, urn_to_hrn
+from sfa.rspecs.rspec import RSpec
 from sface.config import config
 
 class SfiData:
@@ -29,25 +31,48 @@ class SfiData:
     def getSliceRecord(self):
         rec_file = config.getSliceRecordFile()
         if os.path.exists(rec_file):
-            xml = open(rec_file).read()
-            rec = SliceRecord()
-            rec.load_from_string(xml)
-            return rec
+            try:
+                from sfa.storage.record import SliceRecord
+                xml = open(rec_file).read()
+                rec = SliceRecord()
+                rec.load_from_string(xml)
+                return rec
+            except:
+                from sfa.storage.model import make_record
+                obj=make_record (xml=file(rec_file).read())
+                # consider as a dict for smooth transition
+                return obj.__dict__
         return None
 
     def getUserRecord(self):
         rec_file = config.getUserRecordFile()
         if os.path.exists(rec_file):
-            xml = open(rec_file).read()
-            rec = UserRecord()
-            rec.load_from_string(xml)
-            return rec
+            try:
+                from sfa.storage.record import SliceUser
+                xml = open(rec_file).read()
+                rec = UserRecord()
+                rec.load_from_string(xml)
+                return rec
+            except:
+                from sfa.storage.model import make_record
+                obj=make_record (xml=file(rec_file).read())
+                # consider as a dict for smooth transition
+                return obj.__dict__
         return None
 
     def getUserSliceHrns(self):
         rec = self.getUserRecord()
         if rec:
-            return rec.get_field("slices")
+            slices = rec.get_field("slices")
+            if (type(slices)!=list) or (len(slices)<1):
+                return []
+
+            # get_field("slices") is returning [{"text": name}, {"text": name}, ...]
+            if (type(slices[0])==dict):
+                if "text" in slices[0]:
+                    slices = [x["text"] for x in slices]
+
+            return slices
 
         return []
 
@@ -69,9 +94,11 @@ class SfiData:
         rspec_file = config.getSliceRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            rspec = parse_rspec(xml)
 
-            self.purgeNonSliceResources(rspec)
+            if (xml.strip()==""):
+               return None
+
+            rspec = RSpec(rspec=xml)
 
             return rspec
         return None
@@ -80,5 +107,42 @@ class SfiData:
         rspec_file = config.getResourcesRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            return parse_rspec(xml)
+
+            if (xml.strip()==""):
+                return None
+
+            rspec = RSpec(rspec=xml)
+            return rspec
         return None
+
+    def getSliverStatus(self, slice=None):
+        if not slice:
+            slice = config.getSlice()
+
+        if not slice:
+            return None
+
+        filename = config.fullpath(slice+".sliverstatus")
+
+        if os.path.exists(filename):
+            data = open(filename).read()
+            try:
+                if hasattr(json, "loads"):
+                     return json.loads(data)   # python 2.6
+                else:
+                     return json.read(data)    # python 2.5
+            except:
+                print "Exception in getSliverStatus"
+                return None
+
+        return None
+
+    def getSliceMgrVersion(self):
+        filename = config.fullpath("slicemgr.version")
+
+        if os.path.exists(filename):
+            data = open(filename).read()
+            return pickle.loads(data)
+
+        return None
+