Huawei - display acl all - separately record ACLs and their rules

networktocode · Dec 14, 2022 · 38484fc · 38484fc
1 parent 103c2f1
commit 38484fc
Show file tree

Hide file tree

Showing 3 changed files with 94 additions and 3 deletions.
diff --git a/ntc_templates/templates/huawei_vrp_display_acl_all.textfsm b/ntc_templates/templates/huawei_vrp_display_acl_all.textfsm
@@ -1,7 +1,7 @@
 Value Filldown ACL_NAME (.*?)
-Value Filldown ACL_NUMBER (\d+)
-Value Required SN (\d+)
-Value Required ACTION (deny|permit)
+Value Filldown,Required ACL_NUMBER (\d+)
+Value SN (\d+)
+Value ACTION (deny|permit)
 Value PROTOCOL (\d+|icmp(v6)?|tcp|udp|gre|igmp|ip(v6)?|ipinip|ospf)
 Value SOURCE (((\d+.){3}\d+|[0-9a-fA-F]{1,4}([0-9a-fA-F]{0,4}:){1,7}[0-9a-fA-F]{0,4})[\/\s]((\d+.){3}\d+|\d+))
 Value SOURCE_PORT_MODIFIER (eq|lt|gt|range)

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
@@ -1,5 +1,18 @@
 ---
 parsed_sample:
+  - acl_name: ""
+    acl_number: "2000"
+    sn: ""
+    action: ""
+    protocol: ""
+    source: ""
+    source_port_modifier: ""
+    source_port_range: ""
+    destination: ""
+    destination_port_modifier: ""
+    destination_port_range: ""
+    matches: ""
+    description: ""
   - acl_name: ""
     acl_number: "2000"
     sn: "5"
@@ -91,6 +104,19 @@ parsed_sample:
     destination_port_range: ""
     matches: ""
     description: ""
+  - acl_name: ""
+    acl_number: "2500"
+    sn: ""
+    action: ""
+    protocol: ""
+    source: ""
+    source_port_modifier: ""
+    source_port_range: ""
+    destination: ""
+    destination_port_modifier: ""
+    destination_port_range: ""
+    matches: ""
+    description: ""
   - acl_name: ""
     acl_number: "2500"
     sn: "35"
@@ -104,6 +130,19 @@ parsed_sample:
     destination_port_range: ""
     matches: "5431"
     description: ""
+  - acl_name: ""
+    acl_number: "3997"
+    sn: ""
+    action: ""
+    protocol: ""
+    source: ""
+    source_port_modifier: ""
+    source_port_range: ""
+    destination: ""
+    destination_port_modifier: ""
+    destination_port_range: ""
+    matches: ""
+    description: ""
   - acl_name: ""
     acl_number: "3997"
     sn: "5"
@@ -117,6 +156,19 @@ parsed_sample:
     destination_port_range: ""
     matches: ""
     description: "qsdqsdqsdqsdqsdqsdqs az"
+  - acl_name: "REGLE_NAT"
+    acl_number: "3998"
+    sn: ""
+    action: ""
+    protocol: ""
+    source: ""
+    source_port_modifier: ""
+    source_port_range: ""
+    destination: ""
+    destination_port_modifier: ""
+    destination_port_range: ""
+    matches: ""
+    description: ""
   - acl_name: "REGLE_NAT"
     acl_number: "3998"
     sn: "5"
@@ -169,3 +221,16 @@ parsed_sample:
     destination_port_range: ""
     matches: "278450"
     description: ""
+  - acl_name: "qsdqsd"
+    acl_number: "3999"
+    sn: ""
+    action: ""
+    protocol: ""
+    source: ""
+    source_port_modifier: ""
+    source_port_range: ""
+    destination: ""
+    destination_port_modifier: ""
+    destination_port_range: ""
+    matches: ""
+    description: ""
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
@@ -1,5 +1,18 @@
 ---
 parsed_sample:
+  - acl_name: ""
+    acl_number: "3344"
+    sn: ""
+    action: ""
+    protocol: ""
+    source: ""
+    source_port_modifier: ""
+    source_port_range: ""
+    destination: ""
+    destination_port_modifier: ""
+    destination_port_range: ""
+    matches: ""
+    description: ""
   - acl_name: ""
     acl_number: "3344"
     sn: "5"
@@ -13,6 +26,19 @@ parsed_sample:
     destination_port_range: ""
     matches: ""
     description: ""
+  - acl_name: "MyACL_IPv6"
+    acl_number: "3999"
+    sn: ""
+    action: ""
+    protocol: ""
+    source: ""
+    source_port_modifier: ""
+    source_port_range: ""
+    destination: ""
+    destination_port_modifier: ""
+    destination_port_range: ""
+    matches: ""
+    description: ""
   - acl_name: "MyACL_IPv6"
     acl_number: "3999"
     sn: "5"