Merge branch 'upstreammaster'

[sfa.git] / sfa / plc / network.py

diff --git a/sfa/plc/network.py b/sfa/plc/network.py
index d0e0e08..5b2983b 100644 (file)
--- a/sfa/plc/network.py
+++ b/sfa/plc/network.py
@@ -6,8 +6,7 @@ from StringIO import StringIO
 from lxml import etree
 from xmlbuilder import XMLBuilder
 
-from sfa.util.faults import *
-#from sfa.util.sfalogging import sfa_logger
+from sfa.util.faults import InvalidRSpec
 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']))