from lxml import etree
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
return names
- def getSliceRecord(self):
- rec_file = config.getSliceRecordFile()
+ def getRecord(self, rec_file):
if os.path.exists(rec_file):
+ from sfa.storage.record import Record
xml = open(rec_file).read()
- rec = SliceRecord()
- rec.load_from_string(xml)
- return rec
- return None
+ rec = Record(xml=xml)
+ return rec.todict()
+ return None
+
+ def getSliceRecord(self):
+ rec_file = config.getSliceRecordFile()
+ return self.getRecord(rec_file)
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
+ return self.getRecord(rec_file)
def getUserSliceHrns(self):
rec = self.getUserRecord()
if rec:
- slices = rec.get_field("slices")
+ slices = rec.get("slices",[])
if (type(slices)!=list) or (len(slices)<1):
return []