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
cosmetic
[sfa.git]
/
sfa
/
planetlab
/
plshell.py
diff --git
a/sfa/planetlab/plshell.py
b/sfa/planetlab/plshell.py
index
f42af88
..
42349f0
100644
(file)
--- a/
sfa/planetlab/plshell.py
+++ b/
sfa/planetlab/plshell.py
@@
-25,7
+25,10
@@
class PlShell:
'GetSites','GetNodes',
# Lease management methods
'GetLeases', 'GetLeaseGranularity', 'DeleteLeases','UpdateLeases',
'GetSites','GetNodes',
# Lease management methods
'GetLeases', 'GetLeaseGranularity', 'DeleteLeases','UpdateLeases',
- 'AddLeases'
+ 'AddLeases',
+ # HRN management methods
+ 'SetPersonHrn', 'GetPersonHrn', 'SetSliceHrn', 'GetSliceHrn',
+ 'SetNodeHrn', 'GetNodeHrn'
]
# support for other names - this is experimental
alias_calls = { 'get_authorities':'GetSites',
]
# support for other names - this is experimental
alias_calls = { 'get_authorities':'GetSites',
@@
-61,7
+64,7
@@
class PlShell:
except:
plc_direct_access=False
if is_local and plc_direct_access:
except:
plc_direct_access=False
if is_local and plc_direct_access:
- logger.
debug
('plshell access - capability')
+ logger.
info
('plshell access - capability')
self.plauth = { 'AuthMethod': 'capability',
'Username': config.SFA_PLC_USER,
'AuthString': config.SFA_PLC_PASSWORD,
self.plauth = { 'AuthMethod': 'capability',
'Username': config.SFA_PLC_USER,
'AuthString': config.SFA_PLC_PASSWORD,
@@
-69,7
+72,7
@@
class PlShell:
self.proxy = PLC.Shell.Shell ()
else:
self.proxy = PLC.Shell.Shell ()
else:
- logger.
debug
('plshell access - xmlrpc')
+ logger.
info
('plshell access - xmlrpc')
self.plauth = { 'AuthMethod': 'password',
'Username': config.SFA_PLC_USER,
'AuthString': config.SFA_PLC_PASSWORD,
self.plauth = { 'AuthMethod': 'password',
'Username': config.SFA_PLC_USER,
'AuthString': config.SFA_PLC_PASSWORD,