r3987 vrp55Read8021QConfig(): VRP 5.70 added back "XG" interfaces, which VRP 5.50...

diff --git a/ChangeLog b/ChangeLog
index dce032886107eb9d1c0de141478765e5d4be17ac..737a77e4c6a1a04a6118d94bcc5479551a0ae926 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
        update: another round of SNMP enhancements
        update: tag "quick list" redesign (by Alexey Andrianov)
        update: disable knight button for a filtered IPv4 tree view
+       update: initial support of VRP version 5.70
        new feature: enable IMS caching of progress bars (by Alexey Andrianov)
        new feature: rebuild tag filter as soon as user changes it (by Alexey Andrianov)
        new feature: default SLB configuration lines stored in DB (by Alexey Andrianov)

diff --git a/inc/gateways.php b/inc/gateways.php
index 7cb20c4fe972b39f779c2457a2f0caa51dcf4f92..a76aa76e4e47a7b7a7ff2ba84b7aec7d888a567b 100644 (file)
--- a/inc/gateways.php
+++ b/inc/gateways.php
@@ -1042,8 +1042,9 @@ function vrp55Read8021QConfig ($input)
                                foreach (vrp53ParseVLANString ($matches[1]) as $vlan_id)
                                        $ret['vlanlist'][] = $vlan_id;
                                continue 2;
-                       case (preg_match ('@^interface ((GigabitEthernet|Eth-Trunk)([[:digit:]]+(/[[:digit:]]+)*))$@', $line, $matches)):
+                       case (preg_match ('@^interface ((GigabitEthernet|XGigabitEthernet|Eth-Trunk)([[:digit:]]+(/[[:digit:]]+)*))$@', $line, $matches)):
                                $matches[1] = preg_replace ('@^GigabitEthernet(.+)$@', 'gi\\1', $matches[1]);
+                               $matches[1] = preg_replace ('@^XGigabitEthernet(.+)$@', 'xg\\1', $matches[1]);
                                $ret['current'] = array ('port_name' => $matches[1]);
                                continue 2;
                        default: