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

diff --git a/sface/sfidata.py b/sface/sfidata.py
index aa613c9..fb98ac5 100644
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -3,34 +3,15 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 from lxml import etree
-from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord
+from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
 from sfa.rspecs.rspec_parser import parse_rspec
 from sface.config import config
-from distutils.version import LooseVersion
-from sfa.util.version import version_core
 
 class SfiData:
     def __init__(self):
         pass
 
-    def getAuthorityHrns_old(self, type=None):
-        # DEPRECATED
-        names = []
-        i=0
-        while os.path.exists(config.getAuthorityListRecordFile(i)):
-            rec_file = config.getAuthorityListRecordFile(i)
-            xml = open(rec_file).read()
-            rec = SfaRecord(string = xml)
-            if (type==None) or (type==rec.get_type()):
-                names.append(rec.get_name())
-            i=i+1
-
-        return names
-
     def getAuthorityHrns(self, type=None):
-        if LooseVersion(version_core()['code_tag']) <= LooseVersion("1.0-35"):
-            return self.getAuthorityHrns_old(type)
-
         names = []
         if os.path.exists(config.getAuthorityListFile()):
             xml = open(config.getAuthorityListFile()).read()
@@ -54,7 +35,25 @@ class SfiData:
             return rec
         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
+        return None
+
+    def getUserSliceHrns(self):
+        rec = self.getUserRecord()
+        if rec:
+            return rec.get_field("slices")
+
+        return []
+
     def purgeNonSliceResources(self, rspec):
+        # This can probably go away once the new slice manager is fully
+        # deployed.
         networks = rspec.get_networks()
         for network in networks:
             all_nodes = rspec.get_nodes(network)