Merge Master in geni-v3 conflict resolution

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

diff --git a/sfa/rspecs/versions/slabv1.py b/sfa/rspecs/versions/slabv1.py
index bba4484..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
 
@@ -59,8 +59,8 @@ class Slabv1(RSpecVersion):
     def get_slice_timeslot(self ):
         return Slabv1Timeslot.get_slice_timeslot(self.xml)
     
-    def add_connection_information(self, ldap_username):
-        return Slabv1Node.add_connection_information(self.xml,ldap_username)
+    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 )