diff --git a/ntc_templates/templates/huawei_vrp_display_acl_all.textfsm b/ntc_templates/templates/huawei_vrp_display_acl_all.textfsm index 1845c472d1..ee3937f0a5 100644 --- a/ntc_templates/templates/huawei_vrp_display_acl_all.textfsm +++ b/ntc_templates/templates/huawei_vrp_display_acl_all.textfsm @@ -14,7 +14,8 @@ Value MATCHES (\d+) Start ^\s*Total\squantity\sof\snonempty\sACL\snumber\sis\s\d+\s*$$ ^\s*Total\snonempty\sacl6\snumber\sis\s\d+\s*$$ - ^\S+(\sIPv6)?\sACL\s(${ACL_NAME}\s)?${ACL_NUMBER},\s\d+.*$$ + ^\S+\sIPv6\sACL\s${ACL_NUMBER}(\sname\s${ACL_NAME})?,\s\d+.*$$ + ^\S+\sACL\s(${ACL_NAME}\s)?${ACL_NUMBER},\s\d+.*$$ ^\s*Acl's\sstep\sis\s\d+\s*$$ ^\s*rule\s${SN}\s${ACTION}(\s${PROTOCOL})?(\ssource\s${SOURCE})?(\ssource-port\s${SOURCE_PORT_MODIFIER}\s${SOURCE_PORT_RANGE})?(\sdestination\s${DESTINATION})?(\sdestination-port\s${DESTINATION_PORT_MODIFIER}\s${DESTINATION_PORT_RANGE})?(\s\(${MATCHES}\smatch(es)?\))?\s*$$ -> Record ^\s*$$ diff --git a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.raw b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.raw index 94e2b59260..622e0f45e4 100644 --- a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.raw +++ b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.raw @@ -14,6 +14,10 @@ Basic ACL 2500, 1 rule Acl's step is 5 rule 35 permit source 192.168.0.0 0.0.255.255 (5431 matches) +Advanced ACL 3997, 1 rule +Acl's step is 5 + rule 5 permit ip source 192.165.3.5 0 + Advanced ACL REGLE_NAT 3998, 3 rules Acl's step is 5 rule 5 permit tcp source 85.14.167.234 0 destination 192.214.198.156 0 destination-port eq 8022 (18 matches) diff --git a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.yml b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.yml index 31f9759c71..1aa1fa3bde 100644 --- a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.yml +++ b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_all_1.yml @@ -96,6 +96,18 @@ parsed_sample: destination_port_modifier: "" destination_port_range: "" matches: "5431" + - acl_name: "" + acl_number: "3997" + sn: "5" + action: "permit" + protocol: "ip" + source: "192.165.3.5 0" + source_port_modifier: "" + source_port_range: "" + destination: "" + destination_port_modifier: "" + destination_port_range: "" + matches: "" - acl_name: "REGLE_NAT" acl_number: "3998" sn: "5" diff --git a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.raw b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.raw index 32cac98cfa..526dd857d1 100644 --- a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.raw +++ b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.raw @@ -3,3 +3,8 @@ Advanced IPv6 ACL 3344, 1 rule, match-order is auto Acl's step is 5 rule 5 permit ipv6 destination 34::/128 + +Advanced IPv6 ACL 3999 name MyACL_IPv6, 2 rules +Acl's step is 5 + rule 5 deny ipv6 source 2A01:728::/29 + rule 10 permit ipv6 source 1291:3050:f5ed:9760::/23 diff --git a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.yml b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.yml index 86c640715f..a663d42a70 100644 --- a/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.yml +++ b/tests/huawei_vrp/display_acl_all/huawei_vrp_display_acl_ipv6_all_1.yml @@ -12,3 +12,27 @@ parsed_sample: destination_port_modifier: "" destination_port_range: "" matches: "" + - acl_name: "MyACL_IPv6" + acl_number: "3999" + sn: "5" + action: "deny" + protocol: "ipv6" + source: "2A01:728::/29" + source_port_modifier: "" + source_port_range: "" + destination: "" + destination_port_modifier: "" + destination_port_range: "" + matches: "" + - acl_name: "MyACL_IPv6" + acl_number: "3999" + sn: "10" + action: "permit" + protocol: "ipv6" + source: "1291:3050:f5ed:9760::/23" + source_port_modifier: "" + source_port_range: "" + destination: "" + destination_port_modifier: "" + destination_port_range: "" + matches: ""