from sfa.trust.credential import Credential
from sfa.util.geniclient import GeniClient
from sfa.util.record import *
-from sfa.util.rspec import Rspec
+from sfa.util.rspec import RSpec
from sfa.util.xmlrpcprotocol import ServerException
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
from sfa.util.config import Config
class Sfi:
user = None
authority = None
options = None
-
+ hashrequest = False
+
+ def create_cmd_parser(self,command, additional_cmdargs = None):
+ cmdargs = {"gid": "",
+ "list": "name",
+ "show": "name",
+ "remove": "name",
+ "add": "record",
+ "update": "record",
+ "aggregates": "[name]",
+ "registries": "[name]",
+ "slices": "",
+ "resources": "[name]",
+ "create": "name rspec",
+ "delete": "name",
+ "reset": "name",
+ "start": "name",
+ "stop": "name",
+ "delegate": "name"
+ }
+
+ if additional_cmdargs:
+ cmdargs.update(additional_cmdargs)
+
+ if command not in cmdargs:
+ print "Invalid command\n"
+ print "Commands: ",
+ for key in cmdargs.keys():
+ print key+",",
+ print ""
+ sys.exit(2)
+
+ parser = OptionParser(usage="sfi [sfi_options] %s [options] %s" \
+ % (command, cmdargs[command]))
+
+ if command in ("resources"):
+ parser.add_option("-f", "--format", dest="format",type="choice",
+ help="display format ([xml]|dns|ip)",default="xml",
+ choices=("xml","dns","ip"))
+ parser.add_option("-a", "--aggregate", dest="aggregate",
+ default=None, help="aggregate hrn")
+
+ if command in ("create"):
+ parser.add_option("-a", "--aggregate", dest="aggregate",default=None,
+ help="aggregate hrn")
+
+ if command in ("list", "show", "remove"):
+ parser.add_option("-t", "--type", dest="type",type="choice",
+ help="type filter ([all]|user|slice|sa|ma|node|aggregate)",
+ choices=("all","user","slice","sa","ma","node","aggregate"),
+ default="all")
+
+ if command in ("resources", "show", "list"):
+ parser.add_option("-o", "--output", dest="file",
+ help="output XML to file", metavar="FILE", default=None)
+
+ if command in ("show", "list"):
+ parser.add_option("-f", "--format", dest="format", type="choice",
+ help="display format ([text]|xml)",default="text",
+ choices=("text","xml"))
+
+ if command in ("delegate"):
+ parser.add_option("-u", "--user",
+ action="store_true", dest="delegate_user", default=False,
+ help="delegate user credential")
+ parser.add_option("-s", "--slice", dest="delegate_slice",
+ help="delegate slice credential", metavar="HRN", default=None)
+ return parser
+
+
+ def create_parser(self):
+
+ # Generate command line parser
+ parser = OptionParser(usage="sfi [options] command [command_options] [command_args]",
+ description="Commands: gid,list,show,remove,add,update,nodes,slices,resources,create,delete,start,stop,reset")
+ parser.add_option("-r", "--registry", dest="registry",
+ help="root registry", metavar="URL", default=None)
+ parser.add_option("-s", "--slicemgr", dest="sm",
+ help="slice manager", metavar="URL", default=None)
+ default_sfi_dir=os.path.expanduser("~/.sfi/")
+ parser.add_option("-d", "--dir", dest="sfi_dir",
+ help="config & working directory - default is " + default_sfi_dir,
+ metavar="PATH", default = default_sfi_dir)
+ parser.add_option("-u", "--user", dest="user",
+ help="user name", metavar="HRN", default=None)
+ parser.add_option("-a", "--auth", dest="auth",
+ help="authority name", metavar="HRN", default=None)
+ parser.add_option("-v", "--verbose",
+ action="store_true", dest="verbose", default=False,
+ help="verbose mode")
+ parser.add_option("-p", "--protocol",
+ dest="protocol", default="xmlrpc",
+ help="RPC protocol (xmlrpc or soap)")
+ parser.add_option("-k", "--hashrequest",
+ action="store_true", dest="hashrequest", default=False,
+ help="Create a hash of the request that will be authenticated on the server")
+ parser.disable_interspersed_args()
+
+ return parser
+
+
#
# Establish Connection to SliceMgr and Registry Servers
#
return gid
else:
cert_str = self.cert.save_to_string(save_parents=True)
- request_hash = self.key.compute_hash([cert_str, self.user, "user"])
+ request_hash=None
+ if self.hashrequest:
+ request_hash = self.key.compute_hash([cert_str, self.user, "user"])
gid_str = self.registry.get_gid(cert_str, self.user, "user", request_hash)
gid = GID(string=gid_str)
if self.options.verbose:
return gid
def get_user_cred(self):
- file = os.path.join(self.options.sfi_dir, self.get_leaf(self.user) + ".cred")
- if (os.path.isfile(file)):
- user_cred = Credential(filename=file)
- return user_cred
- else:
- # bootstrap user credential
- request_hash = self.key.compute_hash([None, "user", self.user])
- user_cred = self.registry.get_credential(None, "user", self.user, request_hash)
- if user_cred:
- cred = Credential(string=user_cred)
- cred.save_to_file(file, save_parents=True)
- if self.options.verbose:
- print "Writing user credential to", file
- return cred
- else:
- print "Failed to get user credential"
- sys.exit(-1)
+ file = os.path.join(self.options.sfi_dir, self.get_leaf(self.user) + ".cred")
+ if (os.path.isfile(file)):
+ user_cred = Credential(filename=file)
+ return user_cred
+ else:
+ # bootstrap user credential
+ cert_string = self.cert.save_to_string(save_parents=True)
+ request_hash=None
+ if self.hashrequest:
+ request_hash = self.key.compute_hash([cert_string, "user", self.user])
+ user_cred = self.registry.get_self_credential(cert_string, "user", self.user, request_hash)
+ if user_cred:
+ cred = Credential(string=user_cred)
+ cred.save_to_file(file, save_parents=True)
+ if self.options.verbose:
+ print "Writing user credential to", file
+ return cred
+ else:
+ print "Failed to get user credential"
+ sys.exit(-1)
def get_auth_cred(self):
+ if not self.authority:
+ print "no authority specified. Use -a or set SF_AUTH"
+ sys.exit(-1)
- if not self.authority:
- print "no authority specified. Use -a or set SF_AUTH"
- sys.exit(-1)
-
- file = os.path.join(self.options.sfi_dir, self.get_leaf("authority") +".cred")
- if (os.path.isfile(file)):
- auth_cred = Credential(filename=file)
- return auth_cred
- else:
- # bootstrap authority credential from user credential
- user_cred = self.get_user_cred().save_to_string(save_parents=True)
- request_hash = self.key.compute_hash([user_cred, "authority", self.authority])
- auth_cred = self.registry.get_credential(user_cred, "authority", self.authority, request_hash)
- if auth_cred:
- cred = Credential(string=auth_cred)
- cred.save_to_file(file, save_parents=True)
- if self.options.verbose:
- print "Writing authority credential to", file
- return cred
- else:
- print "Failed to get authority credential"
- sys.exit(-1)
+ file = os.path.join(self.options.sfi_dir, self.get_leaf("authority") +".cred")
+ if (os.path.isfile(file)):
+ auth_cred = Credential(filename=file)
+ return auth_cred
+ else:
+ # bootstrap authority credential from user credential
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ request_hash = None
+ if self.hashrequest:
+ request_hash = self.key.compute_hash([user_cred, "authority", self.authority])
+ auth_cred = self.registry.get_credential(user_cred, "authority", self.authority, request_hash)
+ if auth_cred:
+ cred = Credential(string=auth_cred)
+ cred.save_to_file(file, save_parents=True)
+ if self.options.verbose:
+ print "Writing authority credential to", file
+ return cred
+ else:
+ print "Failed to get authority credential"
+ sys.exit(-1)
def get_slice_cred(self,name):
- file = os.path.join(self.options.sfi_dir, "slice_" + self.get_leaf(name) + ".cred")
- if (os.path.isfile(file)):
- slice_cred = Credential(filename=file)
- return slice_cred
- else:
- # bootstrap slice credential from user credential
- user_cred = self.get_user_cred()
- slice_cred = self.registry.get_credential(user_cred, "slice", name)
- if slice_cred:
- slice_cred.save_to_file(file, save_parents=True)
- if self.options.verbose:
- print "Writing slice credential to", file
- return slice_cred
- else:
- print "Failed to get slice credential"
- sys.exit(-1)
+ file = os.path.join(self.options.sfi_dir, "slice_" + self.get_leaf(name) + ".cred")
+ if (os.path.isfile(file)):
+ slice_cred = Credential(filename=file)
+ return slice_cred
+ else:
+ # bootstrap slice credential from user credential
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ arg_list = [user_cred, "slice", name]
+ request_hash=None
+ if self.hashrequest:
+ request_hash = self.key.compute_hash(arg_list)
+ slice_cred_str = self.registry.get_credential(user_cred, "slice", name, request_hash)
+ if slice_cred_str:
+ slice_cred = Credential(string=slice_cred_str)
+ slice_cred.save_to_file(file, save_parents=True)
+ if self.options.verbose:
+ print "Writing slice credential to", file
+ return slice_cred
+ else:
+ print "Failed to get slice credential"
+ sys.exit(-1)
def delegate_cred(self,cred, hrn, type = 'authority'):
# the gid and hrn of the object we are delegating
os.remove(outfn)
return key_string
- #
- # Generate sub-command parser
- #
- def create_cmd_parser(self,command, additional_cmdargs = None):
- cmdargs = {"gid": "",
- "list": "name",
- "show": "name",
- "remove": "name",
- "add": "record",
- "update": "record",
- "aggregates": "[name]",
- "registries": "[name]",
- "slices": "",
- "resources": "[name]",
- "create": "name rspec",
- "delete": "name",
- "reset": "name",
- "start": "name",
- "stop": "name",
- "delegate": "name"
- }
-
- if additional_cmdargs:
- cmdargs.update(additional_cmdargs)
-
- if command not in cmdargs:
- print "Invalid command\n"
- print "Commands: ",
- for key in cmdargs.keys():
- print key+",",
- print ""
- sys.exit(2)
-
- parser = OptionParser(usage="sfi [sfi_options] %s [options] %s" \
- % (command, cmdargs[command]))
-
- if command in ("resources"):
- parser.add_option("-f", "--format", dest="format",type="choice",
- help="display format ([xml]|dns|ip)",default="xml",
- choices=("xml","dns","ip"))
- parser.add_option("-a", "--aggregate", dest="aggregate",
- default=None, help="aggregate hrn")
-
- if command in ("create"):
- parser.add_option("-a", "--aggregate", dest="aggregate",default=None,
- help="aggregate hrn")
-
- if command in ("list", "show", "remove"):
- parser.add_option("-t", "--type", dest="type",type="choice",
- help="type filter ([all]|user|slice|sa|ma|node|aggregate)",
- choices=("all","user","slice","sa","ma","node","aggregate"),
- default="all")
-
- if command in ("resources", "show", "list"):
- parser.add_option("-o", "--output", dest="file",
- help="output XML to file", metavar="FILE", default=None)
-
- if command in ("show", "list"):
- parser.add_option("-f", "--format", dest="format", type="choice",
- help="display format ([text]|xml)",default="text",
- choices=("text","xml"))
-
- if command in ("delegate"):
- parser.add_option("-u", "--user",
- action="store_true", dest="delegate_user", default=False,
- help="delegate user credential")
- parser.add_option("-s", "--slice", dest="delegate_slice",
- help="delegate slice credential", metavar="HRN", default=None)
- return parser
-
- def create_parser(self):
-
- # Generate command line parser
- parser = OptionParser(usage="sfi [options] command [command_options] [command_args]",
- description="Commands: gid,list,show,remove,add,update,nodes,slices,resources,create,delete,start,stop,reset")
- parser.add_option("-r", "--registry", dest="registry",
- help="root registry", metavar="URL", default=None)
- parser.add_option("-s", "--slicemgr", dest="sm",
- help="slice manager", metavar="URL", default=None)
- default_sfi_dir=os.path.expanduser("~/.sfi/")
- parser.add_option("-d", "--dir", dest="sfi_dir",
- help="config & working directory - default is " + default_sfi_dir,
- metavar="PATH", default = default_sfi_dir)
- parser.add_option("-u", "--user", dest="user",
- help="user name", metavar="HRN", default=None)
- parser.add_option("-a", "--auth", dest="auth",
- help="authority name", metavar="HRN", default=None)
- parser.add_option("-v", "--verbose",
- action="store_true", dest="verbose", default=False,
- help="verbose mode")
- parser.add_option("-p", "--protocol",
- dest="protocol", default="xmlrpc",
- help="RPC protocol (xmlrpc or soap)")
- parser.disable_interspersed_args()
-
- return parser
-
- def dispatch(self,command, cmd_opts, cmd_args):
- getattr(self,command)(cmd_opts, cmd_args)
#
# Following functions implement the commands
#
# Registry-related commands
#
-
+
+ def dispatch(self,command, cmd_opts, cmd_args):
+ getattr(self,command)(cmd_opts, cmd_args)
+
def gid(self, opts, args):
- gid = self.get_gid()
- print "GID: %s" % (gid.save_to_string(save_parents=True))
- return
+ gid = self.get_gid()
+ print "GID: %s" % (gid.save_to_string(save_parents=True))
+ return
# list entires in named authority registry
def list(self,opts, args):
- user_cred = self.get_user_cred().save_to_string(save_parents=True)
- hrn = args[0]
- request_hash = self.key.compute_hash([user_cred, hrn])
- try:
- list = self.registry.list(user_cred, hrn, request_hash)
- except IndexError:
- raise Exception, "Not enough parameters for the 'list' command"
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ hrn = args[0]
+ request_hash=None
+ if self.hashrequest:
+ request_hash = self.key.compute_hash([user_cred, hrn])
+ try:
+ list = self.registry.list(user_cred, hrn, request_hash)
+ except IndexError:
+ raise Exception, "Not enough parameters for the 'list' command"
- # filter on person, slice, site, node, etc.
- # THis really should be in the self.filter_records funct def comment...
- list = self.filter_records(opts.type, list)
- for record in list:
- print "%s (%s)" % (record['hrn'], record['type'])
- if opts.file:
- self.save_records_to_file(opts.file, list)
- return
+ # filter on person, slice, site, node, etc.
+ # THis really should be in the self.filter_records funct def comment...
+ list = self.filter_records(opts.type, list)
+ for record in list:
+ print "%s (%s)" % (record['hrn'], record['type'])
+ if opts.file:
+ self.save_records_to_file(opts.file, list)
+ return
# show named registry record
def show(self,opts, args):
- user_cred = self.get_user_cred().save_to_string(save_parents=True)
- hrn = args[0]
- request_hash = self.key.compute_hash([user_cred, hrn])
- records = self.registry.resolve(user_cred, hrn, request_hash)
- records = self.filter_records(opts.type, records)
- if not records:
- print "No record of type", opts.type
- for record in records:
- if record['type'] in ['user']:
- record = UserRecord(dict = record)
- elif record['type'] in ['slice']:
- record = SliceRecord(dict = record)
- elif record['type'] in ['node']:
- record = NodeRecord(dict = record)
- elif record['type'] in ['authority', 'ma', 'sa']:
- record = AuthorityRecord(dict = record)
- else:
- record = GeniRecord(dict = record)
- if (opts.format=="text"):
- record.dump()
- else:
- print record.save_to_string()
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ hrn = args[0]
+ request_hash=None
+ if self.hashrequest:
+ request_hash = self.key.compute_hash([user_cred, hrn])
+ records = self.registry.resolve(user_cred, hrn, request_hash)
+ records = self.filter_records(opts.type, records)
+ if not records:
+ print "No record of type", opts.type
+ for record in records:
+ if record['type'] in ['user']:
+ record = UserRecord(dict = record)
+ elif record['type'] in ['slice']:
+ record = SliceRecord(dict = record)
+ elif record['type'] in ['node']:
+ record = NodeRecord(dict = record)
+ elif record['type'] in ['authority', 'ma', 'sa']:
+ record = AuthorityRecord(dict = record)
+ else:
+ record = GeniRecord(dict = record)
+ if (opts.format=="text"):
+ record.dump()
+ else:
+ print record.save_to_string()
- if opts.file:
- self.save_records_to_file(opts.file, records)
- return
+ if opts.file:
+ self.save_records_to_file(opts.file, records)
+ return
def delegate(self,opts, args):
user_cred = self.get_user_cred()
# removed named registry record
# - have to first retrieve the record to be removed
def remove(self,opts, args):
- auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
- hrn = args[0]
- type = opts.type
- if type in ['all']:
- type = '*'
- arg_list = [auth_cred, type, hrn]
- request_hash = self.key.compute_hash(arg_list)
- return self.registry.remove(auth_cred, type, hrn, request_hash)
+ auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
+ hrn = args[0]
+ type = opts.type
+ if type in ['all']:
+ type = '*'
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [auth_cred, type, hrn]
+ request_hash = self.key.compute_hash(arg_list)
+ return self.registry.remove(auth_cred, type, hrn, request_hash)
# add named registry record
def add(self,opts, args):
- auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
- record_filepath = args[0]
- rec_file = self.get_record_file(record_filepath)
- record = self.load_record_from_file(rec_file).as_dict()
- arg_list = [auth_cred]
- request_hash = self.key.compute_hash(arg_list)
- return self.registry.register(auth_cred, record, request_hash)
+ auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
+ record_filepath = args[0]
+ rec_file = self.get_record_file(record_filepath)
+ record = self.load_record_from_file(rec_file).as_dict()
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [auth_cred]
+ request_hash = self.key.compute_hash(arg_list)
+ return self.registry.register(auth_cred, record, request_hash)
# update named registry entry
def update(self,opts, args):
- user_cred = self.get_user_cred()
- rec_file = self.get_record_file(args[0])
- record = self.load_record_from_file(rec_file)
- if record['type'] == "user":
- if record.get_name() == user_cred.get_gid_object().get_hrn():
- cred = user_cred.save_to_string(save_parents=True)
- else:
- cred = self.get_auth_cred().save_to_string(save_parents=True)
- elif record['type'] in ["slice"]:
- try:
- cred = self.get_slice_cred(record.get_name()).save_to_string(save_parents=True)
- except ServerException, e:
+ user_cred = self.get_user_cred()
+ rec_file = self.get_record_file(args[0])
+ record = self.load_record_from_file(rec_file)
+ if record['type'] == "user":
+ if record.get_name() == user_cred.get_gid_object().get_hrn():
+ cred = user_cred.save_to_string(save_parents=True)
+ else:
+ cred = self.get_auth_cred().save_to_string(save_parents=True)
+ elif record['type'] in ["slice"]:
+ try:
+ cred = self.get_slice_cred(record.get_name()).save_to_string(save_parents=True)
+ except ServerException, e:
# XXX smbaker -- once we have better error return codes, update this
# to do something better than a string compare
if "Permission error" in e.args[0]:
cred = self.get_auth_cred().save_to_string(save_parents=True)
else:
raise
- elif record.get_type() in ["authority"]:
- cred = self.get_auth_cred().save_to_string(save_parents=True)
- elif record.get_type() == 'node':
- cred = self.get_auth_cred().save_to_string(save_parents=True)
- else:
- raise "unknown record type" + record.get_type()
- record = record.as_dict()
- arg_list = [cred]
- request_hash = self.key.compute_hash(arg_list)
- return self.registry.update(cred, record, request_hash)
+ elif record.get_type() in ["authority"]:
+ cred = self.get_auth_cred().save_to_string(save_parents=True)
+ elif record.get_type() == 'node':
+ cred = self.get_auth_cred().save_to_string(save_parents=True)
+ else:
+ raise "unknown record type" + record.get_type()
+ record = record.as_dict()
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [cred]
+ request_hash = self.key.compute_hash(arg_list)
+ return self.registry.update(cred, record, request_hash)
def aggregates(self, opts, args):
hrn = None
if args:
hrn = args[0]
- arg_list = [user_cred, hrn]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [user_cred, hrn]
+ request_hash = self.key.compute_hash(arg_list)
result = self.registry.get_aggregates(user_cred, hrn, request_hash)
self.display_list(result)
return
hrn = None
if args:
hrn = args[0]
- arg_list = [user_cred, hrn]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [user_cred, hrn]
+ request_hash = self.key.compute_hash(arg_list)
result = self.registry.get_registries(user_cred, hrn, request_hash)
self.display_list(result)
return
# list instantiated slices
def slices(self,opts, args):
user_cred = self.get_user_cred().save_to_string(save_parents=True)
- arg_list = [user_cred]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [user_cred]
+ request_hash = self.key.compute_hash(arg_list)
results = self.slicemgr.get_slices(user_cred, request_hash)
self.display_list(results)
return
cred = user_cred
hrn = None
- arg_list = [cred, hrn]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [cred, hrn]
+ request_hash = self.key.compute_hash(arg_list)
result = server.get_resources(cred, hrn, request_hash)
format = opts.format
# created named slice with given rspec
def create(self,opts, args):
- slice_hrn = args[0]
- user_cred = self.get_user_cred()
- slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
- rspec_file = self.get_rspec_file(args[1])
- rspec=open(rspec_file).read()
- server = self.slicemgr
- if opts.aggregate:
- aggregates = self.registry.get_aggregates(user_cred, opts.aggregate)
- if not aggregates:
- 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)
- arg_list = [slice_cred, slice_hrn, rspec]
- request_hash = self.key.compute_hash(arg_list)
- return server.create_slice(slice_cred, slice_hrn, rspec, request_hash)
+ slice_hrn = args[0]
+ user_cred = self.get_user_cred()
+ slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
+ rspec_file = self.get_rspec_file(args[1])
+ rspec=open(rspec_file).read()
+ server = self.slicemgr
+ if opts.aggregate:
+ aggregates = self.registry.get_aggregates(user_cred, opts.aggregate)
+ if not aggregates:
+ 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)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [slice_cred, slice_hrn, rspec]
+ request_hash = self.key.compute_hash(arg_list)
+ return server.create_slice(slice_cred, slice_hrn, rspec, request_hash)
# delete named slice
def delete(self,opts, args):
slice_hrn = args[0]
slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
- arg_list = [slice_cred, slice_hrn]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [slice_cred, slice_hrn]
+ request_hash = self.key.compute_hash(arg_list)
return self.slicemgr.delete_slice(slice_cred, slice_hrn, request_hash)
# start named slice
def start(self,opts, args):
slice_hrn = args[0]
slice_cred = self.get_slice_cred(args[0])
- arg_list = [slice_cred, slice_hrn]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [slice_cred, slice_hrn]
+ request_hash = self.key.compute_hash(arg_list)
return self.slicemgr.start_slice(slice_cred, slice_hrn, request_hash)
# stop named slice
def stop(self,opts, args):
slice_hrn = args[0]
slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
- arg_list = [slice_cred, slice_hrn]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [slice_cred, slice_hrn]
+ request_hash = self.key.compute_hash(arg_list)
return self.slicemgr.stop_slice(slice_cred, slice_hrn, request_hash)
# reset named slice
def reset(self,opts, args):
slice_hrn = args[0]
slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
- arg_list = [slice_cred, slice_hrn]
- request_hash = self.key.compute_hash(arg_list)
+ request_hash=None
+ if self.hashrequest:
+ arg_list = [slice_cred, slice_hrn]
+ request_hash = self.key.compute_hash(arg_list)
return self.slicemgr.reset_slice(slice_cred, slice_hrn, request_hash)
#
def display_rspec(self,rspec, format = 'rspec'):
if format in ['dns']:
- spec = Rspec()
+ spec = RSpec()
spec.parseString(rspec)
hostnames = []
nodespecs = spec.getDictsByTagName('NodeSpec')
hostnames.append(nodespec['name'])
result = hostnames
elif format in ['ip']:
- spec = Rspec()
+ spec = RSpec()
spec.parseString(rspec)
ips = []
ifspecs = spec.getDictsByTagName('IfSpec')
# Main: parse arguments and dispatch to command
#
def main(self):
- parser = self.create_parser()
- (options, args) = parser.parse_args()
- self.options = options
-
- if len(args) <= 0:
+ parser = self.create_parser()
+ (options, args) = parser.parse_args()
+ self.options = options
+
+ if options.hashrequest:
+ self.hashrequest=True
+
+ if len(args) <= 0:
print "No command given. Use -h for help."
return -1
- command = args[0]
- (cmd_opts, cmd_args) = self.create_cmd_parser(command).parse_args(args[1:])
- if self.options.verbose :
- print "Registry %s, sm %s, dir %s, user %s, auth %s" % (options.registry,
- options.sm,
- options.sfi_dir,
- options.user,
+ command = args[0]
+ (cmd_opts, cmd_args) = self.create_cmd_parser(command).parse_args(args[1:])
+ if self.options.verbose :
+ print "Registry %s, sm %s, dir %s, user %s, auth %s" % (options.registry, options.sm,
+ options.sfi_dir, options.user,
options.auth)
- print "Command %s" %command
- if command in ("resources"):
- print "resources cmd_opts %s" %cmd_opts.format
- elif command in ("list","show","remove"):
- print "cmd_opts.type %s" %cmd_opts.type
- print "cmd_args %s" %cmd_args
-
- self.set_servers()
+ print "Command %s" %command
+ if command in ("resources"):
+ print "resources cmd_opts %s" %cmd_opts.format
+ elif command in ("list","show","remove"):
+ print "cmd_opts.type %s" %cmd_opts.type
+ print "cmd_args %s" %cmd_args
+
+ self.set_servers()
+
+ try:
+ self.dispatch(command, cmd_opts, cmd_args)
+ except KeyError:
+ raise
+ print "Command not found:", command
+ sys.exit(1)
- try:
- self.dispatch(command, cmd_opts, cmd_args)
- except KeyError:
- raise
- print "Command not found:", command
- sys.exit(1)
-
- return
+ return
if __name__=="__main__":
Sfi().main()
git://git.onelab.eu / sfa.git / blobdiff