git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first step to merge senslab upstream:
[sfa.git]
/
sfa
/
client
/
sfi.py
diff --git
a/sfa/client/sfi.py
b/sfa/client/sfi.py
index
30d6074
..
8f9682f
100644
(file)
--- a/
sfa/client/sfi.py
+++ b/
sfa/client/sfi.py
@@
-328,8
+328,8
@@
class Sfi:
("version", ""),
("list", "authority"),
("show", "name"),
("version", ""),
("list", "authority"),
("show", "name"),
- ("add", "
record
"),
- ("update", "
record
"),
+ ("add", "
[record]
"),
+ ("update", "
[record]
"),
("remove", "name"),
("slices", ""),
("resources", "[slice_hrn]"),
("remove", "name"),
("slices", ""),
("resources", "[slice_hrn]"),
@@
-931,7
+931,7
@@
or version information about sfi itself
return
def add(self, options, args):
return
def add(self, options, args):
- "add record into registry from xml file (Register)"
+ "add record into registry
by using the command options (Recommended) or
from xml file (Register)"
auth_cred = self.my_authority_credential_string()
if options.show_credential:
show_credentials(auth_cred)
auth_cred = self.my_authority_credential_string()
if options.show_credential:
show_credentials(auth_cred)
@@
-956,7
+956,7
@@
or version information about sfi itself
return self.registry().Register(record_dict, auth_cred)
def update(self, options, args):
return self.registry().Register(record_dict, auth_cred)
def update(self, options, args):
- "update record into registry from xml file (Update)"
+ "update record into registry
by using the command options (Recommended) or
from xml file (Update)"
record_dict = {}
if len(args) > 0:
record_filepath = args[0]
record_dict = {}
if len(args) > 0:
record_filepath = args[0]
@@
-1405,7
+1405,8
@@
or with an slice hrn, shows currently provisioned resources
self.print_help()
sys.exit(1)
target_hrn = args[0]
self.print_help()
sys.exit(1)
target_hrn = args[0]
- gid = self.registry().CreateGid(self.my_credential_string, target_hrn, self.client_bootstrap.my_gid_string())
+ my_gid_string = open(self.client_bootstrap.my_gid()).read()
+ gid = self.registry().CreateGid(self.my_credential_string, target_hrn, my_gid_string)
if options.file:
filename = options.file
else:
if options.file:
filename = options.file
else: