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
Added parsing.py
[sfa.git]
/
sfa
/
plc
/
network.py
diff --git
a/sfa/plc/network.py
b/sfa/plc/network.py
index
5834f4f
..
203d321
100644
(file)
--- a/
sfa/plc/network.py
+++ b/
sfa/plc/network.py
@@
-349,6
+349,7
@@
class Network:
try:
val = self.sites[id]
except:
try:
val = self.sites[id]
except:
+ self.api.logger.error("Invalid RSpec: site ID %s not found" % id )
raise InvalidRSpec("site ID %s not found" % id)
return val
raise InvalidRSpec("site ID %s not found" % id)
return val
@@
-473,6
+474,10
@@
class Network:
if not relaxng(tree):
error = relaxng.error_log.last_error
message = "%s (line %s)" % (error.message, error.line)
if not relaxng(tree):
error = relaxng.error_log.last_error
message = "%s (line %s)" % (error.message, error.line)
+ self.api.logger.error("failed to validate rspec %r"%message)
+ self.api.logger.debug("---------- XML input BEG")
+ self.api.logger.debug(xml)
+ self.api.logger.debug("---------- XML input END")
raise InvalidRSpec(message)
self.rspec = rspec
raise InvalidRSpec(message)
self.rspec = rspec
@@
-568,8
+573,12
@@
class Network:
"""
tmp = []
for node in api.plshell.GetNodes(api.plauth, {'peer_id': None}):
"""
tmp = []
for node in api.plshell.GetNodes(api.plauth, {'peer_id': None}):
- t = node['node_id'], Node(self, node)
- tmp.append(t)
+ try:
+ t = node['node_id'], Node(self, node)
+ tmp.append(t)
+ except:
+ self.api.logger.error("Failed to add node %s (%s) to RSpec" % (node['hostname'], node['node_id']))
+
return dict(tmp)
def get_ifaces(self, api):
return dict(tmp)
def get_ifaces(self, api):