X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2FtestInterfaces.py;h=2b358012efa2bddc9bb4c71ef036bfc35ada43cc;hb=8514b860f6d73d8df0ec6228637fee02ddbf6090;hp=2e8132739f5570ead8c7a5fe03605fed3d1fdecc;hpb=6552bb8c87d8886f5ab573908865ecf95ff081e7;p=sfa.git diff --git a/tests/testInterfaces.py b/tests/testInterfaces.py index 2e813273..2b358012 100755 --- a/tests/testInterfaces.py +++ b/tests/testInterfaces.py @@ -8,7 +8,7 @@ import sfa.util.xmlrpcprotocol as xmlrpc from unittest import TestCase from optparse import OptionParser from sfa.util.xmlrpcprotocol import ServerException -from sfa.util.namespace import * +from sfa.util.xrn import get_authority from sfa.util.config import * from sfa.trust.certificate import * from sfa.trust.credential import * @@ -225,27 +225,27 @@ class SlicemgrTest(AggregateTest): class ComponentTest(BasicTestCase): def setUp(self): BasicTestCase.setUp(self) + self.slice_cred = self.client.get_credential(self.slice['hrn'], 'slice') def testStartSlice(self): - self.cm.start_slice(self.slice['hrn']) + self.cm.start_slice(self.slice_cred, self.slice['hrn']) def testStopSlice(self): - self.cm.stop_slice(self.slice['hrn']) + self.cm.stop_slice(self.slice_cred, self.slice['hrn']) def testDeleteSlice(self): - self.cm.delete_slice(self.slice['hrn']) + self.cm.delete_slice(self.slice_cred, self.slice['hrn']) def testRestartSlice(self): - self.cm.restart_slice(self.slice['hrn']) + self.cm.restart_slice(self.slice_cred, self.slice['hrn']) def testGetSlices(self): - self.cm.get_slices(self.slice['hrn']) + self.cm.get_slices(self.slice_cred, self.slice['hrn']) def testRedeemTicket(self): - slice_credential = self.client.get_credential(self.slice['hrn'], 'slice') rspec = self.aggregate.get_resources(self.credential) - ticket = self.aggregate.get_ticket(slice_credential, self.slice['hrn'], rspec) - self.cm.redeem_ticket(slice_credential, ticket) + ticket = self.aggregate.get_ticket(slice_cred, self.slice['hrn'], rspec) + self.cm.redeem_ticket(slice_cred, ticket) def test_names(testcase):