Details
-
Type: Improvement
-
Status: Resolved
-
Priority: Major
-
Resolution: Fixed
-
Affects Version/s: 0.7(4)
-
Fix Version/s: None
-
Component/s: SA
-
Labels:
-
Difficulty:Medium
Description
Заменить регэксп с
rx_vrp5line = re.compile(r"^(?P<mac>\S+)\s+(?P<vlan_id>\d+)\s+(?:\S+)\s+(?:\S+)\s+(?P<interfaces>\S+)\s+(?P<type>dynamic|static|security)\s+")
на
rx_vrp5line = re.compile(r"^(?P<mac>\S+)\s+(?P<vlan_id>\d+)(?:\s+|/)\-\s+(?:\-\s+)?(?P<interfaces>\S+)\s+(?P<type>dynamic|static|security)(?:\s+\-)?")
В файле
/sa/profiles/Huawei/VRP/get_mac_address_table.py
В версии софта r006 формат вывод мак адресов поменялся на
<33-Vost8p3>dis mac-address ------------------------------------------------------------------------------- MAC Address VLAN/VSI Learned-From Type ------------------------------------------------------------------------------- 0025-9e97-cf18 101/- GE0/0/1 dynamic 0008-dce2-2c59 102/- Eth0/0/24 security 0025-9e97-cf18 102/- GE0/0/1 dynamic 5c5e-ab08-10a8 1503/- GE0/0/1 dynamic 0025-9e8c-26fb 1603/- GE0/0/1 dynamic 5c5e-ab08-10a8 1603/- GE0/0/1 dynamic 0019-dbc2-f188 3042/- GE0/0/1 dynamic
а был
33-Zavod1p3]dis mac-address MAC address table of slot 0: ------------------------------------------------------------------------------- MAC Address VLAN/ PEVLAN CEVLAN Port Type LSP/LSR-ID VSI/SI MAC-Tunnel ------------------------------------------------------------------------------- 10bf-4877-85e1 3011 - - Eth0/0/6 security - 000a-e4e4-8b17 3011 - - Eth0/0/14 security -
Замена строки регэкспа позволяте получать мак адреса с прошивки r005 (старой) и новой r006