Added site in Slab RSpec format, for easier filtering

[sfa.git] / sfa / rspecs / versions / slabv1.py

diff --git a/sfa/rspecs/versions/slabv1.py b/sfa/rspecs/versions/slabv1.py
index 53d119a..39addda 100644 (file)
--- a/sfa/rspecs/versions/slabv1.py
+++ b/sfa/rspecs/versions/slabv1.py
@@ -6,7 +6,7 @@ import sys
 from sfa.rspecs.elements.versions.slabv1Lease import Slabv1Lease
 from sfa.rspecs.elements.versions.slabv1Node import Slabv1Node
 from sfa.rspecs.elements.versions.slabv1Sliver import Slabv1Sliver
-from sfa.rspecs.elements.versions.slabv1Timeslot import Slabv1Timeslot
+
 
 from sfa.rspecs.elements.versions.sfav1Lease import SFAv1Lease
 
@@ -58,9 +58,12 @@ class Slabv1(RSpecVersion):
     
     def get_slice_timeslot(self ):
         return Slabv1Timeslot.get_slice_timeslot(self.xml)
-
+    
+    def add_connection_information(self, ldap_username, sites_set):
+        return Slabv1Node.add_connection_information(self.xml,ldap_username, sites_set)
+    
     def add_nodes(self, nodes, check_for_dupes=False):
-        return Slabv1Node.add_nodes(self.xml, nodes)
+        return Slabv1Node.add_nodes(self.xml,nodes )
     
     def merge_node(self, source_node_tag, network, no_dupes = False):
         logger.debug("SLABV1 merge_node")
@@ -94,18 +97,16 @@ class Slabv1(RSpecVersion):
     def get_slice_attributes(self, network=None):
         
         slice_attributes = []
-        slot = self.get_slice_timeslot()
+
         nodes_with_slivers = self.get_nodes_with_slivers()
-        slice_attributes.append({'timeslot':slot})
-        #slice_attributes.append({'name': 'timeslot', 'value' : slot})
-        print>>sys.stderr, "\r\n \r\n \r\n \t\t SLABV1.PY get_slice_attributes -----------------nodes_with_slivers %s "%(nodes_with_slivers)
+
         # TODO: default sliver attributes in the PG rspec?
         default_ns_prefix = self.namespaces['default']
         for node in nodes_with_slivers:
             sliver_attributes = self.get_sliver_attributes(node['component_id'],node, network)
             for sliver_attribute in sliver_attributes:
-                name=str(sliver_attribute[0])
-                text =str(sliver_attribute[1])
+                name = str(sliver_attribute[0])
+                text = str(sliver_attribute[1])
                 attribs = sliver_attribute[2]
                 # we currently only suppor the <initscript> and <flack> attributes
                 #if  'info' in name:
@@ -120,8 +121,7 @@ class Slabv1(RSpecVersion):
                     attribute = {'name': 'initscript', 'value': value, 'node_id': node}
                     slice_attributes.append(attribute)
           
-                    
-        print>>sys.stderr, "\r\n \r\n \r\n \t\t SLABV1.PY get_slice_attributes ----------------- slice_attributes %s "%(slice_attributes)
+
         return slice_attributes
 
     def attributes_list(self, elem):