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
'person' should be 'persons'
[sfa.git]
/
sfa
/
plc
/
sfaImport.py
diff --git
a/sfa/plc/sfaImport.py
b/sfa/plc/sfaImport.py
index
c843272
..
cbfec5c
100644
(file)
--- a/
sfa/plc/sfaImport.py
+++ b/
sfa/plc/sfaImport.py
@@
-144,7
+144,7
@@
class sfaImport:
# get the user's private key from the SSH keys they have uploaded
# to planetlab
# get the user's private key from the SSH keys they have uploaded
# to planetlab
- keys = s
hell.GetKeys(
plc_auth, key_ids)
+ keys = s
elf.shell.GetKeys(self.
plc_auth, key_ids)
key = keys[0]['key']
pkey = convert_public_key(key)
else:
key = keys[0]['key']
pkey = convert_public_key(key)
else:
@@
-191,7
+191,7
@@
class sfaImport:
def import_node(self, parent_hrn, node):
AuthHierarchy = self.AuthHierarchy
def import_node(self, parent_hrn, node):
AuthHierarchy = self.AuthHierarchy
- nodename = node['hostname'].
split(".")[0]
+ nodename = node['hostname'].
replace(".", "_")
nodename = cleanup_string(nodename)
if not nodename:
nodename = cleanup_string(nodename)
if not nodename:
@@
-297,8
+297,7
@@
class sfaImport:
else:
return
else:
return
- auth_name = self.get_auth_table(hrn)
- table = self.AuthHierarchy.get_auth_table(auth_name)
+ table = self.get_auth_table(parent_hrn)
record_list = table.resolve(type, hrn)
if not record_list:
return
record_list = table.resolve(type, hrn)
if not record_list:
return