made changes to phase out GenerateHostInfo and Hostinfo.xml file. now uses clients.xml metadata file for ping info

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1660 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 0 insertions, 10 deletions

diff --git a/src/sbin/StatReports b/src/sbin/StatReports
index d08d38a57..cb74eb4bb 100644
--- a/src/sbin/StatReports
+++ b/src/sbin/StatReports
@@ -150,7 +150,6 @@ if __name__ == '__main__':
     c.read(['/etc/bcfg2.conf'])
     configpath = "%s/etc/report-configuration.xml" % c.get('server', 'repository')
     statpath = "%s/etc/statistics.xml" % c.get('server', 'repository')
-    hostinfopath = "%s/etc/hostinfo.xml" % c.get('server', 'repository')
     clientsdatapath = "%s/Metadata/clients.xml" % c.get('server', 'repository')
     transformpath = "/usr/share/bcfg2/xsl-transforms/"
     #websrcspath = "/usr/share/bcfg2/web-rprt-srcs/"
@@ -196,12 +195,6 @@ if __name__ == '__main__':
     except (IOError, XMLSyntaxError):
         print("StatReports: Failed to parse %s"%(clientsdatapath))
         raise SystemExit, 1
-    try:
-        hostinfodata = XML(open(hostinfopath).read())
-    except (IOError, XMLSyntaxError):
-        print("StatReports: Failed to parse %s. Is GenerateHostInfo in your path?"%(hostinfopath))
-        raise SystemExit, 1
-
 
     #Merge data from three sources
     nodereport = Element("Report", attrib={"time" : asctime()})
@@ -212,9 +205,6 @@ if __name__ == '__main__':
     for client in clientsdata.findall("Client"):
         nodel = Element("Node", attrib={"name" : client.get("name")})
         nodel.append(client)
-        for hostinfo in hostinfodata.findall("HostInfo"):
-            if hostinfo.get("name") == client.get("name"):
-                nodel.append(hostinfo)
 
         for nod in statsdata.findall("Node"):
             if client.get('name').find(nod.get('name')) == 0: