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
Merge branch 'master' into exp2
[sfa.git]
/
tests
/
testInterfaces.py
diff --git
a/tests/testInterfaces.py
b/tests/testInterfaces.py
index
d0e7253
..
4d49d08
100755
(executable)
--- a/
tests/testInterfaces.py
+++ b/
tests/testInterfaces.py
@@
-184,7
+184,7
@@
class AggregateTest(BasicTestCase):
BasicTestCase.setUp(self)
def testGetSlices(self):
BasicTestCase.setUp(self)
def testGetSlices(self):
- self.aggregate.
get_s
lices(self.credential)
+ self.aggregate.
ListS
lices(self.credential)
def testGetResources(self):
# available resources
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')
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')
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.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):
def testRestartSlice(self):
self.cm.restart_slice(self.slice_cred, self.slice['hrn'])
def testGetSlices(self):
- self.cm.
get_s
lices(self.slice_cred, self.slice['hrn'])
+ self.cm.
ListS
lices(self.slice_cred, self.slice['hrn'])
def testRedeemTicket(self):
rspec = self.aggregate.get_resources(self.credential)
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
client.registry.register(auth_cred, slice_record)
return slice_record
-def
delete_slice(clei
nt, slice):
+def
DeleteSliver(clie
nt, slice):
authority = get_authority(client.hrn)
auth_cred = client.get_credential(authority, 'authority')
if 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
unittest.TextTestRunner(verbosity=2).run(suite)
# remove teset slice
-
delete_slice
(client, test_slice)
+
DeleteSliver
(client, test_slice)