from sfa.util.sfaticket import SfaTicket
from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
from sfa.util.xrn import Xrn, get_leaf, get_authority, hrn_to_urn
-from sfa.util.xmlrpcprotocol import ServerException
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
from sfa.util.config import Config
+from sfa.util.version import version_core
AGGREGATE_PORT=12346
CM_PORT=12346
return record
+import uuid
+def unique_call_id(): return uuid.uuid4().urn
class Sfi:
+
+ required_options=['verbose', 'debug', 'registry', 'sm', 'auth', 'user']
+
+ # dummy to meet Sfi's expectations for its 'options' field
+ # i.e. s/t we can do setattr on
+ class DummyOptions:
+ pass
- def __init__ (self):
+ def __init__ (self,options=None):
+ if options is None: options=Sfi.DummyOptions()
+ for opt in Sfi.required_options:
+ if not hasattr(options,opt): setattr(options,opt,None)
+ if not hasattr(options,'sfi_dir'): options.sfi_dir=os.path.expanduser("~/.sfi/")
+ self.options = options
self.slicemgr = None
self.registry = None
self.user = None
self.authority = None
- self.options = None
self.hashrequest = False
sfa_logger_goes_to_console()
self.logger=sfa_logger()
parser.add_option("-s", "--slice", dest="delegate_slice",
help="delegate slice credential", metavar="HRN", default=None)
+ if command in ("version"):
+ parser.add_option("-R","--registry-version",
+ action="store_true", dest="version_registry", default=False,
+ help="probe registry version instead of slicemgr")
+ parser.add_option("-l","--local",
+ action="store_true", dest="version_local", default=False,
+ help="display version of the local client")
+
return parser
return parser
- #
- # Establish Connection to SliceMgr and Registry Servers
- #
- def set_servers(self):
+ def read_config(self):
config_file = self.options.sfi_dir + os.sep + "sfi_config"
try:
config = Config (config_file)
errors = 0
# Set SliceMgr URL
if (self.options.sm is not None):
- sm_url = self.options.sm
+ self.sm_url = self.options.sm
elif hasattr(config, "SFI_SM"):
- sm_url = config.SFI_SM
+ self.sm_url = config.SFI_SM
else:
self.logger.error("You need to set e.g. SFI_SM='http://your.slicemanager.url:12347/' in %s" % config_file)
errors += 1
# Set Registry URL
if (self.options.registry is not None):
- reg_url = self.options.registry
+ self.reg_url = self.options.registry
elif hasattr(config, "SFI_REGISTRY"):
- reg_url = config.SFI_REGISTRY
+ self.reg_url = config.SFI_REGISTRY
else:
self.logger.errors("You need to set e.g. SFI_REGISTRY='http://your.registry.url:12345/' in %s" % config_file)
errors += 1
if errors:
sys.exit(1)
-
-
+
+
+ #
+ # Establish Connection to SliceMgr and Registry Servers
+ #
+ def set_servers(self):
+
+ self.read_config()
# Get key and certificate
key_file = self.get_key_file()
cert_file = self.get_cert_file(key_file)
self.cert_file = cert_file
self.cert = Certificate(filename=cert_file)
# Establish connection to server(s)
- self.logger.info("Contacting Registry at: %s"%reg_url)
- self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file, self.options)
- self.logger.info("Contacting Slice Manager at: %s"%sm_url)
- self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file, self.options)
+ self.logger.info("Contacting Registry at: %s"%self.reg_url)
+ self.registry = xmlrpcprotocol.get_server(self.reg_url, key_file, cert_file, self.options)
+ self.logger.info("Contacting Slice Manager at: %s"%self.sm_url)
+ self.slicemgr = xmlrpcprotocol.get_server(self.sm_url, key_file, cert_file, self.options)
return
# list entires in named authority registry
def list(self, opts, args):
if len(args)!= 1:
- self.parser.print_help()
+ self.print_help()
sys.exit(1)
hrn = args[0]
user_cred = self.get_user_cred().save_to_string(save_parents=True)
# show named registry record
def show(self, opts, args):
if len(args)!= 1:
- self.parser.print_help()
+ self.print_help()
sys.exit(1)
hrn = args[0]
user_cred = self.get_user_cred().save_to_string(save_parents=True)
def remove(self, opts, args):
auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
if len(args)!=1:
- self.parser.print_help()
+ self.print_help()
sys.exit(1)
hrn = args[0]
type = opts.type
def add(self, opts, args):
auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
if len(args)!=1:
- self.parser.print_help()
+ self.print_help()
sys.exit(1)
record_filepath = args[0]
rec_file = self.get_record_file(record_filepath)
def update(self, opts, args):
user_cred = self.get_user_cred()
if len(args)!=1:
- self.parser.print_help()
+ self.print_help()
sys.exit(1)
rec_file = self.get_record_file(args[0])
record = load_record_from_file(rec_file)
elif record['type'] in ["slice"]:
try:
cred = self.get_slice_cred(record.get_name()).save_to_string(save_parents=True)
- except ServerException, e:
+ except xmlrpcprotocol.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]:
def version(self, opts, args):
- server = self.get_server_from_opts(opts)
-
- print server.GetVersion()
+ if opts.version_local:
+ version=version_core()
+ else:
+ if opts.version_registry:
+ server=self.registry
+ else:
+ server = self.get_server_from_opts(opts)
+ version=server.GetVersion()
+ for (k,v) in version.iteritems():
+ print "%-20s: %s"%(k,v)
# list instantiated slices
def slices(self, opts, args):
delegated_cred = self.delegate_cred(user_cred, get_authority(self.authority))
creds.append(delegated_cred)
server = self.get_server_from_opts(opts)
- results = server.ListSlices(creds)
+ results = server.ListSlices(creds, unique_call_id())
display_list(results)
return
if opts.delegate:
delegated_cred = self.delegate_cred(cred, get_authority(self.authority))
creds.append(delegated_cred)
- result = server.ListResources(creds, call_options)
+ result = server.ListResources(creds, call_options,unique_call_id())
format = opts.format
- display_rspec(result, format)
- if (opts.file is not None):
+ if opts.file is None:
+ display_rspec(result, format)
+ else:
file = opts.file
if not file.startswith(os.sep):
file = os.path.join(self.options.sfi_dir, file)
rspec_file = self.get_rspec_file(args[1])
rspec = open(rspec_file).read()
server = self.get_server_from_opts(opts)
- result = server.CreateSliver(slice_urn, creds, rspec, [])
+ result = server.CreateSliver(slice_urn, creds, rspec, [], unique_call_id())
print result
return result
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
server = self.get_server_from_opts(opts)
- return server.DeleteSliver(slice_urn, creds)
+ return server.DeleteSliver(slice_urn, creds, unique_call_id())
# start named slice
def start(self, opts, args):
delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
creds.append(delegated_cred)
time = args[1]
- return server.RenewSliver(slice_urn, creds, time)
+ return server.RenewSliver(slice_urn, creds, time, unique_call_id())
def status(self, opts, args):
server = self.get_server_from_opts(opts)
return server.Shutdown(slice_urn, creds)
+ def print_help (self):
+ self.sfi_parser.print_help()
+ self.cmd_parser.print_help()
#
# Main: parse arguments and dispatch to command
#
def main(self):
- parser = self.create_parser()
- (options, args) = parser.parse_args()
+ self.sfi_parser = self.create_parser()
+ (options, args) = self.sfi_parser.parse_args()
self.options = options
self.logger.setLevelFromOptVerbose(self.options.verbose)
return -1
command = args[0]
- self.parser = self.create_cmd_parser(command)
- (cmd_opts, cmd_args) = self.parser.parse_args(args[1:])
+ self.cmd_parser = self.create_cmd_parser(command)
+ (cmd_opts, cmd_args) = self.cmd_parser.parse_args(args[1:])
self.set_servers()
git://git.onelab.eu / sfa.git / blobdiff