X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfidata.py;h=4f2749ee3cfc7837a788277737f0c768272c85df;hp=0ba93cbdc5339a0cf1874332f42ba483bb9a9afa;hb=480ff8b34640f125528b4a008c031eff8d232135;hpb=83798f68c3d08b162485f1286159ca76c57198f7

diff --git a/sface/sfidata.py b/sface/sfidata.py
index 0ba93cb..4f2749e 100644
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -5,89 +5,10 @@ from PyQt4.QtGui import *
 
 from lxml import etree
 from sfa.util.xrn import hrn_to_urn, urn_to_hrn
-from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
+from sfa.storage.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
 from sfa.rspecs.rspec import RSpec
 from sface.config import config
 
-# SfaceRSpec
-# temporary, until these references are tracked down and replaced with
-# rspec.version
-
-class SfaceRSpec(RSpec):
-    def __init__(self, rspec="", version=None, user_options={}):
-        RSpec.__init__(self, rspec, version, user_options)
-
-    def get_networks(self):
-        return self.version.get_networks()
-
-    def get_nodes(self, network):
-        return self.version.get_nodes(network)
-
-    def get_nodes_with_slivers(self, network):
-        return self.version.get_nodes_with_slivers(network)
-
-    def get_node_element(self, node, network=None):
-        return self.version.get_node_element(node, network)
-
-    def get_default_sliver_attributes(self, network):
-        return self.version.get_default_sliver_attributes(network)
-
-    def get_sliver_attributes(self, node, network):
-        return self.version.get_sliver_attributes(node, network)
-
-    def remove_slivers(self, slivers, network=None, no_dupes=False):
-        return self.version.remove_slivers(slivers, network, no_dupes)
-
-    def add_default_sliver_attribute(self, name, value, network=None):
-        self.version.add_default_sliver_attribute(name, value, network)
-
-    def add_sliver_attribute(self, hostname, name, value, network=None):
-        self.version.add_sliver_attribute(hostname, name, value, network)
-
-    def remove_default_sliver_attribute(self, name, value, network=None):
-        self.version.remove_default_sliver_attribute(name, value, network)
-
-    def remove_sliver_attribute(self, hostname, name, value, network=None):
-        self.version.remove_sliver_attribute(hostname, name, value, network)
-
-    #def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False):
-    #    return self.version.add_slivers(slivers, network, sliver_urn, no_dupes)
-
-    def merge_node(self, source_node_tag, network, no_dupes=False):
-        return self.version.merge_node(source_node_tag, network, no_dupes)
-
-    # sfav1.add_slivers isn't working for us...
-    def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False):
-        # add slice name to network tag
-        network_tags = self.xml.xpath('//network')
-        if network_tags:
-            network_tag = network_tags[0]
-            network_tag.set('slice', urn_to_hrn(sliver_urn)[0])
-
-        # add slivers
-        for sliver in slivers:
-            node_elem = self.get_node_element(sliver['hostname'], network)
-            if not node_elem: continue
-            sliver_elem = etree.SubElement(node_elem, 'sliver')
-            if 'tags' in sliver:
-                for tag in sliver['tags']:
-                    etree.SubElement(sliver_elem, tag['tagname']).text = value=tag['value']
-
-    # these should be moved to SFAv1, etc.
-    def get_node_boot_state(self, node, network):
-        return self.get_node_element(node, network).attrib.get("boot_state","")
-
-    def get_node_sliver_type(self, node, network):
-        node = self.get_node_element(node, network)
-        if not node:
-            return ""
-
-        sliver_types = node.xpath("sliver_type")
-        if len(sliver_types)>0:
-            return sliver_types[0].attrib.get("name", "")
-
-        return ""
-
 class SfiData:
     def __init__(self):
         pass
@@ -128,7 +49,16 @@ class SfiData:
     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 []
 
@@ -150,9 +80,9 @@ class SfiData:
         rspec_file = config.getSliceRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            rspec = SfaceRSpec(rspec=xml) #rspec = parse_rspec(xml)
+            rspec = RSpec(rspec=xml) #rspec = parse_rspec(xml)
 
-            self.purgeNonSliceResources(rspec)
+            #self.purgeNonSliceResources(rspec)
 
             return rspec
         return None
@@ -161,7 +91,7 @@ class SfiData:
         rspec_file = config.getResourcesRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
-            rspec = SfaceRSpec(rspec=xml) #rspec= parse_rspec(xml)
+            rspec = RSpec(rspec=xml) #rspec= parse_rspec(xml)
             return rspec
         return None