git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tentatively package unittests in rpm sfa-tests, for the nightlies
[sfa.git]
/
tests
/
testInterfaces.py
diff --git
a/tests/testInterfaces.py
b/tests/testInterfaces.py
index
2e81327
..
2b35801
100755
(executable)
--- 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 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 *
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)
class ComponentTest(BasicTestCase):
def setUp(self):
BasicTestCase.setUp(self)
+ self.slice_cred = self.client.get_credential(self.slice['hrn'], 'slice')
def testStartSlice(self):
def testStartSlice(self):
- self.cm.start_slice(self.slice['hrn'])
+ self.cm.start_slice(self.slice
_cred, self.slice
['hrn'])
def testStopSlice(self):
def testStopSlice(self):
- self.cm.stop_slice(self.slice['hrn'])
+ self.cm.stop_slice(self.slice
_cred, self.slice
['hrn'])
def testDeleteSlice(self):
def testDeleteSlice(self):
- self.cm.delete_slice(self.slice['hrn'])
+ self.cm.delete_slice(self.slice
_cred, self.slice
['hrn'])
def testRestartSlice(self):
def testRestartSlice(self):
- self.cm.restart_slice(self.slice['hrn'])
+ self.cm.restart_slice(self.slice
_cred, self.slice
['hrn'])
def testGetSlices(self):
def testGetSlices(self):
- self.cm.get_slices(self.slice['hrn'])
+ self.cm.get_slices(self.slice
_cred, self.slice
['hrn'])
def testRedeemTicket(self):
def testRedeemTicket(self):
- slice_credential = self.client.get_credential(self.slice['hrn'], 'slice')
rspec = self.aggregate.get_resources(self.credential)
rspec = self.aggregate.get_resources(self.credential)
- ticket = self.aggregate.get_ticket(slice_cred
ential
, self.slice['hrn'], rspec)
- self.cm.redeem_ticket(slice_cred
ential
, ticket)
+ ticket = self.aggregate.get_ticket(slice_cred, self.slice['hrn'], rspec)
+ self.cm.redeem_ticket(slice_cred, ticket)
def test_names(testcase):
def test_names(testcase):