X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2FtestInterfaces.py;h=4d49d089278ef0c099d9f34c8e6a845d080e980f;hb=5f4f788db1dd59e8a5968e9118ff1feda89389dc;hp=d0e725382dfcf4ef9e26088a4f772a078860774d;hpb=4ff67c801ceeb1d0c7ca2863c2b7bf8152182b8f;p=sfa.git diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py index d0e72538..4d49d089 100755 --- a/tests/testInterfaces.py +++ b/tests/testInterfaces.py @@ -184,7 +184,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 +203,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 +234,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 +260,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 +318,4 @@ if __name__ == '__main__': unittest.TextTestRunner(verbosity=2).run(suite) # remove teset slice - delete_slice(client, test_slice) + DeleteSliver(client, test_slice)