remove obsolete code

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index b2b8cc8..2392606 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -575,11 +575,11 @@ class SliceWidget(QWidget):
         rootItem = self.nodeModel.invisibleRootItem()
 
         networks = []
         rootItem = self.nodeModel.invisibleRootItem()
 
         networks = []

-        for network in rspec.get_networks():
+        for network in rspec.version.get_networks():

             network_name = network.get("name", None)
             if (network_name != None) and (not network_name in networks):
                 networks.append(network_name)
             network_name = network.get("name", None)
             if (network_name != None) and (not network_name in networks):
                 networks.append(network_name)

-        for network in resources.get_networks():
+        for network in resources.version.get_networks():

             network_name = network.get("name", None)
             if (network_name != None) and (not network_name in networks):
                 networks.append(network_name)
             network_name = network.get("name", None)
             if (network_name != None) and (not network_name in networks):
                 networks.append(network_name)


@@ -604,7 +604,7 @@ class SliceWidget(QWidget):
 
             # Add default slice tags
             nodeItem = self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="defaults")
 
             # Add default slice tags
             nodeItem = self.nodeView.appendRow(networkItem, "%s for %s" % (default_tags, network), kind="defaults")

-            attrs = rspec.get_default_sliver_attributes(network)
+            attrs = rspec.version.get_default_sliver_attributes(network)

             for attr in attrs:
                     name = attr.get("name", None)
                     value = attr.get("value", None)
             for attr in attrs:
                     name = attr.get("name", None)
                     value = attr.get("value", None)


@@ -619,7 +619,7 @@ class SliceWidget(QWidget):
                                membership=node_status['in'],
                                kind="node")
 
                                membership=node_status['in'],
                                kind="node")
 

-                attrs = rspec.get_sliver_attributes(node['component_id'], network)
+                attrs = rspec.version.get_sliver_attributes(node['component_id'], network)

                 for attr in attrs:
                     name = attr.get("name", None)
                     value = attr.get("value", None)
                 for attr in attrs:
                     name = attr.get("name", None)
                     value = attr.get("value", None)

diff --git a/sface/sfidata.py b/sface/sfidata.py
index 284c090..71bb471 100644 (file)
--- a/sface/sfidata.py
+++ b/sface/sfidata.py
@@ -9,61 +9,6 @@ from sfa.util.record import SfaRecord, SliceRecord, AuthorityRecord, UserRecord
 from sfa.rspecs.rspec import RSpec
 from sface.config import config
 
 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 merge_node(self, source_node_tag, network, no_dupes=False):
-        return self.version.merge_node(source_node_tag, network, no_dupes)
-
-    def get_node_sliver_type(self, node, network):
-        node = self.get_node_element(node, network)
-        if node is None:
-            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
 class SfiData:
     def __init__(self):
         pass


@@ -135,7 +80,7 @@ class SfiData:
         rspec_file = config.getSliceRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
         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)
 


@@ -146,7 +91,7 @@ class SfiData:
         rspec_file = config.getResourcesRSpecFile()
         if os.path.exists(rspec_file):
             xml = open(rspec_file).read()
         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
 
             return rspec
         return None