return key_string
-
#
# Generate sub-command parser
#
cmdargs = {"list": "name",
"show": "name",
"remove": "name",
- "creategid": "hrn publickey_fn",
"add": "name record",
"update": "name record",
"nodes": "[name]",
help="type filter (user|slice|sa|ma|node|aggregate)",
choices=("user","slice","sa","ma","node","aggregate", "all"),
default="all")
- if command in ("show", "list", "nodes", "resources", "creategid"):
+ if command in ("show", "list", "nodes", "resources"):
parser.add_option("-o", "--output", dest="file",
help="output XML to file", metavar="FILE", default=None)
return parser
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
auth_cred = get_auth_cred()
return registry.remove(auth_cred, opts.type, args[0])
-def creategid(opts, args):
- global registry
- auth_cred = get_auth_cred()
- hrn = args[0]
- pkey_string = load_publickey_string(args[1])
- gid = registry.create_gid(auth_cred, hrn, create_uuid(), pkey_string)
- if (opts.file is not None):
- gid.save_to_file(opts.file, save_parents=True)
- else:
- print "I created your gid, but you did not ask me to save it"
-
# add named registry record
def add(opts, args):
global registry
auth_cred = get_auth_cred()
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 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, context)
+ 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, 'rspec')
+ 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)
+ result = slicemgr.list_resources(slice_cred, args[0])
+ 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):
#
#
-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):
+ if not filename.startswith(os.sep):
+ filename = sfi_dir + filename
print "saving record", record.name, "to file", filename
str = record.save_to_string()
file(filename, "w").write(str)
git://git.onelab.eu / sfa.git / blobdiff