X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=aa13830e04e7e1654fa5504688094033262dcd99;hb=53cfd89c9fa5735ffd22b265d18e0dcf1d2cf106;hp=f29a2960b792c6dcee0a5b47d68d35682ed93090;hpb=b081e7e6532a567ec8653091bccd1c1b028b5d2d;p=sfa.git diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index f29a2960..aa13830e 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -11,11 +11,11 @@ from optparse import OptionParser from sfa.trust.certificate import Keypair, Certificate from sfa.trust.credential import Credential -from sfa.trust.gid import create_uuid -from sfa.util.newgeniclient import GeniClient +from sfa.util.geniclient import GeniClient from sfa.util.record import * from sfa.util.rspec import Rspec +from sfa.util.xmlrpcprotocol import ServerException # xxx todo xxx auto-load ~/.sfi/sfi_config @@ -589,8 +589,7 @@ def create(opts, args): slice_hrn = args[0] slice_cred = get_slice_cred(slice_hrn) rspec_file = get_rspec_file(args[1]) - with open(rspec_file) as f: - rspec = f.read() + rspec=open(rspec_file).read() return slicemgr.create_slice(slice_cred, slice_hrn, rspec) # delete named slice