X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fclient%2FtestAggregate.py;h=d78352bef1958c4e536905913e96a5e9205e65df;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=ef917517dfa3905e7db819dbdd5f42581a1cc991;hpb=fbe847fbea237fc77f95fffb3766bc85b953841a;p=sfa.git

diff --git a/tests/client/testAggregate.py b/tests/client/testAggregate.py
index ef917517..d78352be 100644
--- a/tests/client/testAggregate.py
+++ b/tests/client/testAggregate.py
@@ -1,10 +1,11 @@
-from geni.util.geniclient import *
-from geni.trust.credential import *
 from pprint import pprint
 
+from sfa.util.client import *
+from sfa.trust.credential import *
+
 cred = Credential(filename = 'tmack.pl.sa.cred')
 slicehrn = 'planetlab.us.pl.tmack'
-print cred.get_privileges().save_to_string()
+print(cred.get_privileges().save_to_string())
 
 r = GeniClient('https://128.112.139.120:12345', 'tmack.pkey', 'tmack.cert') 
 a = GeniClient('https://128.112.139.120:12346', 'tmack.pkey', 'tmack.cert')
@@ -12,20 +13,20 @@ a = GeniClient('https://128.112.139.120:12346', 'tmack.pkey', 'tmack.cert')
 #pprint(r.list(cred, 'planetlab.us.princeton'))
 pprint(a.get_policy(cred))
 
-print "components at this aggregate"
+print("components at this aggregate")
 components = a.list_components()
 pprint(components)
 
-print "resources being used by %(slicehrn)s" % locals()
+print("resources being used by %(slicehrn)s" % locals())
 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()
+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)