git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get rid of svn keywords once and for good
[plcapi.git]
/
PLC
/
Methods
/
BootGetNodeDetails.py
diff --git
a/PLC/Methods/BootGetNodeDetails.py
b/PLC/Methods/BootGetNodeDetails.py
index
0e8f710
..
afc7b0c
100644
(file)
--- a/
PLC/Methods/BootGetNodeDetails.py
+++ b/
PLC/Methods/BootGetNodeDetails.py
@@
-2,7
+2,7
@@
from PLC.Method import Method
from PLC.Parameter import Parameter, Mixed
from PLC.Auth import BootAuth
from PLC.Nodes import Node, Nodes
from PLC.Parameter import Parameter, Mixed
from PLC.Auth import BootAuth
from PLC.Nodes import Node, Nodes
-from PLC.
NodeNetworks import NodeNetwork, NodeNetwork
s
+from PLC.
Interfaces import Interface, Interface
s
from PLC.Sessions import Session, Sessions
class BootGetNodeDetails(Method):
from PLC.Sessions import Session, Sessions
class BootGetNodeDetails(Method):
@@
-19,7
+19,7
@@
class BootGetNodeDetails(Method):
'hostname': Node.fields['hostname'],
'boot_state': Node.fields['boot_state'],
'model': Node.fields['model'],
'hostname': Node.fields['hostname'],
'boot_state': Node.fields['boot_state'],
'model': Node.fields['model'],
- 'networks': [
NodeNetwork
.fields],
+ 'networks': [
Interface
.fields],
'session': Session.fields['session_id'],
}
'session': Session.fields['session_id'],
}
@@
-38,8
+38,8
@@
class BootGetNodeDetails(Method):
details['session'] = session['session_id']
details['session'] = session['session_id']
- if self.caller['
nodenetwork
_ids']:
- details['networks'] =
NodeNetworks(self.api, self.caller['nodenetwork
_ids'])
+ if self.caller['
interface
_ids']:
+ details['networks'] =
Interfaces(self.api, self.caller['interface
_ids'])
# XXX Boot Manager cannot unmarshal None
for network in details['networks']:
for field in network:
# XXX Boot Manager cannot unmarshal None
for network in details['networks']:
for field in network:
@@
-49,5
+49,6
@@
class BootGetNodeDetails(Method):
else:
network[field] = ""
else:
network[field] = ""
+ self.message = "Node request boot_state (%s) and networks" % \
+ (details['boot_state'])
return details
return details
-