Commit 17fdcd50 authored by David Johnson's avatar David Johnson
Browse files

Fix little bugs in new synch-with-plc code.

parent 1059bfd0
...@@ -277,7 +277,7 @@ class XmlrpcNodeInfoFetcher: ...@@ -277,7 +277,7 @@ class XmlrpcNodeInfoFetcher:
pass pass
def getPlabNodeInfo(self): def getPlabNodeInfo(self,ignoreErrors=True):
nif = ['nodenetwork_ids','boot_status','hostname','site_id','node_id'] nif = ['nodenetwork_ids','boot_status','hostname','site_id','node_id']
ni = self.agent.getNodes(outfilter=nif) ni = self.agent.getNodes(outfilter=nif)
...@@ -718,10 +718,10 @@ class Plab: ...@@ -718,10 +718,10 @@ class Plab:
# Check for duplicate node attributes (sanity check) # Check for duplicate node attributes (sanity check)
availdups = self.__findDuplicateAttrs(avail) availdups = self.__findDuplicateAttrs(avail)
if len(availdups): if len(availdups):
SENDMAIL(TBOPS, "Duplicates in %s advertised node list", SENDMAIL(TBOPS, "Duplicates in %s advertised node list" % plc.name,
"Duplicate attributes:\n" "Duplicate attributes:\n"
"%s\n\n" "%s\n\n"
"Let plab support know!" % (plc.name,availdups), "Let plab support know!" % availdups,
TBOPS) TBOPS)
raise RuntimeError, \ raise RuntimeError, \
"Duplicate attributes in plab node listing:\n%s" % availdups "Duplicate attributes in plab node listing:\n%s" % availdups
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment