Support fortinet wan interface in 7.0

networktocode · Oct 12, 2024 · 20f4356 · 20f4356
1 parent 46e59cf
commit 20f4356
Show file tree

Hide file tree

Showing 7 changed files with 663 additions and 290 deletions.
diff --git a/ntc_templates/templates/fortinet_get_system_interface.textfsm b/ntc_templates/templates/fortinet_get_system_interface.textfsm
@@ -68,6 +68,9 @@ Start
   # loopback =6.2
   # name:management-ip:ip:status:type:netflow-sampler:sflow-sampler:src-check:explicit-web-proxy:explicit-ftp-proxy:proxy-captive-portal
   ^name:\s+${NAME}\s+management-ip:\s+${MANAGEMENT_IP}\s+${MANAGEMENT_NETMASK}\s+ip:\s+${IP_ADDRESS}\s+${NETMASK}\s+status:\s+${STATUS}\s+type:\s+${TYPE}\s+netflow-sampler:\s+${NETFLOW_SAMPLER}\s+sflow-sampler:\s+${SFLOW_SAMPLER}\s+src-check:\s+${SRC_CHECK}\s+explicit-web-proxy:\s+${EXPLICIT_WEB_PROXY}\s+explicit-ftp-proxy:\s+${EXPLICIT_FTP_PROXY}\s+proxy-captive-portal:\s+${PROXY_CAPTIVE_PORTAL}\s*$$ -> Record
+  # wan
+  # name:mode:management-ip:ip:status:netbios-forward:type:netflow-sampler:sflow-sampler:src-check:explicit-web-proxy:explicit-ftp-proxy:proxy-captive-portal:switch-controller-feature:mtu-override:wccp:drop-overlapped-fragment:drop-fragment
+  ^name:\s+${NAME}\s+mode:\s+${MODE}\s+management-ip:\s+${MANAGEMENT_IP}\s+${MANAGEMENT_NETMASK}\s+ip:\s+${IP_ADDRESS}\s+${NETMASK}\s+status:\s+${STATUS}\s+netbios-forward:\s+${NETBIOS_FORWARD}\s+type:\s+${TYPE}\s+netflow-sampler:\s+${NETFLOW_SAMPLER}\s+sflow-sampler:\s+${SFLOW_SAMPLER}\s+src-check:\s+${SRC_CHECK}\s+explicit-web-proxy:\s+${EXPLICIT_WEB_PROXY}\s+explicit-ftp-proxy:\s+${EXPLICIT_FTP_PROXY}\s+proxy-captive-portal:\s+${PROXY_CAPTIVE_PORTAL}\s+switch-controller-feature:\s+${SWITCH_CONTROLLER_FEATURE}\s+mtu-override:\s+${MTU_OVERRIDE}\s+wccp:\s+${WCCP}\s+drop-overlapped-fragment:\s+${DROP_OVERLAPPED_FRAGMENT}\s+drop-fragment:\s+${DROP_FRAGMENT}\s*$$ -> Record
   # npu_vlink
   # name:mode:management-ip:ip:status:netbios-forward:type:netflow-sampler:sflow-sampler:src-check:explicit-web-proxy:explicit-ftp-proxy:proxy-captive-portal:wccp:drop-overlapped-fragment:drop-fragment
   ^name:\s+${NAME}\s+mode:\s+${MODE}\s+management-ip:\s+${MANAGEMENT_IP}\s+${MANAGEMENT_NETMASK}\s+ip:\s+${IP_ADDRESS}\s+${NETMASK}\s+status:\s+${STATUS}\s+netbios-forward:\s+${NETBIOS_FORWARD}\s+type:\s+${TYPE}\s+netflow-sampler:\s+${NETFLOW_SAMPLER}\s+sflow-sampler:\s+${SFLOW_SAMPLER}\s+src-check:\s+${SRC_CHECK}\s+explicit-web-proxy:\s+${EXPLICIT_WEB_PROXY}\s+explicit-ftp-proxy:\s+${EXPLICIT_FTP_PROXY}\s+proxy-captive-portal:\s+${PROXY_CAPTIVE_PORTAL}\s+wccp:\s+${WCCP}\s+drop-overlapped-fragment:\s+${DROP_OVERLAPPED_FRAGMENT}\s+drop-fragment:\s+${DROP_FRAGMENT}\s*$$ -> Record

diff --git a/tests/fortinet/get_system_interface/fortinet_get_system_interface_5.6.yml b/tests/fortinet/get_system_interface/fortinet_get_system_interface_5.6.yml
@@ -18,9 +18,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -39,9 +39,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "down"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -60,9 +60,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "down"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: ""
@@ -81,9 +81,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: ""
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -102,9 +102,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "tunnel"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -123,9 +123,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -144,9 +144,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "vlan"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -165,9 +165,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "tunnel"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -186,6 +186,6 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "loopback"
     wccp: ""
-    switch_controller_feature: ""
diff --git a/tests/fortinet/get_system_interface/fortinet_get_system_interface_6.0.yml b/tests/fortinet/get_system_interface/fortinet_get_system_interface_6.0.yml
@@ -18,9 +18,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -39,9 +39,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -60,9 +60,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: ""
@@ -81,9 +81,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: ""
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -102,9 +102,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "tunnel"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -123,9 +123,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -144,9 +144,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -165,9 +165,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "vlan"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -186,6 +186,6 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "tunnel"
     wccp: "disable"
-    switch_controller_feature: ""
diff --git a/tests/fortinet/get_system_interface/fortinet_get_system_interface_6.2.yml b/tests/fortinet/get_system_interface/fortinet_get_system_interface_6.2.yml
@@ -18,9 +18,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -39,9 +39,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -60,9 +60,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -81,9 +81,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -102,9 +102,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: ""
@@ -123,9 +123,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -144,9 +144,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: ""
@@ -165,9 +165,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: ""
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -186,9 +186,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "tunnel"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -207,9 +207,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "physical"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -228,9 +228,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "aggregate"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: "disable"
     drop_overlapped_fragment: "disable"
     explicit_ftp_proxy: "disable"
@@ -249,9 +249,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "vlan"
     wccp: "disable"
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -270,9 +270,9 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "loopback"
     wccp: ""
-    switch_controller_feature: ""
   - drop_fragment: ""
     drop_overlapped_fragment: ""
     explicit_ftp_proxy: "disable"
@@ -291,6 +291,6 @@ parsed_sample:
     sflow_sampler: "disable"
     src_check: "enable"
     status: "up"
+    switch_controller_feature: ""
     type: "tunnel"
     wccp: "disable"
-    switch_controller_feature: ""