Changeset 10041 in genesis for tools

Timestamp:

Mar 6, 2012, 2:12:00 PM (13 years ago)

Author:

rick

Message:

Do not chdir as it confuses storing files without an prefix in the WC.

Location:

tools

Files:

• get-link-traffic.py (modified) (1 diff)
• gformat.py (modified) (2 diffs)

tools/get-link-traffic.py

@@ -154 +154 @@
   store = {'snmp' : dict(m_snmp), 'traffic' : dict(m_traffic), 'uptime' : dict(m_uptime)}
   yaml.dump(store,open(DATASTORE,'w'))
+  logger.info("Stored data at %s" % DATASTORE)
 
 

tools/gformat.py

@@ -67 +67 @@
 def get_proxylist():
   """Get all available proxies proxyX sorting based on X number"""
-  os.chdir(NODE_DIR)
-  proxylist = sorted(glob.glob("proxy*"),
+  proxylist = sorted([os.path.basename(x) for x in glob.glob("%s/proxy*" % NODE_DIR)],
                 key=lambda name: int(''.join([c for c in name if c in string.digits])),
                 cmp=lambda x,y: x - y)
@@ -82 +81 @@
 def get_nodelist():
   """ Get all available nodes - sorted """
-  os.chdir(NODE_DIR)
-  nodelist = sorted(glob.glob("CNode*"))
+  nodelist = sorted([os.path.basename(x) for x in glob.glob("%s/CNode*" % NODE_DIR)])
   return nodelist