update CLI handling and usage (SOFTWARE-5058)

Author: edquist

create_project.py

@@ -22,7 +22,7 @@
 
 
 _usage = f"""\
-usage: [PASS=...] {SCRIPT} [OPTIONS]
+usage: [PASS=...] {SCRIPT} [OPTIONS] COGroupNameOrId ProjectName
 
 OPTIONS:
   -u USER[:PASS]      specify USER and optionally PASS on command line
@@ -31,15 +31,10 @@
   -f passfile         specify path to file to open and read PASS
   -e ENDPOINT         specify REST endpoint
                         (default = {ENDPOINT})
-  -a                  show all UnixCluster autogroups, not just misnamed ones
-  -i COGroupId        show fixup info for a specific CO Group
-  -x COGroupId        run UnixCluster Group fixups for given CO Group Id
   -h                  display this help text
 
-Run without options to display misnamed UnixCluster autogroups.
-Run with -a to include UnixCluster autogroups with fixed names, too.
-Run with -i to display only a given CO Group.
-Run with -x to fixup a given CO Group.
+Adds an identifier of type ospoolproject named Yes-ProjectName to
+a COGroup based on its Name or CO Group Id.
 
 PASS for USER is taken from the first of:
   1. -u USER:PASS
@@ -61,9 +56,9 @@ class Options:
     osg_co_id = OSG_CO_ID
     user      = USER
     authstr   = None
-    fix_gid   = None
-    info_gid  = None
-    showall   = False
+    gid       = None
+    gname     = None
+    project   = None
 
 
 options = Options()
@@ -327,12 +322,19 @@ def fixup_unixcluster_group(gid):
 
 def parse_options(args):
     try:
-        ops, args = getopt.getopt(args, 'u:c:d:f:e:x:i:ah')
+        ops, args = getopt.getopt(args, 'u:c:d:f:e:h')
     except getopt.GetoptError:
         usage()
 
-    if args:
-        usage("Extra arguments: %s" % repr(args))
+    if len(args) != 2:
+        usage()
+
+    cogroup, project = args
+    if re.fullmatch(r'\d+', cogroup):
+        options.gid = int(cogroup)
+    else:
+        options.gname = cogroup
+    options.project = project
 
     passfd = None
     passfile = None
@@ -344,9 +346,6 @@ def parse_options(args):
         if op == '-d': passfd            = int(arg)
         if op == '-f': passfile          = arg
         if op == '-e': options.endpoint  = arg
-        if op == '-x': options.fix_gid   = int(arg)
-        if op == '-i': options.info_gid  = int(arg)
-        if op == '-a': options.showall   = True
 
     user, passwd = getpw(options.user, passfd, passfile)
     options.authstr = mkauthstr(user, passwd)
@@ -355,21 +354,18 @@ def parse_options(args):
 def main(args):
     parse_options(args)
 
-    if options.fix_gid:
-        return fixup_unixcluster_group(options.fix_gid)
-    elif options.showall:
-        show_all_unixcluster_groups()
-    elif options.info_gid:
-        show_one_unixcluster_group(options.info_gid)
-    else:
-        show_misnamed_unixcluster_groups()
+    if options.gname:
+        options.gid = gname_to_gid(options.gname)
 
-    return 0
+    add_project_identifier_to_group(options.gid, options.project)
+
+    # no exceptions, must have worked
+    print(":thumbsup:")
 
 
 if __name__ == "__main__":
     try:
-        sys.exit(main(sys.argv[1:]))
+        main(sys.argv[1:])
     except (RuntimeError, urllib.error.HTTPError) as e:
         print(e, file=sys.stderr)
         sys.exit(1)