X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Fnetwork.py;h=9276fb0f3f856aac02299fdec9ba6bb7775b3f06;hb=db091e73c33c373b7f6c2c96bd2caf6a2acf0178;hp=d0e0e081b66686f85c4afde5a2e11c21808bc78d;hpb=140300a38da236f8c88f2a85fd1699d300fa9024;p=sfa.git

diff --git a/sfa/plc/network.py b/sfa/plc/network.py
index d0e0e081..9276fb0f 100644
--- a/sfa/plc/network.py
+++ b/sfa/plc/network.py
@@ -7,7 +7,6 @@ from lxml import etree
 from xmlbuilder import XMLBuilder
 
 from sfa.util.faults import *
-#from sfa.util.sfalogging import sfa_logger
 from sfa.util.xrn import get_authority
 from sfa.util.plxrn import hrn_to_pl_slicename, hostname_to_urn
 
@@ -474,6 +473,10 @@ class Network:
             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
@@ -570,10 +573,8 @@ class Network:
         tmp = []
         for node in api.plshell.GetNodes(api.plauth, {'peer_id': None}):
             try:
-                nodeObj = Node(self, node)
-                if nodeObj.site != None:
-                    t = node['node_id'], nodeObj
-                    tmp.append(t)
+                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']))