Changeset 66bb590 for fedd/federation/client_lib.py

Timestamp:

Dec 10, 2010 9:03:35 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

52b6ebc

Parents:

913dc7a (diff), 8d5394e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/federation/client_lib.py (modified) (4 diffs)

fedd/federation/client_lib.py

@@ -10 +10 @@
 
 from fedid import fedid
-from util import fedd_ssl_context
+from util import fedd_ssl_context, file_expanding_opts
 from remote_service import service_caller
 from service_error import service_error
@@ -17 +17 @@
 
 
-class client_opts(OptionParser):
+class client_opts(file_expanding_opts):
     """
     Standatd set of options that all clients talking to fedd can probably use.
     Client code usually specializes this.
     """
+
     def __init__(self):
-        OptionParser.__init__(self, usage="%prog [opts] (--help for details)",
+        file_expanding_opts.__init__(self,
+                usage="%prog [opts] (--help for details)",
                 version="0.1")
 
-        self.add_option("--cert", action="store", dest="cert",
+        self.add_option("--cert", action="callback", dest="cert", 
+                callback=self.expand_file,
                 type="string", help="my certificate file")
-        self.add_option("--abac", action="store", dest="abac_dir",
-                type="string", help="Directory with abac certs")
+        self.add_option("--abac", action="callback", dest="abac_dir",
+                callback=self.expand_file,
+                type="string", default=os.path.expanduser('~/.abac'), 
+                help="Directory with abac certs")
+        self.add_option('--no_abac', action='store_const', const=None, 
+                dest='abac_dir', help='Do not use abac authorization')
         self.add_option( "--debug", action="count", dest="debug", 
                 default=0, help="Set debug.  Repeat for more information")
@@ -35 +42 @@
                 dest="serialize_only", default=False,
                 help="Print the SOAP request that would be sent and exit")
-        self.add_option("--trusted", action="store", dest="trusted",
+        self.add_option("--trusted", action="callback", dest="trusted",
+                callback=self.expand_file,
                 type="string", help="Trusted certificates (required)")
         self.add_option("--url", action="store", dest="url",
@@ -98 +106 @@
     '''
     rv = [ ]
-    if dir:
+    if dir and os.path.isdir(dir):
         for fn in ["%s/%s" % (dir, p) for p in os.listdir(dir) \
                 if os.path.isfile("%s/%s" % (dir,p))]: