import sys
import os, os.path
+import tempfile
from optparse import OptionParser
-from util.cert import Keypair, Certificate
-from util.credential import Credential
-from util.geniclient import GeniClient
+from geni.util.cert import Keypair, Certificate
+from geni.util.credential import Credential
+from geni.util.geniclient import GeniClient, ServerException
+from geni.util.gid import create_uuid
+from geni.util.record import GeniRecord
sfi_dir = os.path.expanduser("~/.sfi/")
slicemgr = None
def get_auth_cred():
global authority
- file = os.path.join(sfi_dir, "authority.cred")
+ if not authority:
+ print "no authority specified. Use -a or set SF_AUTH"
+ sys.exit(-1)
+
+ file = os.path.join(sfi_dir, get_leaf("authority") +".cred")
if (os.path.isfile(file)):
auth_cred = Credential(filename=file)
return auth_cred
if (os.path.isfile(file)):
return file
else:
- print "No such rspec file"
+ print "No such rspec file", rspec
sys.exit(1)
def get_record_file(record):
if (os.path.isfile(file)):
return file
else:
- print "No such registry record file"
+ print "No such registry record file", record
sys.exit(1)
+def load_publickey_string(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
#
# Generate sub-command parser
cmdargs = {"list": "name",
"show": "name",
"remove": "name",
- "add": "name record",
- "update": "name record",
+ "add": "record",
+ "update": "record",
"nodes": "[name]",
"slices": "",
"resources": "name",
% (command, cmdargs[command]))
if command in ("nodes", "resources"):
parser.add_option("-f", "--format", dest="format",type="choice",
- help="display format (dns|ip|hrn|rspec)",default="rspec",
- choices=("dns","ip","hrn","rspec"))
+ help="display format (dns|ip|rspec)",default="rspec",
+ choices=("dns","ip","rspec"))
if command in ("list", "show", "remove"):
parser.add_option("-t", "--type", dest="type",type="choice",
help="type filter (user|slice|sa|ma|node|aggregate)",
records = filter_records(opts.type, records)
if not records:
print "No record of type", opts.type
- display_records(records)
+ display_records(records, True)
if opts.file:
save_records_to_file(opts.file, records)
return
def add(opts, args):
global registry
auth_cred = get_auth_cred()
- rec_file = get_record_file(args[1])
- with open(rec_file) as f:
- record = f.read()
+ rec_file = get_record_file(args[0])
+ record = load_record_from_file(rec_file)
+
+ # check and see if we need to create a gid for this record. The creator
+ # of the record signals this by filling in the create_gid, create_gid_hrn,
+ # and create_gid_key members.
+ # (note: we'd use an unsigned GID in the record instead, but pyOpenSSL is
+ # broken and has no way for us to get the key back out of the gid)
+ geni_info = record.get_geni_info()
+ if "create_gid" in geni_info:
+ gid = registry.create_gid(auth_cred, geni_info["create_gid_hrn"], create_uuid(), geni_info["create_gid_key"])
+ record.set_gid(gid)
+
+ del geni_info["create_gid"]
+ del geni_info["create_gid_hrn"]
+ del geni_info["create_gid_key"]
+
return registry.register(auth_cred, record)
# update named registry entry
def update(opts, args):
global registry
user_cred = get_user_cred()
- rec_file = get_record_file(args[1])
- with open(rec_file) as f:
- record = f.read()
- return registry.update(user_cred, record)
+ rec_file = get_record_file(args[0])
+ record = load_record_from_file(rec_file)
+ if record.get_type() == "user":
+ if record.get_name() == user_cred.get_object_gid().get_hrn():
+ cred = user_cred
+ else:
+ create = get_auth_cred()
+ elif record.get_type() in ["slice"]:
+ try:
+ cred = get_slice_cred(record.get_name())
+ except ServerException, e:
+ if "PermissionError" in e.args[0]:
+ cred = get_auth_cred()
+ else:
+ raise
+ elif record.get_type() in ["sa", "ma", "node"]:
+ cred = get_auth_cred()
+ else:
+ raise "unknown record type" + record.get_type()
+ return registry.update(cred, record)
#
# Slice-related commands
def nodes(opts, args):
global slicemgr
user_cred = get_user_cred()
- if (len(args) == 0):
+ if not opts.format:
context = None
else:
- context = args[0]
- result = slicemgr.list_nodes(user_cred, context)
- display_rspec(opts.format, result)
+ context = opts.format
+ results = slicemgr.list_nodes(user_cred)
+ if opts.format in ['rspec']:
+ display_rspec(results)
+ else:
+ display_list(results)
if (opts.file is not None):
- save_rspec_to_file(opts.file, result)
+ rspec = slicemgr.list_nodes(user_cred)
+ save_rspec_to_file(rspec, opts.file)
return
# list instantiated slices
def slices(opts, args):
global slicemgr
user_cred = get_user_cred()
- result = slicemgr.list_slices(user_cred)
- display_rspec(opts.format, results)
+ results = slicemgr.list_slices(user_cred)
+ display_list(results)
return
# show rspec for named slice
def resources(opts, args):
global slicemgr
- slice_cred = get_slice_cred(args[0])
- result = slicemgr.get_slice_resources(slice_cred, args[0])
- display_rspec(opts.format, result)
+ if args:
+ slice_cred = get_slice_cred(args[0])
+ result = slicemgr.get_resources(slice_cred, args[0])
+ else:
+ user_cred = get_user_cred()
+ result = slicemgr.get_resources(user_cred)
+ display_rspec(result)
if (opts.file is not None):
save_rspec_to_file(opts.file, result)
return
# created named slice with given rspec
def create(opts, args):
global slicemgr
- slice_cred = get_slice_cred(args[0])
+ slice_hrn = args[0]
+ slice_cred = get_slice_cred(slice_hrn)
rspec_file = get_rspec_file(args[1])
with open(rspec_file) as f:
rspec = f.read()
- return slicemgr.create_slice(slice_cred, rspec)
+ return slicemgr.create_slice(slice_cred, slice_hrn, rspec)
# delete named slice
def delete(opts, args):
global slicemgr
- slice_cred = get_slice_cred(args[0])
- return slicemgr.delete_slice(slice_cred)
+ slice_hrn = args[0]
+ slice_cred = get_slice_cred(slice_hrn)
+
+ return slicemgr.delete_slice(slice_cred, slice_hrn)
# start named slice
def start(opts, args):
global slicemgr
- slice_cred = get_slice_cred(args[0])
+ slice_cred = get_slice_cred(args[0])
return slicemgr.start_slice(slice_cred)
# stop named slice
def stop(opts, args):
global slicemgr
- slice_cred = get_slice_cred(args[0])
+ slice_cred = get_slice_cred(args[0])
return slicemgr.stop_slice(slice_cred)
# reset named slice
def reset(opts, args):
global slicemgr
- slice_cred = get_slice_cred(args[0])
+ slice_cred = get_slice_cred(args[0])
return slicemgr.reset_slice(slice_cred)
#
#
#
-def display_rspec(format, rspec):
- print "display rspec"
+def display_rspec(rspec):
+ print rspec
return
-def save_rspec_to_file(file, rspec):
- print "save rspec"
+def display_list(results):
+ for result in results:
+ print result
+
+def save_rspec_to_file(rspec, filename):
+ if not filename.startswith(os.sep):
+ filename = sfi_dir + filename
+ if not filename.endswith(".rspec"):
+ filename = filename + ".rspec"
+
+ f = open(filename, 'w')
+ f.write(rspec)
+ f.close()
return
-def display_records(recordList):
+def display_records(recordList, dump = False):
for record in recordList:
- display_record(record)
+ display_record(record, dump)
-def display_record(record):
- record.dump(False)
+def display_record(record, dump = False):
+ if dump:
+ record.dump(False)
+ else:
+ info = record.getdict()
+ print "%s (%s)" % (info['hrn'], info['type'])
return
def filter_records(type, records):
index = index + 1
def save_record_to_file(filename, record):
- print "saving record", record.name, "to file", filename
+ if not filename.startswith(os.sep):
+ filename = sfi_dir + filename
str = record.save_to_string()
file(filename, "w").write(str)
return
+def load_record_from_file(filename):
+ str = file(filename, "r").read()
+ record = GeniRecord(string=str)
+ return record
+
if __name__=="__main__":
main()
git://git.onelab.eu / sfa.git / blobdiff