From f2243414059604958cd1af25213e0cf8a6a9defd Mon Sep 17 00:00:00 2001 From: Jacob Date: Wed, 17 Jul 2024 10:30:08 -0400 Subject: [PATCH] Fix tests --- ntc_templates/templates/index | 2 +- ...neaccess_oneos_show_ip_bgp_summary.textfsm | 23 +-- ..._show_ip_helper-address_statistics.textfsm | 12 -- ...cess_oneos_show_ip_interface_brief.textfsm | 13 +- ...neaccess_oneos_show_ip_prefix-list.textfsm | 9 +- .../oneaccess_oneos_show_ip_ssh.textfsm | 13 +- .../oneaccess_oneos_show_ip_vrf_brief.textfsm | 12 ++ .../show_ip_bgp_summary.oneos5.raw | 2 +- .../show_ip_bgp_summary.oneos5.yml | 18 +- .../show_ip_bgp_summary.oneos6.raw | 2 +- .../show_ip_bgp_summary.oneos6.yml | 36 ++-- .../show_ip_interface_brief.oneos5.raw | 2 +- .../show_ip_interface_brief.oneos5.yml | 160 ++++++++--------- .../show_ip_interface_brief.oneos6.raw | 2 +- .../show_ip_interface_brief.oneos6.yml | 168 +++++++++--------- .../show_ip_prefix-list.oneos5.yml | 36 ++-- .../show_ip_prefix-list.oneos6.yml | 36 ++-- .../show_ip_ssh/show_ip_ssh.oneos5.raw | 2 +- .../show_ip_ssh/show_ip_ssh.oneos5.yml | 2 +- ..._ssh.oneos6.raw => show_ip_ssh.oneos6.raw} | 0 ..._ssh.oneos6.yml => show_ip_ssh.oneos6.yml} | 2 +- .../show_ip_vrf_brief.oneos5.raw | 8 + .../show_ip_vrf_brief.oneos5.yml | 16 ++ .../show_ip_vrf_brief.oneos6.raw | 8 + .../show_ip_vrf_brief.oneos6.yml | 29 +++ 25 files changed, 339 insertions(+), 274 deletions(-) delete mode 100644 ntc_templates/templates/oneaccess_oneos_show_ip_helper-address_statistics.textfsm create mode 100644 ntc_templates/templates/oneaccess_oneos_show_ip_vrf_brief.textfsm rename tests/oneaccess_oneos/show_ip_ssh/{show_ips_ssh.oneos6.raw => show_ip_ssh.oneos6.raw} (100%) rename tests/oneaccess_oneos/show_ip_ssh/{show_ips_ssh.oneos6.yml => show_ip_ssh.oneos6.yml} (92%) create mode 100644 tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.raw create mode 100644 tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.yml create mode 100644 tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.raw create mode 100644 tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.yml diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index index 134dcf51bd..962b7b2bfd 100644 --- a/ntc_templates/templates/index +++ b/ntc_templates/templates/index @@ -684,10 +684,10 @@ mikrotik_routeros_user_active_print.textfsm, .*, mikrotik_routeros, [[/]]us[[er] mikrotik_routeros_ip_address_print.textfsm, .*, mikrotik_routeros, [[/]]ip ad[[dress]] p[[rint]] mikrotik_routeros_ping.textfsm, .*, mikrotik_routeros, [[/]]pin[[g]] -oneaccess_oneos_show_ip_helper-address_statistics.textfsm, .*, oneaccess_oneos, sh[[ow]] ip helper-address statistics oneaccess_oneos_show_ip_interface_brief.textfsm, .*, oneaccess_oneos, sh[[ow]] ip int[[erface]] brief oneaccess_oneos_show_ip_bgp_summary.textfsm, .*, oneaccess_oneos, sh[[ow]] ip bgp summary oneaccess_oneos_show_ip_prefix-list.textfsm, .*, oneaccess_oneos, sh[[ow]] ip prefix-list +oneaccess_oneos_show_ip_vrf_brief.textfsm, .*, oneaccess_oneos, sh[[ow]] ip vrf brief oneaccess_oneos_show_ip_ssh.textfsm, .*, oneaccess_oneos, sh[[ow]] ip ssh paloalto_panos_show_running_security-policy.textfsm, .*, paloalto_panos, sh[[ow]] runn[[ing]] security[[-policy]] diff --git a/ntc_templates/templates/oneaccess_oneos_show_ip_bgp_summary.textfsm b/ntc_templates/templates/oneaccess_oneos_show_ip_bgp_summary.textfsm index 478a167fc8..7c284e8d2d 100644 --- a/ntc_templates/templates/oneaccess_oneos_show_ip_bgp_summary.textfsm +++ b/ntc_templates/templates/oneaccess_oneos_show_ip_bgp_summary.textfsm @@ -7,16 +7,16 @@ Value Filldown PEERS (\d+) Value Filldown BGP_MEMORY (\d+\s\S+) Value Filldown AS_PATH_ENTRIES (\d+) Value Filldown COMMUNTIY_ENTRIES (\d+) -Value BGP_NEIGH (\d+\.\d+\.\d+\.\d+) -Value ADDR_FAMILY (\d+) -Value NEIGH_AS (\d+) -Value MSG_RCVD (\d+) -Value MSG_SENT (\d+) -Value TBL_VER (\d+) -Value IN_Q (\d+) -Value OUT_Q (\d+) +Value BGP_NEIGHBOR (\d+\.\d+\.\d+\.\d+) +Value ADDRESS_FAMILY (\d+) +Value NEIGHBOR_AS (\d+) +Value MESSAGE_RECEIVED (\d+) +Value MESSAGE_SENT (\d+) +Value TABLE_VERSION (\d+) +Value IN_QUEUE (\d+) +Value OUT_QUEUE (\d+) Value UP_DOWN (\S+?) -Value STATE_PFXRCD (\S+\s+\S+|\S+) +Value STATE_PREFIX_RECEIVED (\S+\s+\S+|\S+) Value Fillup TOTAL_NEIGHBORS (\d+) Start @@ -25,9 +25,10 @@ Start ^Peers\s${PEERS},\susing\s${BGP_MEMORY}\sof\smemory ^${AS_PATH_ENTRIES}\sBGP\sAS-PATH\sentries ^${COMMUNTIY_ENTRIES}\sBGP\scommunity\sentries - ^Neighbor\s - ^${BGP_NEIGH}\s+${ADDR_FAMILY}\s+${NEIGH_AS}\s+${MSG_RCVD}\s+${MSG_SENT}\s+${TBL_VER}\s+${IN_Q}\s+${OUT_Q}\s+${UP_DOWN}\s+${STATE_PFXRCD} -> Record + ^Neighbor\s+V\s+AS\s+MsgRcvd\s+MsgSent\s+TblVer\s+InQ\s+OutQ\s+Up/Down\s+State/PfxRcd\s*$$ + ^${BGP_NEIGHBOR}\s+${ADDRESS_FAMILY}\s+${NEIGHBOR_AS}\s+${MESSAGE_RECEIVED}\s+${MESSAGE_SENT}\s+${TABLE_VERSION}\s+${IN_QUEUE}\s+${OUT_QUEUE}\s+${UP_DOWN}\s+${STATE_PREFIX_RECEIVED} -> Record ^Total\snumber\sof\sneighbors\s${TOTAL_NEIGHBORS} ^\s*$$ + ^. -> Error EOF diff --git a/ntc_templates/templates/oneaccess_oneos_show_ip_helper-address_statistics.textfsm b/ntc_templates/templates/oneaccess_oneos_show_ip_helper-address_statistics.textfsm deleted file mode 100644 index 4d8423ed1a..0000000000 --- a/ntc_templates/templates/oneaccess_oneos_show_ip_helper-address_statistics.textfsm +++ /dev/null @@ -1,12 +0,0 @@ -Value Required INTERFACE (.*) -Value List HELPERS (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - -Start - ^.*:\s\d+\sbroadcasts\sforwarded -> Continue.Record - ^${INTERFACE}:\s\d+\sbroadcasts\sforwarded - ^\s*${HELPERS} -> Continue - ^(\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+){1}${HELPERS} -> Continue - ^(\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+){2}${HELPERS} -> Continue - ^(\s*\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\s+){3}${HELPERS} - ^.*$$ - ^. -> Error diff --git a/ntc_templates/templates/oneaccess_oneos_show_ip_interface_brief.textfsm b/ntc_templates/templates/oneaccess_oneos_show_ip_interface_brief.textfsm index d36f44103a..b1fc09d9ef 100644 --- a/ntc_templates/templates/oneaccess_oneos_show_ip_interface_brief.textfsm +++ b/ntc_templates/templates/oneaccess_oneos_show_ip_interface_brief.textfsm @@ -1,11 +1,12 @@ -Value INTF (\S+(?:\s\S+)?) -Value IPADDR (\S+) +Value INTERFACE (\S+(?:\s\S+)?) +Value IP_ADDRESS (\S+) Value OK (YES|NO|Yes|No|yes|no) Value STATUS (up|down|administratively down) -Value PROTO (up|down) -Value IFDESCR (.*) +Value PROTOCOL (up|down) +Value DESCRIPTION (.*?) Start - ^${INTF}\s+${IPADDR}\s+${OK}\s+${STATUS}\s+${PROTO}\s+${IFDESCR} -> Record - ^.*$$ + ^Interface\s+IP[-\s]Address\s+OK\?\s+Status\s+Protocol\s+Description\s*$$ + ^${INTERFACE}\s+${IP_ADDRESS}\s+${OK}\s+${STATUS}\s+${PROTOCOL}\s+${DESCRIPTION}\s*$$ -> Record + ^\s*$$ ^. -> Error diff --git a/ntc_templates/templates/oneaccess_oneos_show_ip_prefix-list.textfsm b/ntc_templates/templates/oneaccess_oneos_show_ip_prefix-list.textfsm index d089337c53..3beb97c137 100644 --- a/ntc_templates/templates/oneaccess_oneos_show_ip_prefix-list.textfsm +++ b/ntc_templates/templates/oneaccess_oneos_show_ip_prefix-list.textfsm @@ -1,7 +1,7 @@ -Value Required,Filldown PROTCOL (\S+) +Value Required,Filldown PROTOCOL (\S+) Value Required,Filldown NAME (\S+) Value Filldown DESCRIPTION (.*) -Value Required SEQ (\d+) +Value Required SEQUENCE (\d+) Value ACTION (\S+) Value NETWORK ([0-9a-f:\.]+|any) Value NETMASK (\d+) @@ -9,9 +9,8 @@ Value LE (\d+) Value GE (\d+) Start - ^${PROTCOL}:\sip\s+prefix-list\s+${NAME} + ^${PROTOCOL}:\sip\s+prefix-list\s+${NAME} ^\s+Description:\s${DESCRIPTION} - ^\s+seq\s+${SEQ}\s+${ACTION}\s+${NETWORK}(/${NETMASK}|)(?:\s+ge\s+${GE}|)(?:\s+le\s+${LE}|)\s*$$ -> Record + ^\s+seq\s+${SEQUENCE}\s+${ACTION}\s+${NETWORK}(/${NETMASK}|)(?:\s+ge\s+${GE}|)(?:\s+le\s+${LE}|)\s*$$ -> Record ^\s*$$ ^.+ -> Error - diff --git a/ntc_templates/templates/oneaccess_oneos_show_ip_ssh.textfsm b/ntc_templates/templates/oneaccess_oneos_show_ip_ssh.textfsm index 4b7eb73d48..1298d168c5 100644 --- a/ntc_templates/templates/oneaccess_oneos_show_ip_ssh.textfsm +++ b/ntc_templates/templates/oneaccess_oneos_show_ip_ssh.textfsm @@ -1,6 +1,6 @@ Value SSH (\S+) Value SCP (\S+) -Value ENCR (ssh\-\S+|\S+) +Value ENCRYPTION (ssh\-\S+|\S+) Value BITS (\d+) Value FINGERPRINT ([a-f0-9:]+) Value MAX_SESSIONS (\d+) @@ -18,11 +18,14 @@ Start ^Session\stimeout\s${SESSION_TIMEOUT}\ssecs ^Maximum\snumber\sof\ssessions\s${MAX_SESSIONS} ^Maximum\snumber\sof\schannels\sper\ssession\s${MAX_CHANNELS_SESSION} + ^Authorized\s+public\s+keys: + ^none ^Key\sfingerprint -> FINGERPRINT - ^.*$$ + ^\s*$$ ^. -> Error FINGERPRINT - ^${ENCR}\s${BITS}\s${FINGERPRINT}\s*$$ -> Start - ^${BITS}\sMD5:${FINGERPRINT}.*\s\(${ENCR}\)$$ -> Start - + ^${ENCRYPTION}\s${BITS}\s${FINGERPRINT}\s*$$ -> Start + ^${BITS}\sMD5:${FINGERPRINT}.*\s\(${ENCRYPTION}\)$$ -> Start + ^\s*$$ + ^. -> Error diff --git a/ntc_templates/templates/oneaccess_oneos_show_ip_vrf_brief.textfsm b/ntc_templates/templates/oneaccess_oneos_show_ip_vrf_brief.textfsm new file mode 100644 index 0000000000..e4ef0b24c6 --- /dev/null +++ b/ntc_templates/templates/oneaccess_oneos_show_ip_vrf_brief.textfsm @@ -0,0 +1,12 @@ +Value VRF (\w+) +Value VRF_ID (\d+) +Value List INTERFACES ([\w\-]+\s?[\w\/\.]+) + +Start + ^\s*VRF\s+Name\s+VRF\s+I[Dd]\s+Interfaces\s*$$ + ^\s?\w+\s+\d+ -> Continue.Record + ^\s?${VRF}?\s+${VRF_ID}\s+${INTERFACES}$$ + ^\s?${VRF}?\s+${VRF_ID}\s*$$ + ^\s+${INTERFACES}$$ + ^\s*$$ + ^. -> Error diff --git a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.raw b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.raw index ed928fdf1c..4898598f52 100644 --- a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.raw +++ b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.raw @@ -5,4 +5,4 @@ BGP router identifier 194.5.12.148, local AS number 65000, vrf (null) Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd 194.5.163.29 4 14737 13360 12237 34 0 0 4d05h57m 28 -Total number of neighbors 1 \ No newline at end of file +Total number of neighbors 1 diff --git a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.yml b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.yml index a492e63452..4028770603 100644 --- a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.yml +++ b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos5.yml @@ -9,14 +9,14 @@ parsed_sample: bgp_memory: "" as_path_entries: "6" communtiy_entries: "0" - bgp_neigh: "194.5.163.29" - addr_family: "4" - neigh_as: "14737" - msg_rcvd: "13360" - msg_sent: "12237" - tbl_ver: "34" - in_q: "0" - out_q: "0" + bgp_neighbor: "194.5.163.29" + address_family: "4" + neighbor_as: "14737" + message_received: "13360" + message_sent: "12237" + table_version: "34" + in_queue: "0" + out_queue: "0" up_down: "4d05h57m" - state_pfxrcd: "28" + state_prefix_received: "28" total_neighbors: "1" diff --git a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.raw b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.raw index cad0dfe0e1..b12bc87083 100644 --- a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.raw +++ b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.raw @@ -6,4 +6,4 @@ Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd 192.4.21.254 4 61400 38962 26256 78123 0 0 20:35:48 881 192.4.91.254 4 61400 38876 26260 78123 0 0 20:35:48 881 -Total number of neighbors 2 \ No newline at end of file +Total number of neighbors 2 diff --git a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.yml b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.yml index d7b92c65d1..cea8e23d45 100644 --- a/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.yml +++ b/tests/oneaccess_oneos/show_ip_bgp_summary/show_ip_bgp_summary.oneos6.yml @@ -9,16 +9,16 @@ parsed_sample: bgp_memory: "5128 bytes" as_path_entries: "" communtiy_entries: "" - bgp_neigh: "192.4.21.254" - addr_family: "4" - neigh_as: "61400" - msg_rcvd: "38962" - msg_sent: "26256" - tbl_ver: "78123" - in_q: "0" - out_q: "0" + bgp_neighbor: "192.4.21.254" + address_family: "4" + neighbor_as: "61400" + message_received: "38962" + message_sent: "26256" + table_version: "78123" + in_queue: "0" + out_queue: "0" up_down: "20:35:48" - state_pfxrcd: "881" + state_prefix_received: "881" total_neighbors: "2" - router_id: "1.105.35.17" local_as: "65000" @@ -29,14 +29,14 @@ parsed_sample: bgp_memory: "5128 bytes" as_path_entries: "" communtiy_entries: "" - bgp_neigh: "192.4.91.254" - addr_family: "4" - neigh_as: "61400" - msg_rcvd: "38876" - msg_sent: "26260" - tbl_ver: "78123" - in_q: "0" - out_q: "0" + bgp_neighbor: "192.4.91.254" + address_family: "4" + neighbor_as: "61400" + message_received: "38876" + message_sent: "26260" + table_version: "78123" + in_queue: "0" + out_queue: "0" up_down: "20:35:48" - state_pfxrcd: "881" + state_prefix_received: "881" total_neighbors: "2" diff --git a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.raw b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.raw index 9b3e4c9274..045be80d64 100644 --- a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.raw +++ b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.raw @@ -18,4 +18,4 @@ Bvi 200 94.105.16.129 YES up down *IPE dot11radio 0/0.1 YES up up dot11radio 0/0.2 YES up up Null 0 YES up up -dot11radio 0/0 YES up up \ No newline at end of file +dot11radio 0/0 YES up up diff --git a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.yml b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.yml index f5d35e818e..8f5ca00c60 100644 --- a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.yml +++ b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos5.yml @@ -1,126 +1,126 @@ --- parsed_sample: - - intf: "GigabitEthernet 0/0" - ipaddr: "" + - interface: "GigabitEthernet 0/0" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** PBXPLUG 212 - BACKUP TEST - 94.105.1.119 ***" - - intf: "GigabitEthernet 0/1" - ipaddr: "" + protocol: "up" + description: "*** PBXPLUG 212 - BACKUP TEST - 94.105.1.119 ***" + - interface: "GigabitEthernet 0/1" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** PBXPLUG 401 - BACKUP TEST - 94.105.34.2 ***" - - intf: "GigabitEthernet 0/2" - ipaddr: "" + protocol: "up" + description: "*** PBXPLUG 401 - BACKUP TEST - 94.105.34.2 ***" + - interface: "GigabitEthernet 0/2" + ip_address: "" ok: "YES" status: "up" - proto: "down" - ifdescr: "*IPERF*" - - intf: "GigabitEthernet 0/3" - ipaddr: "" + protocol: "down" + description: "*IPERF*" + - interface: "GigabitEthernet 0/3" + ip_address: "" ok: "YES" status: "up" - proto: "down" - ifdescr: "" - - intf: "FastEthernet 1/0" - ipaddr: "" + protocol: "down" + description: "" + - interface: "FastEthernet 1/0" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** WAN INTERFACE ***" - - intf: "FastEthernet 1/0.1" - ipaddr: "192.168.1.2" + protocol: "up" + description: "*** WAN INTERFACE ***" + - interface: "FastEthernet 1/0.1" + ip_address: "192.168.1.2" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** management A-modem (modem ip = 192.168.1.1) ***" - - intf: "FastEthernet 1/0.10" - ipaddr: "" + protocol: "up" + description: "*** management A-modem (modem ip = 192.168.1.1) ***" + - interface: "FastEthernet 1/0.10" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** VT096910 - GS20170330107 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ + protocol: "up" + description: "*** VT096910 - GS20170330107 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ \ - Loopback503941 ***" - - intf: "Dialer 1" - ipaddr: "94.105.163.30" + - interface: "Dialer 1" + ip_address: "94.105.163.30" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** VT096910 - GS20170330107 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ + protocol: "up" + description: "*** VT096910 - GS20170330107 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ \ - Loopback503941" - - intf: "Dialer 2" - ipaddr: "" + - interface: "Dialer 2" + ip_address: "" ok: "NO" status: "administratively down" - proto: "down" - ifdescr: "*** VT108085 - GS20190640686 - CI - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ + protocol: "down" + description: "*** VT108085 - GS20190640686 - CI - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ \ - LOOPBACK 503899 ***" - - intf: "Dialer 3" - ipaddr: "94.104.254.138" + - interface: "Dialer 3" + ip_address: "94.104.254.138" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** DATA VDSL shared VLAN - GSID0004_MAIN - CI TEST - NOS-EMLP-01/ANT-EMLP-01\ + protocol: "up" + description: "*** DATA VDSL shared VLAN - GSID0004_MAIN - CI TEST - NOS-EMLP-01/ANT-EMLP-01\ \ - LOOPBACK 500000***" - - intf: "Loopback 0" - ipaddr: "127.0.0.1" + - interface: "Loopback 0" + ip_address: "127.0.0.1" ok: "YES" status: "up" - proto: "up" - ifdescr: "" - - intf: "Loopback 1" - ipaddr: "94.105.12.148" + protocol: "up" + description: "" + - interface: "Loopback 1" + ip_address: "94.105.12.148" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** VT096910 - GS20170330107 ***" - - intf: "Loopback 777" - ipaddr: "94.107.245.249" + protocol: "up" + description: "*** VT096910 - GS20170330107 ***" + - interface: "Loopback 777" + ip_address: "94.107.245.249" ok: "YES" status: "up" - proto: "up" - ifdescr: "" - - intf: "Bvi 10" - ipaddr: "192.168.10.1" + protocol: "up" + description: "" + - interface: "Bvi 10" + ip_address: "192.168.10.1" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** VT108085 - GS20190640686 - CI ACCESS ***" - - intf: "Bvi 100" - ipaddr: "192.168.100.1" + protocol: "up" + description: "*** VT108085 - GS20190640686 - CI ACCESS ***" + - interface: "Bvi 100" + ip_address: "192.168.100.1" ok: "YES" status: "up" - proto: "up" - ifdescr: "*** TEST MAARTEN - BACKUP SCRIPT PBXPLUG ***" - - intf: "Bvi 200" - ipaddr: "94.105.16.129" + protocol: "up" + description: "*** TEST MAARTEN - BACKUP SCRIPT PBXPLUG ***" + - interface: "Bvi 200" + ip_address: "94.105.16.129" ok: "YES" status: "up" - proto: "down" - ifdescr: "*IPERF*" - - intf: "dot11radio 0/0.1" - ipaddr: "" + protocol: "down" + description: "*IPERF*" + - interface: "dot11radio 0/0.1" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "" - - intf: "dot11radio 0/0.2" - ipaddr: "" + protocol: "up" + description: "" + - interface: "dot11radio 0/0.2" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "" - - intf: "Null 0" - ipaddr: "" + protocol: "up" + description: "" + - interface: "Null 0" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "" - - intf: "dot11radio 0/0" - ipaddr: "" + protocol: "up" + description: "" + - interface: "dot11radio 0/0" + ip_address: "" ok: "YES" status: "up" - proto: "up" - ifdescr: "" + protocol: "up" + description: "" diff --git a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.raw b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.raw index a021349e0f..a99e1c1e3d 100644 --- a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.raw +++ b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.raw @@ -19,4 +19,4 @@ Tunnel 21 94.105.9.192 Yes up up Tunnel 91 94.105.9.192 Yes up up GRE tunnel to NOS-IPSEC-02 Dialer 1 Yes up down * VT108085 - - GS20190640686 - CORPORATE INTERNET - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01 - LOOPBACK 503899 * Dialer 3 No administratively down down * VT096908 - - GS20170330105 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01 - Loopback503210 * -Dialer 32 Yes up down \ No newline at end of file +Dialer 32 Yes up down diff --git a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.yml b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.yml index 52e77de6e6..4c3558382e 100644 --- a/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.yml +++ b/tests/oneaccess_oneos/show_ip_interface_brief/show_ip_interface_brief.oneos6.yml @@ -1,132 +1,132 @@ --- parsed_sample: - - intf: "GigabitEthernet 0/0" - ipaddr: "94.107.208.169" + - interface: "GigabitEthernet 0/0" + ip_address: "94.107.208.169" ok: "Yes" status: "up" - proto: "down" - ifdescr: "*** LAN INTERFACE ***" - - intf: "GigabitEthernet 0/1" - ipaddr: "20.20.20.1" + protocol: "down" + description: "*** LAN INTERFACE ***" + - interface: "GigabitEthernet 0/1" + ip_address: "20.20.20.1" ok: "Yes" status: "up" - proto: "up" - ifdescr: "*** LAB_C891F - GigabitEthernet0 ***" - - intf: "GigabitEthernet 0/2" - ipaddr: "" + protocol: "up" + description: "*** LAB_C891F - GigabitEthernet0 ***" + - interface: "GigabitEthernet 0/2" + ip_address: "" ok: "Yes" status: "up" - proto: "down" - ifdescr: "" - - intf: "GigabitEthernet 0/3" - ipaddr: "10.100.1.254" + protocol: "down" + description: "" + - interface: "GigabitEthernet 0/3" + ip_address: "10.100.1.254" ok: "Yes" status: "up" - proto: "up" - ifdescr: "TO LBB156 " - - intf: "GigabitEthernet 1/0" - ipaddr: "" + protocol: "up" + description: "TO LBB156" + - interface: "GigabitEthernet 1/0" + ip_address: "" ok: "Yes" status: "up" - proto: "down" - ifdescr: "*** WAN INTERFACE ***" - - intf: "GigabitEthernet 1/0.1" - ipaddr: "" + protocol: "down" + description: "*** WAN INTERFACE ***" + - interface: "GigabitEthernet 1/0.1" + ip_address: "" ok: "Yes" status: "up" - proto: "down" - ifdescr: "" - - intf: "GigabitEthernet 1/0.10" - ipaddr: "" + protocol: "down" + description: "" + - interface: "GigabitEthernet 1/0.10" + ip_address: "" ok: "No" status: "administratively down" - proto: "down" - ifdescr: "" - - intf: "GigabitEthernet 1/0.200" - ipaddr: "" + protocol: "down" + description: "" + - interface: "GigabitEthernet 1/0.200" + ip_address: "" ok: "Yes" status: "up" - proto: "down" - ifdescr: "* VT108085 - - GS20190640686 - CORPORATE INTERNET - VDSL2 SHARED VLAN\ + protocol: "down" + description: "* VT108085 - - GS20190640686 - CORPORATE INTERNET - VDSL2 SHARED VLAN\ \ - NOS-EMLP-01/ANT-EMLP-01 - LOOPBACK 503899 *" - - intf: "GigabitEthernet 1/0.300" - ipaddr: "" + - interface: "GigabitEthernet 1/0.300" + ip_address: "" ok: "No" status: "administratively down" - proto: "down" - ifdescr: "* VT096908 - - GS20170330105 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ + protocol: "down" + description: "* VT096908 - - GS20170330105 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ \ - Loopback503210 *" - - intf: "Bvi 300" - ipaddr: "94.107.224.226" + - interface: "Bvi 300" + ip_address: "94.107.224.226" ok: "Yes" status: "up" - proto: "down" - ifdescr: "" - - intf: "Virtual-Ethernet 1" - ipaddr: "10.94.50.22" + protocol: "down" + description: "" + - interface: "Virtual-Ethernet 1" + ip_address: "10.94.50.22" ok: "Yes" status: "up" - proto: "up" - ifdescr: "* Mobile access 4G - UNTRUST - CORPORATE INTERNET - 4G *" - - intf: "Null 0" - ipaddr: "" + protocol: "up" + description: "* Mobile access 4G - UNTRUST - CORPORATE INTERNET - 4G *" + - interface: "Null 0" + ip_address: "" ok: "Yes" status: "up" - proto: "up" - ifdescr: "Null 0 " - - intf: "Loopback 0" - ipaddr: "" + protocol: "up" + description: "Null 0" + - interface: "Loopback 0" + ip_address: "" ok: "Yes" status: "up" - proto: "up" - ifdescr: "" - - intf: "Loopback 1" - ipaddr: "94.105.9.192" + protocol: "up" + description: "" + - interface: "Loopback 1" + ip_address: "94.105.9.192" ok: "Yes" status: "up" - proto: "up" - ifdescr: "" - - intf: "Loopback 21" - ipaddr: "192.4.21.238" + protocol: "up" + description: "" + - interface: "Loopback 21" + ip_address: "192.4.21.238" ok: "Yes" status: "up" - proto: "up" - ifdescr: "*** Mobile access 4G - BGP PEER LOOPBACK ANT ***" - - intf: "Loopback 91" - ipaddr: "192.4.91.238" + protocol: "up" + description: "*** Mobile access 4G - BGP PEER LOOPBACK ANT ***" + - interface: "Loopback 91" + ip_address: "192.4.91.238" ok: "Yes" status: "up" - proto: "up" - ifdescr: "*** Mobile access 4G - BGP PEER LOOPBACK NOS ***" - - intf: "Tunnel 21" - ipaddr: "94.105.9.192" + protocol: "up" + description: "*** Mobile access 4G - BGP PEER LOOPBACK NOS ***" + - interface: "Tunnel 21" + ip_address: "94.105.9.192" ok: "Yes" status: "up" - proto: "up" - ifdescr: "GRE tunnel to ANT-IPSEC-02 - NO IPSEC" - - intf: "Tunnel 91" - ipaddr: "94.105.9.192" + protocol: "up" + description: "GRE tunnel to ANT-IPSEC-02 - NO IPSEC" + - interface: "Tunnel 91" + ip_address: "94.105.9.192" ok: "Yes" status: "up" - proto: "up" - ifdescr: "GRE tunnel to NOS-IPSEC-02" - - intf: "Dialer 1" - ipaddr: "" + protocol: "up" + description: "GRE tunnel to NOS-IPSEC-02" + - interface: "Dialer 1" + ip_address: "" ok: "Yes" status: "up" - proto: "down" - ifdescr: "* VT108085 - - GS20190640686 - CORPORATE INTERNET - VDSL2 SHARED VLAN\ + protocol: "down" + description: "* VT108085 - - GS20190640686 - CORPORATE INTERNET - VDSL2 SHARED VLAN\ \ - NOS-EMLP-01/ANT-EMLP-01 - LOOPBACK 503899 *" - - intf: "Dialer 3" - ipaddr: "" + - interface: "Dialer 3" + ip_address: "" ok: "No" status: "administratively down" - proto: "down" - ifdescr: "* VT096908 - - GS20170330105 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ + protocol: "down" + description: "* VT096908 - - GS20170330105 - IP-VPN - VDSL2 SHARED VLAN - NOS-EMLP-01/ANT-EMLP-01\ \ - Loopback503210 *" - - intf: "Dialer 32" - ipaddr: "" + - interface: "Dialer 32" + ip_address: "" ok: "Yes" status: "up" - proto: "down" - ifdescr: "" + protocol: "down" + description: "" diff --git a/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos5.yml b/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos5.yml index 7c58771bb6..46e2515577 100644 --- a/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos5.yml +++ b/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos5.yml @@ -1,81 +1,81 @@ --- parsed_sample: - - protcol: "RIP" + - protocol: "RIP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "5" + sequence: "5" action: "permit" network: "192.4.21.0" netmask: "24" le: "32" ge: "" - - protcol: "RIP" + - protocol: "RIP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "10" + sequence: "10" action: "permit" network: "192.4.91.0" netmask: "24" le: "32" ge: "" - - protcol: "RIP" + - protocol: "RIP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "15" + sequence: "15" action: "deny" network: "any" netmask: "" le: "" ge: "" - - protcol: "OSPF" + - protocol: "OSPF" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "5" + sequence: "5" action: "permit" network: "192.4.21.0" netmask: "24" le: "32" ge: "" - - protcol: "OSPF" + - protocol: "OSPF" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "10" + sequence: "10" action: "permit" network: "192.4.91.0" netmask: "24" le: "32" ge: "" - - protcol: "OSPF" + - protocol: "OSPF" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "15" + sequence: "15" action: "deny" network: "any" netmask: "" le: "" ge: "" - - protcol: "BGP" + - protocol: "BGP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "5" + sequence: "5" action: "permit" network: "192.4.21.0" netmask: "24" le: "32" ge: "" - - protcol: "BGP" + - protocol: "BGP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "10" + sequence: "10" action: "permit" network: "192.4.91.0" netmask: "24" le: "32" ge: "" - - protcol: "BGP" + - protocol: "BGP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "15" + sequence: "15" action: "deny" network: "any" netmask: "" diff --git a/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos6.yml b/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos6.yml index 7c58771bb6..46e2515577 100644 --- a/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos6.yml +++ b/tests/oneaccess_oneos/show_ip_prefix-list/show_ip_prefix-list.oneos6.yml @@ -1,81 +1,81 @@ --- parsed_sample: - - protcol: "RIP" + - protocol: "RIP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "5" + sequence: "5" action: "permit" network: "192.4.21.0" netmask: "24" le: "32" ge: "" - - protcol: "RIP" + - protocol: "RIP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "10" + sequence: "10" action: "permit" network: "192.4.91.0" netmask: "24" le: "32" ge: "" - - protcol: "RIP" + - protocol: "RIP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "15" + sequence: "15" action: "deny" network: "any" netmask: "" le: "" ge: "" - - protcol: "OSPF" + - protocol: "OSPF" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "5" + sequence: "5" action: "permit" network: "192.4.21.0" netmask: "24" le: "32" ge: "" - - protcol: "OSPF" + - protocol: "OSPF" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "10" + sequence: "10" action: "permit" network: "192.4.91.0" netmask: "24" le: "32" ge: "" - - protcol: "OSPF" + - protocol: "OSPF" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "15" + sequence: "15" action: "deny" network: "any" netmask: "" le: "" ge: "" - - protcol: "BGP" + - protocol: "BGP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "5" + sequence: "5" action: "permit" network: "192.4.21.0" netmask: "24" le: "32" ge: "" - - protcol: "BGP" + - protocol: "BGP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "10" + sequence: "10" action: "permit" network: "192.4.91.0" netmask: "24" le: "32" ge: "" - - protcol: "BGP" + - protocol: "BGP" name: "DENY-BGP:" description: "** do not advertise to BGP neighbors **" - seq: "15" + sequence: "15" action: "deny" network: "any" netmask: "" diff --git a/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.raw b/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.raw index 79a6e3aa0d..f805882468 100644 --- a/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.raw +++ b/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.raw @@ -8,4 +8,4 @@ Authorized public keys: none Key fingerprint: ssh-rsa 4096 bc:f8:c3:67:8f:de:f3:ec:5c:29:b5:a4:e4:25:de:7a -SCP server enabled \ No newline at end of file +SCP server enabled diff --git a/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.yml b/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.yml index a2ede5bc51..2244fc3619 100644 --- a/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.yml +++ b/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos5.yml @@ -2,7 +2,7 @@ parsed_sample: - ssh: "Enabled" scp: "enabled" - encr: "ssh-rsa" + encryption: "ssh-rsa" bits: "4096" fingerprint: "bc:f8:c3:67:8f:de:f3:ec:5c:29:b5:a4:e4:25:de:7a" max_sessions: "5" diff --git a/tests/oneaccess_oneos/show_ip_ssh/show_ips_ssh.oneos6.raw b/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos6.raw similarity index 100% rename from tests/oneaccess_oneos/show_ip_ssh/show_ips_ssh.oneos6.raw rename to tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos6.raw diff --git a/tests/oneaccess_oneos/show_ip_ssh/show_ips_ssh.oneos6.yml b/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos6.yml similarity index 92% rename from tests/oneaccess_oneos/show_ip_ssh/show_ips_ssh.oneos6.yml rename to tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos6.yml index 83bf41bc09..c519fbb738 100644 --- a/tests/oneaccess_oneos/show_ip_ssh/show_ips_ssh.oneos6.yml +++ b/tests/oneaccess_oneos/show_ip_ssh/show_ip_ssh.oneos6.yml @@ -2,7 +2,7 @@ parsed_sample: - ssh: "Enabled" scp: "disabled" - encr: "RSA" + encryption: "RSA" bits: "4096" fingerprint: "5e:70:36:5a:20:93:14:18:93:04:03:df:f0:72:f4:fc" max_sessions: "5" diff --git a/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.raw b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.raw new file mode 100644 index 0000000000..f3988f55df --- /dev/null +++ b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.raw @@ -0,0 +1,8 @@ + VRF Name VRF Id Interfaces + MODEM 1 FastEthernet 1/0.1 + INTERNET 2 Dialer 2 + Dialer 3 + Loopback 777 + Bvi 10 + TEST 3 + \ No newline at end of file diff --git a/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.yml b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.yml new file mode 100644 index 0000000000..60a8e0587e --- /dev/null +++ b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos5.yml @@ -0,0 +1,16 @@ +--- +parsed_sample: + - vrf: "MODEM" + vrf_id: "1" + interfaces: + - "FastEthernet 1/0.1" + - vrf: "INTERNET" + vrf_id: "2" + interfaces: + - "Dialer 2" + - "Dialer 3" + - "Loopback 777" + - "Bvi 10" + - vrf: "TEST" + vrf_id: "3" + interfaces: [] diff --git a/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.raw b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.raw new file mode 100644 index 0000000000..f5fe34bc04 --- /dev/null +++ b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.raw @@ -0,0 +1,8 @@ +AUTO_PROVISIONING_0001 5 Dialer 32 +CORPORATE_INTERNET_0001 3 GigabitEthernet 0/0 +MODEM 4 GigabitEthernet 1/0.1 +O_SWOPS_LAB_0001 6 Dialer 3 +TRUST 7 +UNTRUST 2 GigabitEthernet 0/1 + Virtual-Ethernet 1 +Yavuz 8 diff --git a/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.yml b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.yml new file mode 100644 index 0000000000..6ca7c26784 --- /dev/null +++ b/tests/oneaccess_oneos/show_ip_vrf_brief/show_ip_vrf_brief.oneos6.yml @@ -0,0 +1,29 @@ +--- +parsed_sample: + - vrf: "AUTO_PROVISIONING_0001" + vrf_id: "5" + interfaces: + - "Dialer 32" + - vrf: "CORPORATE_INTERNET_0001" + vrf_id: "3" + interfaces: + - "GigabitEthernet 0/0" + - vrf: "MODEM" + vrf_id: "4" + interfaces: + - "GigabitEthernet 1/0.1" + - vrf: "O_SWOPS_LAB_0001" + vrf_id: "6" + interfaces: + - "Dialer 3" + - vrf: "TRUST" + vrf_id: "7" + interfaces: [] + - vrf: "UNTRUST" + vrf_id: "2" + interfaces: + - "GigabitEthernet 0/1" + - "Virtual-Ethernet 1" + - vrf: "Yavuz" + vrf_id: "8" + interfaces: []