Merge branch 'upstreammaster' into senslab2

[sfa.git] / tests / client / testAggregate.py

diff --git a/tests/client/testAggregate.py b/tests/client/testAggregate.py
index e2bf7ef..b276984 100644 (file)
--- a/tests/client/testAggregate.py
+++ b/tests/client/testAggregate.py
@@ -1,6 +1,6 @@
 from pprint import pprint
 
-from sfa.util.geniclient import *
+from sfa.util.client import *
 from sfa.trust.credential import *
 
 cred = Credential(filename = 'tmack.pl.sa.cred')
@@ -22,11 +22,11 @@ tmack_components = a.list_resources(cred, slicehrn)
 pprint(tmack_components)
 
 #print "removing %(slicehrn)s from all nodes" % locals()
-#a.delete_slice(cred, slicehrn)
+#a.DeleteSliver(cred, slicehrn)
 
 print "adding %(slicehrn)s back to its original nodes" % locals()
 a.list_resources(cred, slicehrn)
-a.create_slice(cred, slicehrn, components)
+a.CreateSliver(cred, slicehrn, components)
 a.list_resources(cred, slicehrn)