X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fclient%2Fsfi.py;h=6114c55803c284a5f9526798c1389c51d0b6f8da;hb=935de64c2ed3a68566da471c68447a1ac384455d;hp=688dd2ca7c881e1696b4b072617f5d55b3cce272;hpb=7c1cf48e3a60344e3c381d1edac89d81659655f3;p=sfa.git
diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
old mode 100755
new mode 100644
index 688dd2ca..c9bde73a
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -1,49 +1,55 @@
-#! /usr/bin/env python
-# sfi -- slice-based facility interface
+# xxx NOTE this will soon be reviewed to take advantage of sfaclientlib
import sys
sys.path.append('.')
+
import os, os.path
-import tempfile
-import traceback
import socket
-from types import StringTypes, ListType
+import datetime
+import codecs
+import pickle
+from lxml import etree
+from StringIO import StringIO
from optparse import OptionParser
+
from sfa.trust.certificate import Keypair, Certificate
+from sfa.trust.gid import GID
from sfa.trust.credential import Credential
-from sfa.util.sfaticket import SfaTicket
-from sfa.util.record import *
-from sfa.util.namespace import *
-from sfa.util.rspec import RSpec
-from sfa.util.xmlrpcprotocol import ServerException
-import sfa.util.xmlrpcprotocol as xmlrpcprotocol
+from sfa.trust.sfaticket import SfaTicket
+
+from sfa.util.sfalogging import sfi_logger
+from sfa.util.xrn import get_leaf, get_authority, hrn_to_urn
from sfa.util.config import Config
+from sfa.util.version import version_core
+from sfa.util.cache import Cache
+
+from sfa.storage.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord
+
+from sfa.rspecs.rspec import RSpec
+from sfa.rspecs.rspec_converter import RSpecConverter
+from sfa.rspecs.version_manager import VersionManager
+from sfa.client.return_value import ReturnValue
+
+from sfa.client.sfaserverproxy import SfaServerProxy, ServerException
+from sfa.client.client_helper import pg_users_arg, sfa_users_arg
+
+AGGREGATE_PORT=12346
+CM_PORT=12346
# utility methods here
# display methods
-def display_rspec(rspec, format = 'rspec'):
+def display_rspec(rspec, format='rspec'):
if format in ['dns']:
- spec = RSpec()
- spec.parseString(rspec)
- hostnames = []
- nodespecs = spec.getDictsByTagName('NodeSpec')
- for nodespec in nodespecs:
- if nodespec.has_key('name') and nodespec['name']:
- if isinstance(nodespec['name'], ListType):
- hostnames.extend(nodespec['name'])
- elif isinstance(nodespec['name'], StringTypes):
- hostnames.append(nodespec['name'])
- result = hostnames
+ tree = etree.parse(StringIO(rspec))
+ root = tree.getroot()
+ result = root.xpath("./network/site/node/hostname/text()")
elif format in ['ip']:
- spec = RSpec()
- spec.parseString(rspec)
- ips = []
- ifspecs = spec.getDictsByTagName('IfSpec')
- for ifspec in ifspecs:
- if ifspec.has_key('addr') and ifspec['addr']:
- ips.append(ifspec['addr'])
- result = ips
+ # The IP address is not yet part of the new RSpec
+ # so this doesn't do anything yet.
+ tree = etree.parse(StringIO(rspec))
+ root = tree.getroot()
+ result = root.xpath("./network/site/node/ipv4/text()")
else:
result = rspec
@@ -54,13 +60,12 @@ def display_list(results):
for result in results:
print result
-
-def display_records(recordList, dump = False):
+def display_records(recordList, dump=False):
''' Print all fields in the record'''
for record in recordList:
display_record(record, dump)
-def display_record(record, dump = False):
+def display_record(record, dump=False):
if dump:
record.dump()
else:
@@ -78,122 +83,226 @@ def filter_records(type, records):
# save methods
+def save_variable_to_file(var, filename, format="text"):
+ f = open(filename, "w")
+ if format == "text":
+ f.write(str(var))
+ elif format == "pickled":
+ f.write(pickle.dumps(var))
+ else:
+ # this should never happen
+ print "unknown output format", format
+
+
def save_rspec_to_file(rspec, filename):
if not filename.endswith(".rspec"):
filename = filename + ".rspec"
-
f = open(filename, 'w')
f.write(rspec)
f.close()
return
-def save_records_to_file(filename, recordList):
- index = 0
- for record in recordList:
- if index>0:
- save_record_to_file(filename + "." + str(index), record)
- else:
- save_record_to_file(filename, record)
- index = index + 1
+def save_records_to_file(filename, recordList, format="xml"):
+ if format == "xml":
+ index = 0
+ for record in recordList:
+ if index > 0:
+ save_record_to_file(filename + "." + str(index), record)
+ else:
+ save_record_to_file(filename, record)
+ index = index + 1
+ elif format == "xmllist":
+ f = open(filename, "w")
+ f.write("\n")
+ for record in recordList:
+ record = SfaRecord(dict=record)
+ f.write('\n')
+ f.write("\n")
+ f.close()
+ elif format == "hrnlist":
+ f = open(filename, "w")
+ for record in recordList:
+ record = SfaRecord(dict=record)
+ f.write(record.get_name() + "\n")
+ f.close()
+ else:
+ # this should never happen
+ print "unknown output format", format
def save_record_to_file(filename, record):
if record['type'] in ['user']:
- record = UserRecord(dict = record)
+ record = UserRecord(dict=record)
elif record['type'] in ['slice']:
- record = SliceRecord(dict = record)
+ record = SliceRecord(dict=record)
elif record['type'] in ['node']:
- record = NodeRecord(dict = record)
+ record = NodeRecord(dict=record)
elif record['type'] in ['authority', 'ma', 'sa']:
- record = AuthorityRecord(dict = record)
+ record = AuthorityRecord(dict=record)
else:
- record = GeniRecord(dict = record)
+ record = SfaRecord(dict=record)
str = record.save_to_string()
- file(filename, "w").write(str)
+ f=codecs.open(filename, encoding='utf-8',mode="w")
+ f.write(str)
+ f.close()
return
# load methods
def load_record_from_file(filename):
- str = file(filename, "r").read()
- record = GeniRecord(string=str)
+ f=codecs.open(filename, encoding="utf-8", mode="r")
+ str = f.read()
+ f.close()
+ record = SfaRecord(string=str)
return record
+import uuid
+def unique_call_id(): return uuid.uuid4().urn
class Sfi:
- slicemgr = None
- registry = None
- user = None
- authority = None
- options = None
- hashrequest = False
+ required_options=['verbose', 'debug', 'registry', 'sm', 'auth', 'user']
+
+ @staticmethod
+ def default_sfi_dir ():
+ if os.path.isfile("./sfi_config"):
+ return os.getcwd()
+ else:
+ return os.path.expanduser("~/.sfi/")
+
+ # 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,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=Sfi.default_sfi_dir()
+ self.options = options
+ self.slicemgr = None
+ self.registry = None
+ self.user = None
+ self.authority = None
+ self.hashrequest = False
+ self.logger = sfi_logger
+ self.logger.enable_console()
+ self.available_names = [ tuple[0] for tuple in Sfi.available ]
+ self.available_dict = dict (Sfi.available)
- 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",
- "get_trusted_certs": "cred",
- "get_ticket": "name rspec",
- "redeem_ticket": "ticket",
- "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)
+ # tuples command-name expected-args in the order in which they should appear in the help
+ available = [
+ ("version", ""),
+ ("list", "authority"),
+ ("show", "name"),
+ ("add", "record"),
+ ("update", "record"),
+ ("remove", "name"),
+ ("slices", ""),
+ ("resources", "[slice_hrn]"),
+ ("create", "slice_hrn rspec"),
+ ("delete", "slice_hrn"),
+ ("status", "slice_hrn"),
+ ("start", "slice_hrn"),
+ ("stop", "slice_hrn"),
+ ("reset", "slice_hrn"),
+ ("renew", "slice_hrn time"),
+ ("shutdown", "slice_hrn"),
+ ("get_ticket", "slice_hrn rspec"),
+ ("redeem_ticket", "ticket"),
+ ("delegate", "name"),
+ ("create_gid", "[name]"),
+ ("get_trusted_certs", "cred"),
+ ]
- parser = OptionParser(usage="sfi [sfi_options] %s [options] %s" \
- % (command, cmdargs[command]))
+ def print_command_help (self, options):
+ verbose=getattr(options,'verbose')
+ format3="%18s %-15s %s"
+ line=80*'-'
+ if not verbose:
+ print format3%("command","cmd_args","description")
+ print line
+ else:
+ print line
+ self.create_parser().print_help()
+ for command in self.available_names:
+ args=self.available_dict[command]
+ method=getattr(self,command,None)
+ doc=""
+ if method: doc=getattr(method,'__doc__',"")
+ if not doc: doc="*** no doc found ***"
+ doc=doc.strip(" \t\n")
+ doc=doc.replace("\n","\n"+35*' ')
+ if verbose:
+ print line
+ print format3%(command,args,doc)
+ if verbose:
+ self.create_cmd_parser(command).print_help()
- 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")
+ def create_cmd_parser(self, command):
+ if command not in self.available_dict:
+ msg="Invalid command\n"
+ msg+="Commands: "
+ msg += ','.join(self.available_names)
+ self.logger.critical(msg)
+ sys.exit(2)
- if command in ("create", "get_ticket"):
- parser.add_option("-a", "--aggregate", dest="aggregate",default=None,
- help="aggregate hrn")
+ parser = OptionParser(usage="sfi [sfi_options] %s [cmd_options] %s" \
+ % (command, self.available_dict[command]))
- if command in ("start", "stop", "reset", "delete", "slices"):
- parser.add_option("-c", "--component", dest="component",default=None,
+ # user specifies remote aggregate/sm/component
+ if command in ("resources", "slices", "create", "delete", "start", "stop",
+ "restart", "shutdown", "get_ticket", "renew", "status"):
+ parser.add_option("-a", "--aggregate", dest="aggregate",
+ default=None, help="aggregate host")
+ parser.add_option("-p", "--port", dest="port",
+ default=AGGREGATE_PORT, help="aggregate port")
+ parser.add_option("-c", "--component", dest="component", default=None,
help="component hrn")
-
+ parser.add_option("-d", "--delegate", dest="delegate", default=None,
+ action="store_true",
+ help="Include a credential delegated to the user's root"+\
+ "authority in set of credentials for this call")
+
+ # registy filter option
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"),
+ parser.add_option("-t", "--type", dest="type", type="choice",
+ help="type filter ([all]|user|slice|authority|node|aggregate)",
+ choices=("all", "user", "slice", "authority", "node", "aggregate"),
default="all")
+ # display formats
+ if command in ("resources"):
+ parser.add_option("-r", "--rspec-version", dest="rspec_version", default="SFA 1",
+ help="schema type and version of resulting RSpec")
+ parser.add_option("-f", "--format", dest="format", type="choice",
+ help="display format ([xml]|dns|ip)", default="xml",
+ choices=("xml", "dns", "ip"))
+ #panos: a new option to define the type of information about resources a user is interested in
+ parser.add_option("-i", "--info", dest="info",
+ help="optional component information", default=None)
- if command in ("resources", "show", "list"):
+
+ # 'create' does return the new rspec, makes sense to save that too
+ if command in ("resources", "show", "list", "create_gid", 'create'):
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"))
+ help="display format ([text]|xml)", default="text",
+ choices=("text", "xml"))
+
+ parser.add_option("-F", "--fileformat", dest="fileformat", type="choice",
+ help="output file format ([xml]|xmllist|hrnlist)", default="xml",
+ choices=("xml", "xmllist", "hrnlist"))
+
+ if command in ("status", "version"):
+ parser.add_option("-o", "--output", dest="file",
+ help="output dictionary to file", metavar="FILE", default=None)
+ parser.add_option("-F", "--fileformat", dest="fileformat", type="choice",
+ help="output file format ([text]|pickled)", default="text",
+ choices=("text","pickled"))
if command in ("delegate"):
parser.add_option("-u", "--user",
@@ -201,112 +310,223 @@ class Sfi:
help="delegate user credential")
parser.add_option("-s", "--slice", dest="delegate_slice",
help="delegate slice credential", metavar="HRN", default=None)
+
+ if command in ("version"):
+ parser.add_option("-a", "--aggregate", dest="aggregate",
+ default=None, help="aggregate host")
+ parser.add_option("-p", "--port", dest="port",
+ default=AGGREGATE_PORT, help="aggregate port")
+ 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
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 = OptionParser(usage="sfi [sfi_options] command [cmd_options] [cmd_args]",
+ description="Commands: %s"%(" ".join(self.available_names)))
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)
+ help="config & working directory - default is %default",
+ metavar="PATH", default=Sfi.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",
+ parser.add_option("-v", "--verbose", action="count", dest="verbose", default=0,
+ help="verbose mode - cumulative")
+ parser.add_option("-D", "--debug",
+ action="store_true", dest="debug", default=False,
+ help="Debug (xml-rpc) protocol messages")
+ 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.add_option("-t", "--timeout", dest="timeout", default=None,
+ help="Amout of time to wait before timing out the request")
+ parser.add_option("-?", "--commands",
+ action="store_true", dest="command_help", default=False,
+ help="one page summary on commands & exit")
parser.disable_interspersed_args()
return parser
-
+
+ def print_help (self):
+ self.sfi_parser.print_help()
+ self.cmd_parser.print_help()
+
#
- # Establish Connection to SliceMgr and Registry Servers
+ # Main: parse arguments and dispatch to command
#
- def set_servers(self):
- config_file = self.options.sfi_dir + os.sep + "sfi_config"
+ def dispatch(self, command, cmd_opts, cmd_args):
+ return getattr(self, command)(cmd_opts, cmd_args)
+
+ def main(self):
+ self.sfi_parser = self.create_parser()
+ (options, args) = self.sfi_parser.parse_args()
+ if options.command_help:
+ self.print_command_help(options)
+ sys.exit(1)
+ self.options = options
+
+ self.logger.setLevelFromOptVerbose(self.options.verbose)
+ if options.hashrequest:
+ self.hashrequest = True
+
+ if len(args) <= 0:
+ self.logger.critical("No command given. Use -h for help.")
+ self.print_command_help(options)
+ return -1
+
+ command = args[0]
+ self.cmd_parser = self.create_cmd_parser(command)
+ (cmd_opts, cmd_args) = self.cmd_parser.parse_args(args[1:])
+
+ self.set_servers()
+ self.logger.info("Command=%s" % command)
+ if command in ("resources"):
+ self.logger.debug("resources cmd_opts %s" % cmd_opts.format)
+ elif command in ("list", "show", "remove"):
+ self.logger.debug("cmd_opts.type %s" % cmd_opts.type)
+ self.logger.debug('cmd_args %s' % cmd_args)
+
+ try:
+ self.dispatch(command, cmd_opts, cmd_args)
+ except KeyError:
+ self.logger.critical ("Unknown command %s"%command)
+ raise
+ sys.exit(1)
+
+ return
+
+ ####################
+ def read_config(self):
+ config_file = os.path.join(self.options.sfi_dir,"sfi_config")
try:
config = Config (config_file)
except:
- print "Failed to read configuration file",config_file
- print "Make sure to remove the export clauses and to add quotes"
- if not self.options.verbose:
- print "Re-run with -v for more details"
+ self.logger.critical("Failed to read configuration file %s"%config_file)
+ self.logger.info("Make sure to remove the export clauses and to add quotes")
+ if self.options.verbose==0:
+ self.logger.info("Re-run with -v for more details")
else:
- traceback.print_exc()
+ self.logger.log_exc("Could not read config file %s"%config_file)
sys.exit(1)
- errors=0
+ errors = 0
# Set SliceMgr URL
if (self.options.sm is not None):
- sm_url = self.options.sm
- elif hasattr(config,"SFI_SM"):
- sm_url = config.SFI_SM
+ self.sm_url = self.options.sm
+ elif hasattr(config, "SFI_SM"):
+ self.sm_url = config.SFI_SM
else:
- print "You need to set e.g. SFI_SM='http://your.slicemanager.url:12347/' in %s"%config_file
- errors +=1
+ 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
- elif hasattr(config,"SFI_REGISTRY"):
- reg_url = config.SFI_REGISTRY
+ self.reg_url = self.options.registry
+ elif hasattr(config, "SFI_REGISTRY"):
+ self.reg_url = config.SFI_REGISTRY
else:
- print "You need to set e.g. SFI_REGISTRY='http://your.registry.url:12345/' in %s"%config_file
- errors +=1
-
+ self.logger.errors("You need to set e.g. SFI_REGISTRY='http://your.registry.url:12345/' in %s" % config_file)
+ errors += 1
+
+
# Set user HRN
if (self.options.user is not None):
self.user = self.options.user
- elif hasattr(config,"SFI_USER"):
+ elif hasattr(config, "SFI_USER"):
self.user = config.SFI_USER
else:
- print "You need to set e.g. SFI_USER='plc.princeton.username' in %s"%config_file
- errors +=1
+ self.logger.errors("You need to set e.g. SFI_USER='plc.princeton.username' in %s" % config_file)
+ errors += 1
# Set authority HRN
if (self.options.auth is not None):
self.authority = self.options.auth
- elif hasattr(config,"SFI_AUTH"):
+ elif hasattr(config, "SFI_AUTH"):
self.authority = config.SFI_AUTH
else:
- print "You need to set e.g. SFI_AUTH='plc.princeton' in %s"%config_file
- errors +=1
+ self.logger.error("You need to set e.g. SFI_AUTH='plc.princeton' in %s" % config_file)
+ errors += 1
if errors:
sys.exit(1)
-
- if self.options.verbose :
- print "Contacting Slice Manager at:", sm_url
- print "Contacting Registry at:", reg_url
-
+
+
+ #
+ # 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.key = Keypair(filename=key_file)
self.key_file = key_file
self.cert_file = cert_file
- self.cert = Certificate(filename=cert_file)
- # Establish connection to server(s)
- self.registry = xmlrpcprotocol.get_server(reg_url, key_file, cert_file)
- self.slicemgr = xmlrpcprotocol.get_server(sm_url, key_file, cert_file)
+ self.cert = GID(filename=cert_file)
+ self.logger.info("Contacting Registry at: %s"%self.reg_url)
+ self.registry = SfaServerProxy(self.reg_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)
+ self.logger.info("Contacting Slice Manager at: %s"%self.sm_url)
+ self.slicemgr = SfaServerProxy(self.sm_url, key_file, cert_file, timeout=self.options.timeout, verbose=self.options.debug)
return
-
+
+ def get_cached_server_version(self, server):
+ # check local cache first
+ cache = None
+ version = None
+ cache_file = os.path.join(self.options.sfi_dir,'sfi_cache.dat')
+ cache_key = server.url + "-version"
+ try:
+ cache = Cache(cache_file)
+ except IOError:
+ cache = Cache()
+ self.logger.info("Local cache not found at: %s" % cache_file)
+
+ if cache:
+ version = cache.get(cache_key)
+
+ if not version:
+ result = server.GetVersion()
+ version= ReturnValue.get_value(result)
+ # cache version for 24 hours
+ cache.add(cache_key, version, ttl= 60*60*24)
+ self.logger.info("Updating cache file %s" % cache_file)
+ cache.save_to_file(cache_file)
+
+ return version
+
+
+ def server_supports_options_arg(self, server):
+ """
+ Returns true if server support the optional call_id arg, false otherwise.
+ """
+ server_version = self.get_cached_server_version(server)
+ if 'sfa' in server_version and 'code_tag' in server_version:
+ code_tag = server_version['code_tag']
+ code_tag_parts = code_tag.split("-")
+
+ version_parts = code_tag_parts[0].split(".")
+ major, minor = version_parts[0], version_parts[1]
+ rev = code_tag_parts[1]
+ if int(major) >= 1:
+ if int(minor) >= 2:
+ return True
+ return False
+
#
# Get various credential and spec files
#
@@ -322,155 +542,178 @@ class Sfi:
def get_key_file(self):
- file=os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".pkey")
- #file = os.path.join(self.options.sfi_dir, get_leaf(self.user) + ".pkey")
+ file = os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".pkey")
if (os.path.isfile(file)):
return file
else:
- print "Key file", file, "does not exist"
+ self.logger.error("Key file %s does not exist"%file)
sys.exit(-1)
return
- def get_cert_file(self,key_file):
+ def get_cert_file(self, key_file):
- #file = os.path.join(self.options.sfi_dir, get_leaf(self.user) + ".cert")
- file=os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".cert")
- if (os.path.isfile(file)):
- return file
- else:
- k = Keypair(filename = key_file)
- cert = Certificate(subject=self.user)
- cert.set_pubkey(k)
- cert.set_issuer(k, self.user)
- cert.sign()
- if self.options.verbose :
- print "Writing self-signed certificate to", file
- cert.save_to_file(file)
- return file
-
- def get_gid(self):
- #file = os.path.join(self.options.sfi_dir, get_leaf(self.user) + ".gid")
- file=os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".gid")
+ cert_file = os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".cert")
+ if (os.path.isfile(cert_file)):
+ # we'd perfer to use Registry issued certs instead of self signed certs.
+ # if this is a Registry cert (GID) then we are done
+ gid = GID(filename=cert_file)
+ if gid.get_urn():
+ return cert_file
+
+ # generate self signed certificate
+ k = Keypair(filename=key_file)
+ cert = Certificate(subject=self.user)
+ cert.set_pubkey(k)
+ cert.set_issuer(k, self.user)
+ cert.sign()
+ self.logger.info("Writing self-signed certificate to %s"%cert_file)
+ cert.save_to_file(cert_file)
+ self.cert = cert
+ # try to get registry issued cert
+ try:
+ self.logger.info("Getting Registry issued cert")
+ self.read_config()
+ # *hack. need to set registry before _get_gid() is called
+ self.registry = SfaServerProxy(self.reg_url, key_file, cert_file,
+ timeout=self.options.timeout, verbose=self.options.debug)
+ gid = self._get_gid(type='user')
+ self.registry = None
+ self.logger.info("Writing certificate to %s"%cert_file)
+ gid.save_to_file(cert_file)
+ except:
+ self.logger.info("Failed to download Registry issued cert")
+
+ return cert_file
+
+ def get_cached_gid(self, file):
+ """
+ Return a cached gid
+ """
+ gid = None
if (os.path.isfile(file)):
gid = GID(filename=file)
- return gid
- else:
- cert_str = self.cert.save_to_string(save_parents=True)
- gid_str = self.registry.get_gid(cert_str, self.user, "user")
- gid = GID(string=gid_str)
- if self.options.verbose:
- print "Writing user gid to", file
- gid.save_to_file(file, save_parents=True)
- return gid
+ return gid
+
+# seems useless
+# # xxx opts unused
+# def get_gid(self, opts, args):
+# """ Get the specify gid and save it to file """
+# hrn = None
+# if args:
+# hrn = args[0]
+# gid = self._get_gid(hrn)
+# self.logger.debug("Sfi.get_gid-> %s" % gid.save_to_string(save_parents=True))
+# return gid
+
+ def _get_gid(self, hrn=None, type=None):
+ """
+ git_gid helper. Retrive the gid from the registry and save it to file.
+ """
+
+ if not hrn:
+ hrn = self.user
- def get_user_cred(self):
- #file = os.path.join(self.options.sfi_dir, get_leaf(self.user) + ".cred")
- file=os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".cred")
+ gidfile = os.path.join(self.options.sfi_dir, hrn + ".gid")
+ gid = self.get_cached_gid(gidfile)
+ if not gid:
+ user_cred = self.get_user_cred()
+ records = self.registry.Resolve(hrn, user_cred.save_to_string(save_parents=True))
+ if not records:
+ raise RecordNotFound(args[0])
+ record = records[0]
+ if type:
+ record=None
+ for rec in records:
+ if type == rec['type']:
+ record = rec
+ if not record:
+ raise RecordNotFound(args[0])
+
+ gid = GID(string=record['gid'])
+ self.logger.info("Writing gid to %s"%gidfile)
+ gid.save_to_file(filename=gidfile)
+ return gid
+
+
+ def get_cached_credential(self, file):
+ """
+ Return a cached credential only if it hasn't expired.
+ """
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 = self.key.compute_hash([cert_string, "user", self.user])
- user_name=self.user.replace(self.authority+".", '')
- if user_name.count(".") > 0:
- user_name = user_name.replace(".", '_')
- self.user=self.authority + "." + user_name
-
- 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)
-
+ credential = Credential(filename=file)
+ # make sure it isnt expired
+ if not credential.get_expiration or \
+ datetime.datetime.today() < credential.get_expiration():
+ return credential
+ return None
+
+ def get_user_cred(self):
+ file = os.path.join(self.options.sfi_dir, self.user.replace(self.authority + '.', '') + ".cred")
+ return self.get_cred(file, 'user', self.user)
+
def get_auth_cred(self):
if not self.authority:
- print "no authority specified. Use -a or set SF_AUTH"
+ self.logger.critical("no authority specified. Use -a or set SF_AUTH")
sys.exit(-1)
-
- file = os.path.join(self.options.sfi_dir, 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)
- auth_cred = self.registry.get_credential(user_cred, "authority", self.authority)
- 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, self.authority + ".cred")
+ return self.get_cred(file, 'authority', self.authority)
+
+ def get_slice_cred(self, name):
file = os.path.join(self.options.sfi_dir, "slice_" + 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]
- slice_cred_str = self.registry.get_credential(user_cred, "slice", name)
- 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
+ return self.get_cred(file, 'slice', name)
+
+ def get_cred(self, file, type, hrn):
+ # attempt to load a cached credential
+ cred = self.get_cached_credential(file)
+ if not cred:
+ if type in ['user']:
+ cert_string = self.cert.save_to_string(save_parents=True)
+ user_name = self.user.replace(self.authority + ".", '')
+ if user_name.count(".") > 0:
+ user_name = user_name.replace(".", '_')
+ self.user = self.authority + "." + user_name
+ cred_str = self.registry.GetSelfCredential(cert_string, hrn, "user")
else:
- print "Failed to get slice credential"
+ # bootstrap slice credential from user credential
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ cred_str = self.registry.GetCredential(user_cred, hrn, type)
+
+ if not cred_str:
+ self.logger.critical("Failed to get %s credential" % type)
sys.exit(-1)
+
+ cred = Credential(string=cred_str)
+ cred.save_to_file(file, save_parents=True)
+ self.logger.info("Writing %s credential to %s" %(type, file))
+
+ return cred
+
- def delegate_cred(self,cred, hrn, type = 'authority'):
+ def delegate_cred(self, object_cred, hrn):
# the gid and hrn of the object we are delegating
- user_cred = Credential(string=cred)
- object_gid = user_cred.get_gid_object()
+ if isinstance(object_cred, str):
+ object_cred = Credential(string=object_cred)
+ object_gid = object_cred.get_gid_object()
object_hrn = object_gid.get_hrn()
- #cred.set_delegate(True)
- #if not cred.get_delegate():
- # raise Exception, "Error: Object credential %(object_hrn)s does not have delegate bit set" % locals()
-
- records = self.registry.resolve(cred, hrn)
- records = filter_records(type, records)
-
- if not records:
- raise Exception, "Error: Didn't find a %(type)s record for %(hrn)s" % locals()
-
- # the gid of the user who will be delegated too
- record = GeniRecord(dict=records[0])
- delegee_gid = record.get_gid_object()
+ if not object_cred.get_privileges().get_all_delegate():
+ self.logger.error("Object credential %s does not have delegate bit set"%object_hrn)
+ return
+
+ # the delegating user's gid
+ caller_gid = self._get_gid(self.user)
+ caller_gidfile = os.path.join(self.options.sfi_dir, self.user + ".gid")
+
+ # the gid of the user who will be delegated to
+ delegee_gid = self._get_gid(hrn)
delegee_hrn = delegee_gid.get_hrn()
-
- # the key and hrn of the user who will be delegating
- user_key = Keypair(filename = self.get_key_file())
- user_hrn = user_cred.get_gid_caller().get_hrn()
-
- dcred = Credential(subject=object_hrn + " delegated to " + delegee_hrn)
- dcred.set_gid_caller(delegee_gid)
- dcred.set_gid_object(object_gid)
- dcred.set_privileges(user_cred.get_privileges())
- dcred.set_delegate(True)
- dcred.set_pubkey(object_gid.get_pubkey())
- dcred.set_issuer(user_key, user_hrn)
- dcred.set_parent(user_cred)
- dcred.encode()
- dcred.sign()
-
+ delegee_gidfile = os.path.join(self.options.sfi_dir, delegee_hrn + ".gid")
+ delegee_gid.save_to_file(filename=delegee_gidfile)
+ dcred = object_cred.delegate(delegee_gidfile, self.get_key_file(), caller_gidfile)
return dcred.save_to_string(save_parents=True)
-
- def get_rspec_file(self,rspec):
+
+ ######################################## miscell utilities
+ def get_rspec_file(self, rspec):
if (os.path.isabs(rspec)):
file = rspec
else:
@@ -478,10 +721,10 @@ class Sfi:
if (os.path.isfile(file)):
return file
else:
- print "No such rspec file", rspec
+ self.logger.critical("No such rspec file %s"%rspec)
sys.exit(1)
- def get_record_file(self,record):
+ def get_record_file(self, record):
if (os.path.isabs(record)):
file = record
else:
@@ -489,178 +732,145 @@ class Sfi:
if (os.path.isfile(file)):
return file
else:
- print "No such registry record file", record
+ self.logger.critical("No such registry record file %s"%record)
sys.exit(1)
- def load_publickey_string(self,fn):
- f = file(fn,"r")
- key_string = f.read()
-
- # if the filename is a private key file, then extract the public key
- if "PRIVATE KEY" in key_string:
- outfn = tempfile.mktemp()
- cmd = "openssl rsa -in " + fn + " -pubout -outform PEM -out " + outfn
- os.system(cmd)
- f = file(outfn, "r")
- key_string = f.read()
- os.remove(outfn)
-
- return key_string
-
- def get_component_server_from_hrn(self, hrn):
+ # xxx opts undefined
+ def get_component_proxy_from_hrn(self, hrn):
# direct connection to the nodes component manager interface
user_cred = self.get_user_cred().save_to_string(save_parents=True)
- records = self.registry.resolve(user_cred, hrn)
+ records = self.registry.Resolve(hrn, user_cred)
records = filter_records('node', records)
if not records:
- print "No such component:", opts.component
+ self.logger.warning("No such component:%r"% opts.component)
record = records[0]
- cm_port = "12346"
- url = "https://%s:%s" % (record['hostname'], cm_port)
- return xmlrpcprotocol.get_server(url, self.key_file, self.cert_file)
-
- #
+
+ return self.server_proxy(record['hostname'], CM_PORT, self.key_file, self.cert_file)
+
+ def server_proxy(self, host, port, keyfile, certfile):
+ """
+ Return an instance of an xmlrpc server connection
+ """
+ # port is appended onto the domain, before the path. Should look like:
+ # http://domain:port/path
+ host_parts = host.split('/')
+ host_parts[0] = host_parts[0] + ":" + str(port)
+ url = "http://%s" % "/".join(host_parts)
+ return SfaServerProxy(url, keyfile, certfile, timeout=self.options.timeout,
+ verbose=self.options.debug)
+
+ # xxx opts could be retrieved in self.options
+ def server_proxy_from_opts(self, opts):
+ """
+ Return instance of an xmlrpc connection to a slice manager, aggregate
+ or component server depending on the specified opts
+ """
+ server = self.slicemgr
+ # direct connection to an aggregate
+ if hasattr(opts, 'aggregate') and opts.aggregate:
+ server = self.server_proxy(opts.aggregate, opts.port, self.key_file, self.cert_file)
+ # direct connection to the nodes component manager interface
+ if hasattr(opts, 'component') and opts.component:
+ server = self.get_component_proxy_from_hrn(opts.component)
+
+ return server
+ #==========================================================================
# 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
-
- # list entires in named authority registry
- def list(self,opts, args):
- user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ def version(self, opts, args):
+ """
+ display an SFA server version (GetVersion)
+or version information about sfi itself
+ """
+ if opts.version_local:
+ version=version_core()
+ else:
+ if opts.version_registry:
+ server=self.registry
+ else:
+ server = self.server_proxy_from_opts(opts)
+ result = server.GetVersion()
+ version = ReturnValue.get_value(result)
+ for (k,v) in version.iteritems():
+ print "%-20s: %s"%(k,v)
+ if opts.file:
+ save_variable_to_file(version, opts.file, opts.fileformat)
+
+ def list(self, opts, args):
+ """
+ list entries in named authority registry (List)
+ """
+ if len(args)!= 1:
+ self.print_help()
+ sys.exit(1)
hrn = args[0]
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
try:
- list = self.registry.list(user_cred, hrn)
+ list = self.registry.List(hrn, user_cred)
except IndexError:
raise Exception, "Not enough parameters for the 'list' command"
-
- # filter on person, slice, site, node, etc.
+
+ # filter on person, slice, site, node, etc.
# THis really should be in the self.filter_records funct def comment...
list = filter_records(opts.type, list)
for record in list:
- print "%s (%s)" % (record['hrn'], record['type'])
+ print "%s (%s)" % (record['hrn'], record['type'])
if opts.file:
- file = opts.file
- if not file.startswith(os.sep):
- file = os.path.join(self.options.sfi_dir, file)
- save_records_to_file(file, list)
+ save_records_to_file(opts.file, list, opts.fileformat)
return
- # show named registry record
- def show(self,opts, args):
- user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ def show(self, opts, args):
+ """
+ show details about named registry record (Resolve)
+ """
+ if len(args)!= 1:
+ self.print_help()
+ sys.exit(1)
hrn = args[0]
- records = self.registry.resolve(user_cred, hrn)
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ records = self.registry.Resolve(hrn, user_cred)
records = filter_records(opts.type, records)
if not records:
- print "No record of type", opts.type
+ self.logger.error("No record of type %s"% opts.type)
for record in records:
if record['type'] in ['user']:
- record = UserRecord(dict = record)
+ record = UserRecord(dict=record)
elif record['type'] in ['slice']:
- record = SliceRecord(dict = record)
+ record = SliceRecord(dict=record)
elif record['type'] in ['node']:
- record = NodeRecord(dict = record)
- elif record['type'] in ['authority', 'ma', 'sa']:
- record = AuthorityRecord(dict = record)
+ record = NodeRecord(dict=record)
+ elif record['type'].startswith('authority'):
+ record = AuthorityRecord(dict=record)
else:
- record = GeniRecord(dict = record)
- if (opts.format=="text"):
+ record = SfaRecord(dict=record)
+ if (opts.format == "text"):
record.dump()
else:
print record.save_to_string()
-
if opts.file:
- file = opts.file
- if not file.startswith(os.sep):
- file = os.path.join(self.options.sfi_dir, file)
- save_records_to_file(file, records)
+ save_records_to_file(opts.file, records, opts.fileformat)
return
- def delegate(self,opts, args):
- user_cred = self.get_user_cred()
- if opts.delegate_user:
- object_cred = user_cred
- elif opts.delegate_slice:
- object_cred = self.get_slice_cred(opts.delegate_slice)
- else:
- print "Must specify either --user or --slice "
- return
-
- # the gid and hrn of the object we are delegating
- object_gid = object_cred.get_gid_object()
- object_hrn = object_gid.get_hrn()
-
- if not object_cred.get_delegate():
- print "Error: Object credential", object_hrn, "does not have delegate bit set"
- return
-
- records = self.registry.resolve(user_cred, args[0])
- records = filter_records("user", records)
-
- if not records:
- print "Error: Didn't find a user record for", args[0]
- return
-
- # the gid of the user who will be delegated too
- delegee_gid = records[0].get_gid_object()
- delegee_hrn = delegee_gid.get_hrn()
-
- # the key and hrn of the user who will be delegating
- user_key = Keypair(filename = self.get_key_file())
- user_hrn = user_cred.get_gid_caller().get_hrn()
-
- dcred = Credential(subject=object_hrn + " delegated to " + delegee_hrn)
- dcred.set_gid_caller(delegee_gid)
- dcred.set_gid_object(object_gid)
- dcred.set_privileges(object_cred.get_privileges())
- dcred.set_delegate(True)
- dcred.set_pubkey(object_gid.get_pubkey())
- dcred.set_issuer(user_key, user_hrn)
- dcred.set_parent(object_cred)
- dcred.encode()
- dcred.sign()
-
- if opts.delegate_user:
- dest_fn = os.path.join(self.options.sfi_dir, get_leaf(delegee_hrn) + "_"
- + get_leaf(object_hrn) + ".cred")
- elif opts.delegate_slice:
- dest_fn = os.path_join(self.options.sfi_dir, get_leaf(delegee_hrn) + "_slice_"
- + get_leaf(object_hrn) + ".cred")
-
- dcred.save_to_file(dest_fn, save_parents = True)
-
- print "delegated credential for", object_hrn, "to", delegee_hrn, "and wrote to", dest_fn
-
- # 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 = '*'
- return self.registry.remove(auth_cred, type, hrn)
-
- # add named registry record
- def add(self,opts, args):
+ def add(self, opts, args):
+ "add record into registry from xml file (Register)"
auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
+ if len(args)!=1:
+ self.print_help()
+ sys.exit(1)
record_filepath = args[0]
rec_file = self.get_record_file(record_filepath)
record = load_record_from_file(rec_file).as_dict()
- return self.registry.register(auth_cred, record)
+ return self.registry.Register(record, auth_cred)
- # update named registry entry
- def update(self,opts, args):
+ def update(self, opts, args):
+ "update record into registry from xml file (Update)"
user_cred = self.get_user_cred()
+ if len(args)!=1:
+ self.print_help()
+ sys.exit(1)
rec_file = self.get_record_file(args[0])
record = load_record_from_file(rec_file)
if record['type'] == "user":
@@ -685,245 +895,383 @@ class Sfi:
else:
raise "unknown record type" + record.get_type()
record = record.as_dict()
- return self.registry.update(cred, record)
+ return self.registry.Update(record, cred)
- def get_trusted_certs(self, opts, args):
- """
- return the trusted certs at this interface
- """
- trusted_certs = self.registry.get_trusted_certs()
- for trusted_cert in trusted_certs:
- cert = Certificate(string=trusted_cert)
- print cert.get_subject()
- return
-
- def aggregates(self, opts, args):
- """
- return a list of details about known aggregates
- """
- user_cred = self.get_user_cred().save_to_string(save_parents=True)
- hrn = None
- if args:
- hrn = args[0]
- result = self.registry.get_aggregates(user_cred, hrn)
- display_list(result)
- return
-
- def registries(self, opts, args):
- """
- return a list of details about known registries
- """
- user_cred = self.get_user_cred().save_to_string(save_parents=True)
- hrn = None
- if args:
- hrn = args[0]
- result = self.registry.get_registries(user_cred, hrn)
- display_list(result)
- return
-
-
- #
- # Slice-related commands
- #
+ def remove(self, opts, args):
+ "remove registry record by name (Remove)"
+ auth_cred = self.get_auth_cred().save_to_string(save_parents=True)
+ if len(args)!=1:
+ self.print_help()
+ sys.exit(1)
+ hrn = args[0]
+ type = opts.type
+ if type in ['all']:
+ type = '*'
+ return self.registry.Remove(hrn, auth_cred, type)
- # list available nodes -- use 'resources' w/ no argument instead
+ # ==================================================================
+ # Slice-related commands
+ # ==================================================================
- # list instantiated slices
- def slices(self,opts, args):
+ def slices(self, opts, args):
+ "list instantiated slices (ListSlices) - returns urn's"
user_cred = self.get_user_cred().save_to_string(save_parents=True)
- server = self.slicemgr
- # direct connection to the nodes component manager interface
- if opts.component:
- server = self.get_component_server_from_hrn(opts.component)
- results = server.get_slices(user_cred)
- display_list(results)
+ creds = [user_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(user_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ server = self.server_proxy_from_opts(opts)
+ call_args = [creds]
+ if self.server_supports_options_arg(server):
+ options = {'call_id': unique_call_id()}
+ call_args.append(options)
+ result = server.ListSlices(*call_args)
+ value = ReturnValue.get_value(result)
+ display_list(value)
return
# show rspec for named slice
- def resources(self,opts, args):
+ def resources(self, opts, args):
+ """
+ with no arg, discover available resources,
+or currently provisioned resources (ListResources)
+ """
user_cred = self.get_user_cred().save_to_string(save_parents=True)
- server = self.slicemgr
- if opts.aggregate:
- agg_hrn = opts.aggregate
- aggregates = self.registry.get_aggregates(user_cred, agg_hrn)
- if not aggregates:
- raise Exception, "No such aggregate %s" % agg_hrn
- aggregate = aggregates[0]
- url = "http://%s:%s" % (aggregate['addr'], aggregate['port'])
- server = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file)
+ server = self.server_proxy_from_opts(opts)
+
+ options = {'call_id': unique_call_id()}
+ #panos add info options
+ if opts.info:
+ options['info'] = opts.info
+
if args:
cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
hrn = args[0]
+ options['geni_slice_urn'] = hrn_to_urn(hrn, 'slice')
else:
cred = user_cred
- hrn = None
-
- result = server.get_resources(cred, hrn)
- format = opts.format
-
- display_rspec(result, format)
- if (opts.file is not None):
- file = opts.file
- if not file.startswith(os.sep):
- file = os.path.join(self.options.sfi_dir, file)
- save_rspec_to_file(result, file)
+
+ creds = [cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ if opts.rspec_version:
+ version_manager = VersionManager()
+ server_version = self.get_cached_server_version(server)
+ if 'sfa' in server_version:
+ # just request the version the client wants
+ options['geni_rspec_version'] = version_manager.get_version(opts.rspec_version).to_dict()
+ else:
+ # this must be a protogeni aggregate. We should request a v2 ad rspec
+ # regardless of what the client user requested
+ options['geni_rspec_version'] = version_manager.get_version('ProtoGENI 2').to_dict()
+ else:
+ options['geni_rspec_version'] = {'type': 'geni', 'version': '3.0'}
+
+ call_args = [creds, options]
+ result = server.ListResources(*call_args)
+ value = ReturnValue.get_value(result)
+ if opts.file is None:
+ display_rspec(value, opts.format)
+ else:
+ save_rspec_to_file(value, opts.file)
return
-
- # created named slice with given rspec
- def create(self,opts, args):
+
+ def create(self, opts, args):
+ """
+ create or update named slice with given rspec
+ """
+ server = self.server_proxy_from_opts(opts)
+ server_version = self.get_cached_server_version(server)
slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
user_cred = self.get_user_cred()
slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
+ delegated_cred = None
+ if server_version.get('interface') == 'slicemgr':
+ # delegate our cred to the slice manager
+ # do not delegate cred to slicemgr...not working at the moment
+ pass
+ #if server_version.get('hrn'):
+ # delegated_cred = self.delegate_cred(slice_cred, server_version['hrn'])
+ #elif server_version.get('urn'):
+ # delegated_cred = self.delegate_cred(slice_cred, urn_to_hrn(server_version['urn']))
+
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 = 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
+ rspec = open(rspec_file).read()
+
+ # need to pass along user keys to the aggregate.
+ # users = [
+ # { urn: urn:publicid:IDN+emulab.net+user+alice
+ # keys: [, ]
+ # }]
+ users = []
+ slice_records = self.registry.Resolve(slice_urn, [user_cred.save_to_string(save_parents=True)])
+ if slice_records and 'researcher' in slice_records[0] and slice_records[0]['researcher']!=[]:
+ slice_record = slice_records[0]
+ user_hrns = slice_record['researcher']
+ user_urns = [hrn_to_urn(hrn, 'user') for hrn in user_hrns]
+ user_records = self.registry.Resolve(user_urns, [user_cred.save_to_string(save_parents=True)])
+
+ if 'sfa' not in server_version:
+ users = pg_users_arg(user_records)
+ rspec = RSpec(rspec)
+ rspec.filter({'component_manager_id': server_version['urn']})
+ rspec = RSpecConverter.to_pg_rspec(rspec.toxml(), content_type='request')
+ creds = [slice_cred]
+ else:
+ users = sfa_users_arg(user_records, slice_record)
+ creds = [slice_cred]
+ if delegated_cred:
+ creds.append(delegated_cred)
+ # do not append users, keys, or slice tags. Anything
+ # not contained in this request will be removed from the slice
+ options = {'append': False}
+ if self.server_supports_options_arg(server):
+ options['call_id'] = unique_call_id()
+ call_args = [slice_urn, creds, rspec, users, options]
+ result = server.CreateSliver(*call_args)
+ value = ReturnValue.get_value(result)
+ if opts.file is None:
+ print value
+ else:
+ save_rspec_to_file (value, opts.file)
+ return value
+
+ def delete(self, opts, args):
+ """
+ delete named slice (DeleteSliver)
+ """
+ slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ server = self.server_proxy_from_opts(opts)
+ call_args = [slice_urn, creds]
+ if self.server_supports_options_arg(server):
+ options = {'call_id': unique_call_id()}
+ call_args.append(options)
+ return server.DeleteSliver(*call_args)
+
+ def status(self, opts, args):
+ """
+ retrieve slice status (SliverStatus)
+ """
+ slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ server = self.server_proxy_from_opts(opts)
+ call_args = [slice_urn, creds]
+ if self.server_supports_options_arg(server):
+ options = {'call_id': unique_call_id()}
+ call_args.append(options)
+ result = server.SliverStatus(*call_args)
+ value = ReturnValue.get_value(result)
+ print value
+ if opts.file:
+ save_variable_to_file(value, opts.file, opts.fileformat)
+
+ def start(self, opts, args):
+ """
+ start named slice (Start)
+ """
+ slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ server = self.server_proxy_from_opts(opts)
+ return server.Start(slice_urn, creds)
+
+ def stop(self, opts, args):
+ """
+ stop named slice (Stop)
+ """
+ slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ server = self.server_proxy_from_opts(opts)
+ return server.Stop(slice_urn, creds)
+
+ # reset named slice
+ def reset(self, opts, args):
+ """
+ reset named slice (reset_slice)
+ """
+ slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ server = self.server_proxy_from_opts(opts)
+ slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ return server.reset_slice(creds, slice_urn)
+
+ def renew(self, opts, args):
+ """
+ renew slice (RenewSliver)
+ """
+ slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ server = self.server_proxy_from_opts(opts)
+ slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ time = args[1]
+
+ call_args = [slice_urn, creds, time]
+ if self.server_supports_options_arg(server):
+ options = {'call_id': unique_call_id()}
+ call_args.append(options)
+ result = server.RenewSliver(*call_args)
+ value = ReturnValue.get_value(result)
+ return value
+
+
+ def shutdown(self, opts, args):
+ """
+ shutdown named slice (Shutdown)
+ """
+ slice_hrn = args[0]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
+ server = self.server_proxy_from_opts(opts)
+ return server.Shutdown(slice_urn, creds)
+
+
def get_ticket(self, opts, args):
+ """
+ get a ticket for the specified slice
+ """
slice_hrn, rspec_path = args[0], args[1]
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
user_cred = self.get_user_cred()
slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
+ creds = [slice_cred]
+ if opts.delegate:
+ delegated_cred = self.delegate_cred(slice_cred, get_authority(self.authority))
+ creds.append(delegated_cred)
rspec_file = self.get_rspec_file(rspec_path)
- 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 = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file, self.options.protocol)
- ticket_string = server.get_ticket(slice_cred, slice_hrn, rspec)
+ rspec = open(rspec_file).read()
+ server = self.server_proxy_from_opts(opts)
+ ticket_string = server.GetTicket(slice_urn, creds, rspec, [])
file = os.path.join(self.options.sfi_dir, get_leaf(slice_hrn) + ".ticket")
- print "writing ticket to ", file
+ self.logger.info("writing ticket to %s"%file)
ticket = SfaTicket(string=ticket_string)
ticket.save_to_file(filename=file, save_parents=True)
def redeem_ticket(self, opts, args):
+ """
+ Connects to nodes in a slice and redeems a ticket
+(slice hrn is retrieved from the ticket)
+ """
ticket_file = args[0]
# get slice hrn from the ticket
# use this to get the right slice credential
ticket = SfaTicket(filename=ticket_file)
ticket.decode()
- slice_hrn = ticket.attributes['slivers'][0]['hrn']
+ slice_hrn = ticket.gidObject.get_hrn()
+ slice_urn = hrn_to_urn(slice_hrn, 'slice')
+ #slice_hrn = ticket.attributes['slivers'][0]['hrn']
user_cred = self.get_user_cred()
slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
- # get a list node hostnames from the nodespecs in the rspec
- rspec = RSpec()
- rspec.parseString(ticket.rspec)
- nodespecs = rspec.getDictsByTagName('NodeSpec')
- hostnames = [nodespec['name'] for nodespec in nodespecs]
+ # get a list of node hostnames from the RSpec
+ tree = etree.parse(StringIO(ticket.rspec))
+ root = tree.getroot()
+ hostnames = root.xpath("./network/site/node/hostname/text()")
# create an xmlrpc connection to the component manager at each of these
# components and gall redeem_ticket
connections = {}
for hostname in hostnames:
try:
- cm_port = "12346"
- url = "https://%(hostname)s:%(cm_port)s" % locals()
- print "Calling get_ticket at %(url)s " % locals(),
- cm = xmlrpcprotocol.get_server(url, self.key_file, self.cert_file)
- cm.redeem_ticket(slice_cred, ticket.save_to_string(save_parents=True))
- print "Success"
+ self.logger.info("Calling redeem_ticket at %(hostname)s " % locals())
+ server = self.server_proxy(hostname, CM_PORT, self.key_file, \
+ self.cert_file, self.options.debug)
+ server.RedeemTicket(ticket.save_to_string(save_parents=True), slice_cred)
+ self.logger.info("Success")
except socket.gaierror:
- print "Failed:",
- print "Componet Manager not accepting requests"
+ self.logger.error("redeem_ticket failed: Component Manager not accepting requests")
except Exception, e:
- print "Failed:", e.message
-
+ self.logger.log_exc(e.message)
return
- # delete named slice
- def delete(self,opts, args):
- slice_hrn = args[0]
- server = self.slicemgr
- # direct connection to the nodes component manager interface
- if opts.component:
- server = self.get_component_server_from_hrn(opts.component)
-
- slice_cred = self.get_slice_cred(slice_hrn).save_to_string(save_parents=True)
- return server.delete_slice(slice_cred, slice_hrn)
-
- # start named slice
- def start(self,opts, args):
- slice_hrn = args[0]
- server = self.slicemgr
- # direct connection to the nodes component manager interface
- if opts.component:
- server = self.get_component_server_from_hrn(opts.component)
-
- slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
- return server.start_slice(slice_cred, slice_hrn)
-
- # stop named slice
- def stop(self,opts, args):
- slice_hrn = args[0]
- server = self.slicemgr
- # direct connection to the nodes component manager interface
- if opts.component:
- server = self.get_component_server_from_hrn(opts.component)
-
- slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
- return server.stop_slice(slice_cred, slice_hrn)
-
- # reset named slice
- def reset(self,opts, args):
- slice_hrn = args[0]
- server = self.slicemgr
- # direct connection to the nodes component manager interface
- if opts.component:
- server = self.get_component_server_from_hrn(opts.component)
- slice_cred = self.get_slice_cred(args[0]).save_to_string(save_parents=True)
- return server.reset_slice(slice_cred, slice_hrn)
-
- #
- # Main: parse arguments and dispatch to command
- #
- def main(self):
- 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,
- 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()
-
- try:
- self.dispatch(command, cmd_opts, cmd_args)
- except KeyError:
- raise
- print "Command not found:", command
+ def create_gid(self, opts, args):
+ """
+ Create a GID (CreateGid)
+ """
+ if len(args) < 1:
+ self.print_help()
sys.exit(1)
+ target_hrn = args[0]
+ user_cred = self.get_user_cred().save_to_string(save_parents=True)
+ gid = self.registry.CreateGid(user_cred, target_hrn, self.cert.save_to_string())
+ if opts.file:
+ filename = opts.file
+ else:
+ filename = os.sep.join([self.options.sfi_dir, '%s.gid' % target_hrn])
+ self.logger.info("writing %s gid to %s" % (target_hrn, filename))
+ GID(string=gid).save_to_file(filename)
+
+
+ def delegate(self, opts, args):
+ """
+ (locally) create delegate credential for use by given hrn
+ """
+ delegee_hrn = args[0]
+ if opts.delegate_user:
+ user_cred = self.get_user_cred()
+ cred = self.delegate_cred(user_cred, delegee_hrn)
+ elif opts.delegate_slice:
+ slice_cred = self.get_slice_cred(opts.delegate_slice)
+ cred = self.delegate_cred(slice_cred, delegee_hrn)
+ else:
+ self.logger.warning("Must specify either --user or --slice ")
+ return
+ delegated_cred = Credential(string=cred)
+ object_hrn = delegated_cred.get_gid_object().get_hrn()
+ if opts.delegate_user:
+ dest_fn = os.path.join(self.options.sfi_dir, get_leaf(delegee_hrn) + "_"
+ + get_leaf(object_hrn) + ".cred")
+ elif opts.delegate_slice:
+ dest_fn = os.path.join(self.options.sfi_dir, get_leaf(delegee_hrn) + "_slice_"
+ + get_leaf(object_hrn) + ".cred")
+
+ delegated_cred.save_to_file(dest_fn, save_parents=True)
+
+ self.logger.info("delegated credential for %s to %s and wrote to %s"%(object_hrn, delegee_hrn,dest_fn))
- return
-
-if __name__=="__main__":
- Sfi().main()
+ def get_trusted_certs(self, opts, args):
+ """
+ return uhe trusted certs at this interface (get_trusted_certs)
+ """
+ trusted_certs = self.registry.get_trusted_certs()
+ for trusted_cert in trusted_certs:
+ gid = GID(string=trusted_cert)
+ gid.dump()
+ cert = Certificate(string=trusted_cert)
+ self.logger.debug('Sfi.get_trusted_certs -> %r'%cert.get_subject())
+ return
+