X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2FtestInterfaces.py;h=d25484cfae948849da954e9e54157f4d4ecece5a;hb=0f57e9a45ec399ae3157f48aa7db7921706315f3;hp=d0e725382dfcf4ef9e26088a4f772a078860774d;hpb=4ff67c801ceeb1d0c7ca2863c2b7bf8152182b8f;p=sfa.git

diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py
index d0e72538..d25484cf 100755
--- a/tests/testInterfaces.py
+++ b/tests/testInterfaces.py
@@ -13,7 +13,6 @@ from sfa.util.config import *
 from sfa.trust.certificate import *
 from sfa.trust.credential import *
 from sfa.util.sfaticket import *
-from sfa.util.rspec import *
 from sfa.client import sfi
 
 def random_string(size):
@@ -184,7 +183,7 @@ class AggregateTest(BasicTestCase):
         BasicTestCase.setUp(self)
         
     def testGetSlices(self):
-        self.aggregate.get_slices(self.credential)
+        self.aggregate.ListSlices(self.credential)
 
     def testGetResources(self):
         # available resources
@@ -203,7 +202,7 @@ class AggregateTest(BasicTestCase):
 
     def testDeleteSlice(self):
         slice_credential = self.client.get_credential(self.slice['hrn'], 'slice')
-        self.aggregate.delete_slice(slice_credential, self.slice['hrn'])
+        self.aggregate.DeleteSliver(slice_credential, self.slice['hrn'],"call-id-delete-slice")
 
     def testGetTicket(self):
         slice_credential = self.client.get_credential(self.slice['hrn'], 'slice')
@@ -234,13 +233,13 @@ class ComponentTest(BasicTestCase):
         self.cm.stop_slice(self.slice_cred, self.slice['hrn'])
 
     def testDeleteSlice(self):
-        self.cm.delete_slice(self.slice_cred, self.slice['hrn'])
+        self.cm.DeleteSliver(self.slice_cred, self.slice['hrn'],"call-id-delete-slice-cm")
 
     def testRestartSlice(self):
         self.cm.restart_slice(self.slice_cred, self.slice['hrn'])
 
     def testGetSlices(self):
-        self.cm.get_slices(self.slice_cred, self.slice['hrn'])
+        self.cm.ListSlices(self.slice_cred, self.slice['hrn'])
 
     def testRedeemTicket(self):
         rspec = self.aggregate.get_resources(self.credential)
@@ -260,7 +259,7 @@ def CreateSliver(client):
     client.registry.register(auth_cred, slice_record)
     return  slice_record
  
-def delete_slice(cleint, slice):
+def DeleteSliver(client, slice):
     authority = get_authority(client.hrn)
     auth_cred = client.get_credential(authority, 'authority')
     if slice:
@@ -318,4 +317,4 @@ if __name__ == '__main__':
     unittest.TextTestRunner(verbosity=2).run(suite)
 
     # remove teset slice
-    delete_slice(client, test_slice)
+    DeleteSliver(client, test_slice)