git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ee849c3
)
add 'description' arg to _record_dict()
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 19 Mar 2012 23:30:07 +0000
(19:30 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Mon, 19 Mar 2012 23:30:07 +0000
(19:30 -0400)
sfa/clientbin/sfaadmin.py
patch
|
blob
|
history
diff --git
a/sfa/clientbin/sfaadmin.py
b/sfa/clientbin/sfaadmin.py
index
19aa5eb
..
bb58634
100755
(executable)
--- a/
sfa/clientbin/sfaadmin.py
+++ b/
sfa/clientbin/sfaadmin.py
@@
-64,8
+64,8
@@
class RegistryCommands(Commands):
save_records_to_file(outfile, records)
save_records_to_file(outfile, records)
- def _record_dict(self, xrn, type=None, url=None, key=None, \
- slices='', researchers=''):
+ def _record_dict(self, xrn
=None
, type=None, url=None, key=None, \
+
description=None,
slices='', researchers=''):
record_dict = {}
if xrn:
if type:
record_dict = {}
if xrn:
if type:
@@
-87,6
+87,8
@@
class RegistryCommands(Commands):
record_dict['slices'] = slices
if researchers:
record_dict['researchers'] = researchers
record_dict['slices'] = slices
if researchers:
record_dict['researchers'] = researchers
+ if description:
+ record_dict['description'] = description
return record_dict
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn')
return record_dict
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn')
@@
-105,7
+107,8
@@
class RegistryCommands(Commands):
default='', type="str", action='callback', callback=optparse_listvalue_callback)
def register(self, xrn, type=None, url=None, description=None, key=None, slices='',
pis='', researchers=''):
default='', type="str", action='callback', callback=optparse_listvalue_callback)
def register(self, xrn, type=None, url=None, description=None, key=None, slices='',
pis='', researchers=''):
- record_dict = self._record_dict(xrn, type, url, key, slices, researchers)
+ record_dict = self._record_dict(xrn=xrn, type=type, url=url, key=key,
+ slices=slices, researchers=researchers)
self.api.manager.Register(self.api, record_dict)
self.api.manager.Register(self.api, record_dict)
@@
-125,7
+128,8
@@
class RegistryCommands(Commands):
default='', type="str", action='callback', callback=optparse_listvalue_callback)
def update(self, xrn, type=None, url=None, description=None, key=None, slices='',
pis='', researchers=''):
default='', type="str", action='callback', callback=optparse_listvalue_callback)
def update(self, xrn, type=None, url=None, description=None, key=None, slices='',
pis='', researchers=''):
- record_dict = self._record_dict(xrn, type, url, key, slices, researchers)
+ record_dict = self._record_dict(xrn=xrn, type=type, url=url, description=description,
+ key=key, slices=slices, researchers=researchers)
self.api.manager.Update(self.api, record_dict)
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn')
self.api.manager.Update(self.api, record_dict)
@args('-x', '--xrn', dest='xrn', metavar='<xrn>', help='object hrn/urn')