Changeset 11053 in genesis

Timestamp:

May 31, 2012, 2:00:47 AM (13 years ago)

Author:

rick

Message:

Cleanups & Data verzamelen.

Nu we hier zijn, ook eens kijken naar de wl_release (svn version) of het image
was gedeployt is, dit zou wel eens makkelijk kunnen zijn om updates en versie
beheer van de nodes beter te administreren en detecteren.

Files:

• nodes/CNodeAJSoft2/wleiden.yaml (modified) (1 diff)
• nodes/CNodeHofwijck/wleiden.yaml (modified) (3 diffs)
• nodes/CNodeIMI/wleiden.yaml (modified) (1 diff)
• nodes/CNodeLijtweg1/wleiden.yaml (modified) (1 diff)
• nodes/CNodePVKerkDuif/wleiden.yaml (modified) (1 diff)
• nodes/CNodePlantsoen2/wleiden.yaml (modified) (1 diff)
• nodes/CNodeThomas/wleiden.yaml (modified) (1 diff)
• nodes/HybridHerman/wleiden.yaml (modified) (1 diff)
• nodes/HybridRick2/wleiden.yaml (modified) (1 diff)
• nodes/HybridRickVPN/wleiden.yaml (modified) (1 diff)
• tools/check-batch-cmd (modified) (4 diffs)

nodes/CNodeAJSoft2/wleiden.yaml

@@ -69 +69 @@
   ns_ip      : "172.16.6.42/29"
   ns_mac     : "00:15:6d:ea:f0:6a"
+  bridge_type: "NanoStation5"
   status     : "down"
 

nodes/CNodeHofwijck/wleiden.yaml

@@ -51 +51 @@
   ns_ip      : "172.16.6.26"
   ns_mac     : "00:15:6d:e8:e7:37"
+  bridge_type: "Bullet2"
   status     : "up"
 
@@ -67 +68 @@
   ns_ip      : "172.16.17.235/29"
   ns_mac     : "00:15:6d:f6:be:db"
+  bridge_type: "NanoStation5"
   status     : "up"
 
@@ -83 +85 @@
   ns_ip      : "172.16.3.107"
   ns_mac     : "00:15:6d:f7:be:d0"
+  bridge_type: "NanoStation5"
   status     : "up"
 

nodes/CNodeIMI/wleiden.yaml

@@ -42 +42 @@
   ns_ip      : "172.16.16.51/29"
   ns_mac     : "00:15:6D:70:54:A5"
+  bridge_type: "NanoStation5"
   status     : "up"
+
 
 iface_vr0:

nodes/CNodeLijtweg1/wleiden.yaml

@@ -42 +42 @@
   ns_ip      : "172.16.6.2"
   ns_mac     : "00:15:6d:e9:e7:20"
+  bridge_type: "Bullet2"
   status     : "up"
 

nodes/CNodePVKerkDuif/wleiden.yaml

@@ -58 +58 @@
   ns_ip      : "172.17.20.2/24"
   ns_mac     : "00:27:22:80:5a:b6"
+  bridge_type: "NanoStation M2"
   status     : "up"
 

nodes/CNodePlantsoen2/wleiden.yaml

@@ -87 +87 @@
   ns_ip      : "172.16.5.91/29"
   ns_mac     : "00:15:6d:bd:67:ff"
+  bridge_type: "NanoStation5"
   status     : "up"
 

nodes/CNodeThomas/wleiden.yaml

@@ -68 +68 @@
   ns_ip      : "172.16.16.50/29"
   ns_mac     : "00:15:6d:70:52:5c"
+  bridge_type: "NanoStation5"
   status     : "up"
 

nodes/HybridHerman/wleiden.yaml

@@ -32 +32 @@
 service_proxy_normal: False
 status    : "planned"
+wl_release: 10805
 
 

nodes/HybridRick2/wleiden.yaml

@@ -27 +27 @@
 service_proxy_normal: True
 status    : "up"
+wl_release: 11047
 
 

nodes/HybridRickVPN/wleiden.yaml

@@ -28 +28 @@
 service_vpn_server: True
 status    : "up"
+wl_release: 10915
 
 

tools/check-batch-cmd

@@ -11 +11 @@
 import os
 import paramiko
+import subprocess
 import socket
 import sys
@@ -69 +70 @@
       raise CmdError((stderr, stdout))
     return stdout
-  except socket.error, e:
+  except (socket.error, paramiko.AuthenticationException) as e:
     raise ConnectError(e)
 
@@ -95 +96 @@
 
 def node_check(host):
+  """ Using multiple connect methods to do some basic health checking as well"""
+
   print "# Processing host", host
   datadump = gformat.get_yaml(host)
@@ -125 +128 @@
       except CmdError, e: 
         print "### Command error: %s" % e
+
+  try:
+    wl_release = subprocess.check_output(['snmpget', '-Oq', '-Ov',  '-c', 'public', '-v2c',
+      host, 'UCD-SNMP-MIB::ucdavis.84.4.1.2.6.119.108.45.118.101.114.1'])
+    datadump['wl_release'] = int(wl_release.replace('"',''))
+  except subprocess.CalledProcessError, ValueError:
+    pass
   gformat.store_yaml(datadump)