from geni.util.gid import GID
from geni.util.gid import create_uuid
-gidhrn = None
-gidkeyfile = None
+pubkeyfile = None
infile = None
outfile = None
gidfile = None
hrn = None
type = None
dump = False
+extractgid = None
researcher = []
-long_opts = ["infile=", "outfile=", "email=", "ip=", "dns=", "gidfile=", "gidhrn=", "gidkeyfile=", "hrn=", "type=", "addresearcher=", "delresearcher=", "dump"]
+long_opts = ["infile=", "outfile=", "email=", "ip=", "dns=", "gidfile=", "hrn=", "pubkeyfile=", "type=", "addresearcher=", "delresearcher=", "dump", "extractgid="]
def showhelp():
print "syntax: editRecord.py <options>"
print " --infile <name> ... read record from file"
print " --outfile <name> ... write record to file"
print " --dump ... dump record to stdout"
+ print " --extractgid <fn> ... extract GID to filename"
print " --gidfile <fn> ... load gid from file"
- print " --gidhrn <name> ... name to use when creating gid"
- print " --gidkeyfile <name> ... key to use when creating gid"
+ print " --pubkeyfile <name> ... key to use when creating gid"
print " --hrn <name> ... set hrn"
print " --type <type> ... set type (user|slice|sa|ma|...)"
print " --email <addr> ... user: set email address"
global infile, outfile
global email, ip, dns, gidfile, hrn, type
global researcher
- global dump
- global gidkeyfile, gidhrn
+ global dump, extractgid
+ global pubkeyfile
(options, args) = getopt.getopt(sys.argv[1:], '', long_opts)
for opt in options:
dns = val
elif name == "--gidfile":
gidfile = val
- elif name == "--gidhrn":
- gidhrn = val
- elif name == "--gidkeyfile":
- gidkeyfile = val
+ elif name == "--pubkeyfile":
+ pubkeyfile = val
elif name == "--hrn":
hrn = val
elif name == "--type":
type = val
elif name == "--dump":
dump = True
+ elif name == "--extractgid":
+ extractgid = val
elif name == "--addresearcher":
researcher.append(val)
elif name == "--delresearcher":
print "Warning: unknown record name"
if (not record.gid) and (not ("create_gid" in geni_info)):
print "Warning: unknown record gid"
+ print " use --hrn and --pubkeyfile to cause a gid to be created"
if record.type == "user":
- if not geni_info.get("email",None):
+ if geni_info.get("email", None) == None:
print "Warning: unknown email in user record"
if record.type == "node":
- if not geni_info.get("ip",None):
+ if geni_info.get("ip",None) == None:
print "Warning: unknown ip in node record"
- if not geni_info.get("dns",None):
+ if geni_info.get("dns",None) == None:
print "Warning: unknown dns in node record"
# updates is a list of items to add or remove. If an item starts with "-", then
if hrn.startswith("-"):
real_hrn = hrn[1:]
if real_hrn in list:
- list.delete(real_hrn)
+ list.remove(real_hrn)
+ else:
+ print "Error:", real_hrn, "is not in researcher list:", list
else:
if not hrn in list:
list.append(hrn)
# if the user didn't tell us to do much of anything, then maybe he needs
# some help
- if (not infile) and (not outfile) and (not dump):
+ if (not infile) and (not outfile) and (not dump) and (extractgid==None):
showhelp()
return
gid = GID(string=gid_str)
record.set_gid(gid)
- if gidhrn or gidkeyfile:
- if not gidhrn:
- print "must use --gidkeyfile with --gidhrn"
+ if pubkeyfile:
+ if gidfile:
+ print "You should not use --gidfile and --pubkeyfile together"
sys.exit(-1)
- if not gidkeyfile:
- print "must use --gidhrn with --gidkeyfile"
+
+ if not record.name:
+ print "You must specify --hrn when you specify --pubkeyfile"
sys.exit(-1)
- geni_info = record.get_geni_info()
geni_info["create_gid"] = True
- geni_info["create_gid_hrn"] = gidhrn
- geni_info["create_gid_key"] = load_publickey_string(gidkeyfile)
+ geni_info["create_gid_hrn"] = record.name
+ geni_info["create_gid_key"] = load_publickey_string(pubkeyfile)
if researcher:
update_list(geni_info, "researcher", researcher)
if dump:
record.dump(False)
+ if extractgid:
+ record.get_gid_object().save_to_file(extractgid, save_parents=True)
+ print "write GID to", extractgid
+
if outfile:
str = record.save_to_string()
file(outfile, "w").write(str)