From d2ad391e985e62a693ecd0e2c3cc65ef0b97b27b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 30 Apr 2014 12:38:34 +0200 Subject: [PATCH] description was not passed to register email was not passed to update use consistent ordering --- sfa/client/sfaadmin.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py index a1b94764..2ddf609f 100755 --- a/sfa/client/sfaadmin.py +++ b/sfa/client/sfaadmin.py @@ -81,10 +81,9 @@ class RegistryCommands(Commands): save_records_to_file(outfile, records) - def _record_dict(self, xrn=None, type=None, - url=None, description=None, email='', - key=None, - slices=[], researchers=[], pis=[], extras={}): + def _record_dict(self, xrn=None, type=None, email='', key=None, + slices=[], researchers=[], pis=[], + url=None, description=None, extras={}): record_dict = {} if xrn: if type: @@ -202,11 +201,13 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"%(len(NOKEY help='Set/replace Principal Investigators/Project Managers', default='', type="str", action='callback', callback=optparse_listvalue_callback) @add_options('-X','--extra',dest='extras',default={},type='str',metavar="", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true") - def register(self, xrn, type=None, url=None, description=None, key=None, slices='', - pis='', researchers='',email='', extras={}): + def register(self, xrn, type=None, email='', key=None, + slices='', pis='', researchers='', + url=None, description=None, extras={}): """Create a new Registry record""" - record_dict = self._record_dict(xrn=xrn, type=type, url=url, key=key, - slices=slices, researchers=researchers, email=email, pis=pis, extras=extras) + record_dict = self._record_dict(xrn=xrn, type=type, email=email, key=key, + slices=slices, researchers=researchers, pis=pis, + url=url, description=description, extras=extras) self.api.manager.Register(self.api, record_dict) @@ -225,12 +226,13 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"%(len(NOKEY help='Set/replace Principal Investigators/Project Managers', default='', type="str", action='callback', callback=optparse_listvalue_callback) @add_options('-X','--extra',dest='extras',default={},type='str',metavar="", action="callback", callback=optparse_dictvalue_callback, nargs=1, help="set extra/testbed-dependent flags, e.g. --extra enabled=true") - def update(self, xrn, type=None, url=None, description=None, key=None, slices='', - pis='', researchers='', extras={}): + def update(self, xrn, type=None, email='', key=None, + slices='', pis='', researchers='', + url=None, description=None, extras={}): """Update an existing Registry record""" - print 'incoming PIS',pis - record_dict = self._record_dict(xrn=xrn, type=type, url=url, description=description, - key=key, slices=slices, researchers=researchers, pis=pis, extras=extras) + record_dict = self._record_dict(xrn=xrn, type=type, email=email, key=key, + slices=slices, researchers=researchers, pis=pis, + url=url, description=description, extras=extras) self.api.manager.Update(self.api, record_dict) @add_options('-x', '--xrn', dest='xrn', metavar='', help='object hrn/urn (mandatory)') -- 2.43.0