check for the x bit when locating an executable

[sface.git] / sface / sfidata.py

diff --git a/sface/sfidata.py b/sface/sfidata.py
index aa613c9..4f2749e 100644 (file)
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -1,36 +1,19 @@
 import os
+import pickle
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 from lxml import etree
-from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord
-from sfa.rspecs.rspec_parser import parse_rspec
+from sfa.util.xrn import hrn_to_urn, urn_to_hrn
+from sfa.storage.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
+from sfa.rspecs.rspec import 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 +37,34 @@ 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:
+            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 []
+
     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)
@@ -70,9 +80,9 @@ class SfiData:
         rspec_file = config.getSliceRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            rspec = parse_rspec(xml)
+            rspec = RSpec(rspec=xml) #rspec = parse_rspec(xml)
 
-            self.purgeNonSliceResources(rspec)
+            #self.purgeNonSliceResources(rspec)
 
             return rspec
         return None
@@ -81,5 +91,28 @@ class SfiData:
         rspec_file = config.getResourcesRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            return parse_rspec(xml)
+            rspec = RSpec(rspec=xml) #rspec= parse_rspec(xml)
+            return rspec
         return None
+
+    def getSliverStatus(self, slice=None):
+        if not slice:
+            slice = config.getSlice()
+
+        filename = config.fullpath(slice+".sliverstatus")
+
+        if os.path.exists(filename):
+            data = open(filename).read()
+            return pickle.loads(data)
+
+        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
+