From: Tony Mack Date: Tue, 5 Jan 2010 16:21:36 +0000 (+0000) Subject: Removing GeniClient X-Git-Tag: sfa-0.9-8~7 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=7c1cf48e3a60344e3c381d1edac89d81659655f3;p=sfa.git Removing GeniClient --- diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 80131c20..688dd2ca 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -303,8 +303,6 @@ class Sfi: self.cert_file = cert_file self.cert = Certificate(filename=cert_file) # Establish connection to server(s) - #self.slicemgr = GeniClient(sm_url, key_file, cert_file, self.options.protocol) - #self.registry = GeniClient(reg_url, key_file, cert_file, self.options.protocol) self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file) self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file) return @@ -785,7 +783,7 @@ class Sfi: raise Exception, "No such aggregate %s" % opts.aggregate aggregate = aggregates[0] url = "http://%s:%s" % (aggregate['addr'], aggregate['port']) - server = GeniClient(url, self.key_file, self.cert_file, self.options.protocol) + server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file, self.options.protocol) return server.create_slice(slice_cred, slice_hrn, rspec) # get a ticket for the specified slice @@ -802,7 +800,7 @@ class Sfi: raise Exception, "No such aggregate %s" % opts.aggregate aggregate = aggregates[0] url = "http://%s:%s" % (aggregate['addr'], aggregate['port']) - server = GeniClient(url, self.key_file, self.cert_file, self.options.protocol) + server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file, self.options.protocol) ticket_string = server.get_ticket(slice_cred, slice_hrn, rspec) file = os.path.join(self.options.sfi_dir, get_leaf(slice_hrn) + ".ticket") print "writing ticket to ", file