Changeset 10375 in genesis for tools

Timestamp:

Apr 7, 2012, 11:31:53 AM (13 years ago)

Author:

rick

Message:

long v.s. lat v.s. order = weird....

File:

• tools/make-network-kml.py (modified) (4 diffs)

tools/make-network-kml.py

@@ -15 +15 @@
 OUTFILE = os.path.join(os.getcwd(),'network.kml')
 
-store = yaml.load(open('store.yaml','r'))
+try:
+  store = yaml.load(open('store.yaml','r'))
+except IOError:
+  store = None
 
 
@@ -28 +31 @@
     <description>%(nodename)s</description>
     <Point>
-      <coordinates>%(latitude)s,%(longitude)s,0</coordinates>
+      <coordinates>%(longitude)s,%(latitude)s,0</coordinates>
     </Point>
   </Placemark>
@@ -37 +40 @@
       <LineString>
         <coordinates>
-          %(latitudeA)s,%(longitudeA)s,0
-          %(latitudeB)s,%(longitudeB)s,0
+          %(longitudeA)s,%(latitudeA)s,0
+          %(longitudeB)s,%(latitudeB)s,0
         </coordinates>
       </LineString>
@@ -86 +89 @@
           nodename = datadump['nodename']
           INTERVAL = 60 * 10
-          if store['uptime'].has_key(nodename) and store['snmp'].has_key(nodename) and store['traffic'].has_key(nodename):
-            if store['traffic'][nodename].has_key(iface):
+          if store and store['uptime'].has_key(nodename) and store['snmp'].has_key(nodename) and store['traffic'].has_key(nodename):
+            if store and store['traffic'][nodename].has_key(iface):
               (b_in, b_out) = store['traffic'][nodename][iface]
               uptime = store['uptime'][nodename]