r1896 + handle "routed" switch ports
authorDenis Ovsienko <infrastation@yandex.ru>
Tue, 22 Apr 2008 07:59:20 +0000 (07:59 +0000)
committerDenis Ovsienko <infrastation@yandex.ru>
Tue, 22 Apr 2008 07:59:20 +0000 (07:59 +0000)
ChangeLog
gateways/switchvlans/cisco.connector
inc/interface.php

index 7d97d88b4674d07ebe07311864010698f0aa45f7..d0f11d35c5517515c39017b4318d2f5c1a8a6813 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
        update: async port type has been split
        update: don't allow duplicate rack names in one row
        update: internal help system has been dropped
+       update: handle "routed" switch ports
        bugfix: make switchvlans gateway work on Linux
 0.14.12 2008-02-29
        new feature: default value for RS inservice status
index 0f4902fd956fbe71c879b7d9c0b8490a9cb4ffa4..636e3c4187b55f23d4ac655da5bb7db8b6367072 100755 (executable)
@@ -112,7 +112,7 @@ do_fetch()
 
        # First extract structured info about VLAN membership, then map
        # special descriptions into VLAN IDs.
-       cat "$OUT2a" | egrep '^(Et|Fa|Gi|Te)' | sed $SEDFLAG 's/^([A-Za-z/0-9]+) +(.*) +(connected|notconnect|disabled|err-disabled|monitoring|suspended) +/\1~\2%\3%/;s/%(trunk|([0-9]+)) .*$/%\1/;s/%(monitoring|suspended)%/%connected%/;s/%err-disabled%/%disabled%/;s/ +%/%/;s/~/%/' > $OUT2b
+       cat "$OUT2a" | egrep '^(Et|Fa|Gi|Te)' | sed $SEDFLAG 's/^([A-Za-z/0-9]+) +(.*) +(connected|notconnect|disabled|err-disabled|monitoring|suspended) +/\1~\2%\3%/;s/%(trunk|routed|([0-9]+)) .*$/%\1/;s/%(monitoring|suspended)%/%connected%/;s/%(err-disabled)%/%disabled%/;s/ +%/%/;s/~/%/' > $OUT2b
        while read line; do
                tmp_ifname=`echo $line | cut -d% -f1`
                tmp_ifdescr=`echo $line | cut -d% -f2`
index 8e2996f474f6b8d04fc990381e8256c518a1b194..afd62dfa4da61819b4a4d03180eb3e6401279419 100644 (file)
@@ -3652,6 +3652,11 @@ function renderVLANMembership ($object_id = 0)
                        echo "<input type=hidden name=vlanid_${portno} value='trunk'>";
                        echo "<select disabled multiple='multiple' size=1><option>TRUNK</option></select>";
                }
+               elseif ($port['vlanid'] == 'routed')
+               {
+                       echo "<input type=hidden name=vlanid_${portno} value='routed'>";
+                       echo "<select disabled multiple='multiple' size=1><option>ROUTED</option></select>";
+               }
                else
                {
                        echo "<select name=vlanid_${portno}>";