r1358 + Cisco connector: tolerate switch ports in suspended state

diff --git a/ChangeLog b/ChangeLog
index 6b12642b0eb19f9203c07277bef9b8a2970f198b..bbaab53218a5a5dab7780314740481ba30a5782f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 0.14.8
        bugfix: adjusted hardcoded values in VLAN trigger
        bugfix: adjusted HW, SW and port types in SNMP data collector
+       bugfix: Cisco connector: tolerate switch ports in suspended state
 0.14.7 2007-12-05
        bugfix: provide better SQL dumps for new installations
        bugfix: gateways/switchvlans minor updates

diff --git a/gateways/switchvlans/cisco.connector b/gateways/switchvlans/cisco.connector
index 335fd51b85cb646f2d11ac721581a7dfe90a58f0..068ca2728101e74647dce051f0827da4ed66b9f9 100755 (executable)
--- a/gateways/switchvlans/cisco.connector
+++ b/gateways/switchvlans/cisco.connector
@@ -84,7 +84,7 @@ do_fetch()
        nc $ENDPOINT 23 < $CMDS2 > "$OUT2"
        nc $ENDPOINT 23 < $CMDS3 > "$OUT3"
        cat "$OUT1" | fgrep ' active    ' | sed -E 's/^([[:digit:]]+)[[:space:]]+(.+)[[:space:]]+active    (.*)/\1=\2/;s/[[:space:]]+$//' > $FILE1
-       cat "$OUT2" | egrep '^(Et|Fa|Gi|Te)' | sed -E 's/^([A-Za-z/0-9]+).+(connected|notconnect|disabled|monitoring) +/\1=\2,/;s/,(trunk|([0-9]+)) .*$/,\1/;s/=monitoring,/=connected,/' > $FILE2
+       cat "$OUT2" | egrep '^(Et|Fa|Gi|Te)' | sed -E 's/^([A-Za-z/0-9]+).+(connected|notconnect|disabled|monitoring|suspended) +/\1=\2,/;s/,(trunk|([0-9]+)) .*$/,\1/;s/=(monitoring|suspended),/=connected,/' > $FILE2
        # FIXME
        # Here we need to distinguish between different platforms and IOS version,
        # cause they produce output in different formats.