From: root <root@blitz.inria.fr>
Date: Mon, 28 Mar 2011 20:52:42 +0000 (+0200)
Subject: Merge commit 'origin/master'
X-Git-Tag: sfa-1.0-21-ckp1~74^2~40^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=140300a38da236f8c88f2a85fd1699d300fa9024;hp=-c;p=sfa.git

Merge commit 'origin/master'
---

140300a38da236f8c88f2a85fd1699d300fa9024
diff --combined sfa/plc/network.py
index 5834f4f6,9388e082..d0e0e081
--- a/sfa/plc/network.py
+++ b/sfa/plc/network.py
@@@ -1,15 -1,13 +1,15 @@@
  from __future__ import with_statement
 +import sys
  import re
  import socket
 +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.xrn import get_authority
  from sfa.util.plxrn import hrn_to_pl_slicename, hostname_to_urn
 -from sfa.util.faults import *
 -from xmlbuilder import XMLBuilder
 -from lxml import etree
 -import sys
 -from StringIO import StringIO
  
  class Sliver:
      def __init__(self, node):
@@@ -349,6 -347,7 +349,7 @@@ class Network
          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
      
@@@ -568,8 -567,14 +569,14 @@@
          """
          tmp = []
          for node in api.plshell.GetNodes(api.plauth, {'peer_id': None}):
-             t = node['node_id'], Node(self, node)
-             tmp.append(t)
+             try:
+                 nodeObj = Node(self, node)
+                 if nodeObj.site != None:
+                     t = node['node_id'], nodeObj
+                     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):