Updates to XR mapping, add tests to ensure always using normalized name, various fixes (#495)

itdependsnetworks · web-flow · commit 3dbfc2ffb2d2 · 2024-03-27T23:29:43.000-04:00
diff --git a/docs/user/lib_mapper/aerleon.md b/docs/user/lib_mapper/aerleon.md
@@ -2,20 +2,20 @@
 | ---------- | -- | ------ |
 | arista | → | arista_eos |
 | aruba | → | aruba_aoscx |
-| brocade | → | ruckus_fastiron |
+| brocade | → | brocade_nos |
 | cisco | → | cisco_ios |
 | ciscoasa | → | cisco_asa |
 | cisconx | → | cisco_nxos |
-| ciscoxr | → | cisco_iosxr |
+| ciscoxr | → | cisco_xr |
 | cloudarmor | → | cloudarmor |
 | gce | → | gce |
 | gcp_hf | → | gcp_hf |
 | ipset | → | ipset |
 | iptables | → | iptables |
 | juniper | → | juniper_junos |
-| juniperevo | → | juniper_evo |
+| juniperevo | → | juniper_junos |
 | k8s | → | k8s |
-| msmpc | → | juniper_msmpc |
+| msmpc | → | juniper_junos |
 | nsxt | → | vmware_nsxt |
 | nsxv | → | vmware_nsxv |
 | openconfig | → | openconfig |
@@ -24,7 +24,7 @@
 | pcap | → | pcap |
 | sonic | → | sonic |
 | speedway | → | speedway |
-| srx | → | juniper_srx |
-| srxlo | → | juniper_srx |
+| srx | → | juniper_junos |
+| srxlo | → | juniper_junos |
 | windows | → | windows |
-| windows_advfirewall | → | windows_advfirewall |
+| windows_advfirewall | → | windows |
diff --git a/docs/user/lib_mapper/aerleon_reverse.md b/docs/user/lib_mapper/aerleon_reverse.md
@@ -2,30 +2,25 @@
 | ---------- | -- | ------ |
 | arista_eos | → | arista |
 | aruba_aoscx | → | aruba |
-| brocade_fastiron | → | brocade |
-| brocade_netiron | → | brocade |
+| brocade_nos | → | brocade |
 | cisco_asa | → | ciscoasa |
 | cisco_ios | → | cisco |
-| cisco_iosxr | → | ciscoxr |
 | cisco_nxos | → | cisconx |
+| cisco_xe | → | cisco |
+| cisco_xr | → | ciscoxr |
 | cloudarmor | → | cloudarmor |
 | gce | → | gce |
 | gcp_hf | → | gcp_hf |
 | ipset | → | ipset |
 | iptables | → | iptables |
-| juniper_evo | → | juniperevo |
 | juniper_junos | → | juniper |
-| juniper_msmpc | → | msmpc |
-| juniper_srx | → | srxlo |
 | k8s | → | k8s |
 | openconfig | → | openconfig |
 | packetfilter | → | packetfilter |
 | paloalto_panos | → | paloalto |
 | pcap | → | pcap |
-| ruckus_fastiron | → | brocade |
 | sonic | → | sonic |
 | speedway | → | speedway |
 | vmware_nsxt | → | nsxt |
 | vmware_nsxv | → | nsxv |
-| windows_advfirewall | → | windows_advfirewall |
-| windows_ipsec | → | windows |
+| windows | → | windows |
diff --git a/docs/user/lib_mapper/capirca.md b/docs/user/lib_mapper/capirca.md
@@ -2,20 +2,20 @@
 | ---------- | -- | ------ |
 | arista | → | arista_eos |
 | aruba | → | aruba_aoscx |
-| brocade | → | ruckus_fastiron |
+| brocade | → | brocade_nos |
 | cisco | → | cisco_ios |
 | ciscoasa | → | cisco_asa |
 | cisconx | → | cisco_nxos |
-| ciscoxr | → | cisco_iosxr |
+| ciscoxr | → | cisco_xr |
 | cloudarmor | → | cloudarmor |
 | gce | → | gce |
 | gcp_hf | → | gcp_hf |
 | ipset | → | ipset |
 | iptables | → | iptables |
 | juniper | → | juniper_junos |
-| juniperevo | → | juniper_evo |
+| juniperevo | → | juniper_junos |
 | k8s | → | k8s |
-| msmpc | → | juniper_msmpc |
+| msmpc | → | juniper_junos |
 | nsxt | → | vmware_nsxt |
 | nsxv | → | vmware_nsxv |
 | openconfig | → | openconfig |
@@ -24,7 +24,7 @@
 | pcap | → | pcap |
 | sonic | → | sonic |
 | speedway | → | speedway |
-| srx | → | juniper_srx |
-| srxlo | → | juniper_srx |
+| srx | → | juniper_junos |
+| srxlo | → | juniper_junos |
 | windows | → | windows |
-| windows_advfirewall | → | windows_advfirewall |
+| windows_advfirewall | → | windows |
diff --git a/docs/user/lib_mapper/capirca_reverse.md b/docs/user/lib_mapper/capirca_reverse.md
@@ -2,30 +2,25 @@
 | ---------- | -- | ------ |
 | arista_eos | → | arista |
 | aruba_aoscx | → | aruba |
-| brocade_fastiron | → | brocade |
-| brocade_netiron | → | brocade |
+| brocade_nos | → | brocade |
 | cisco_asa | → | ciscoasa |
 | cisco_ios | → | cisco |
-| cisco_iosxr | → | ciscoxr |
 | cisco_nxos | → | cisconx |
+| cisco_xe | → | cisco |
+| cisco_xr | → | ciscoxr |
 | cloudarmor | → | cloudarmor |
 | gce | → | gce |
 | gcp_hf | → | gcp_hf |
 | ipset | → | ipset |
 | iptables | → | iptables |
-| juniper_evo | → | juniperevo |
 | juniper_junos | → | juniper |
-| juniper_msmpc | → | msmpc |
-| juniper_srx | → | srxlo |
 | k8s | → | k8s |
 | openconfig | → | openconfig |
 | packetfilter | → | packetfilter |
 | paloalto_panos | → | paloalto |
 | pcap | → | pcap |
-| ruckus_fastiron | → | brocade |
 | sonic | → | sonic |
 | speedway | → | speedway |
 | vmware_nsxt | → | nsxt |
 | vmware_nsxv | → | nsxv |
-| windows_advfirewall | → | windows_advfirewall |
-| windows_ipsec | → | windows |
+| windows | → | windows |
diff --git a/docs/user/lib_mapper/forwardnetworks.md b/docs/user/lib_mapper/forwardnetworks.md
@@ -5,10 +5,10 @@
 | ASA | → | cisco_asa |
 | EXTREME_NOS | → | extreme_netiron |
 | F5 | → | bigip_f5 |
-| FORTINET | → | fortinet_fortios |
+| FORTINET | → | fortinet |
 | IOS | → | cisco_ios |
 | IOS_XE | → | cisco_ios |
-| IOS_XR | → | cisco_iosxr |
+| IOS_XR | → | cisco_xr |
 | JUNOS | → | juniper_junos |
 | LINUX | → | linux |
 | LINUX_OVS_OFCTL | → | linux |
diff --git a/docs/user/lib_mapper/forwardnetworks_reverse.md b/docs/user/lib_mapper/forwardnetworks_reverse.md
@@ -5,10 +5,11 @@
 | bigip_f5 | → | F5 |
 | cisco_asa | → | ASA |
 | cisco_ios | → | IOS |
-| cisco_iosxr | → | IOS_XR |
 | cisco_nxos | → | NXOS |
+| cisco_xe | → | IOS |
+| cisco_xr | → | IOS_XR |
 | extreme_netiron | → | EXTREME_NOS |
-| fortinet_fortios | → | FORTINET |
+| fortinet | → | FORTINET |
 | juniper_junos | → | JUNOS |
 | linux | → | LINUX |
 | netscaler | → | NETSCALER |
diff --git a/docs/user/lib_mapper/hierconfig.md b/docs/user/lib_mapper/hierconfig.md
@@ -3,7 +3,7 @@
 | eos | → | arista_eos |
 | fastiron | → | ruckus_fastiron |
 | ios | → | cisco_ios |
-| iosxe | → | cisco_xe |
+| iosxe | → | cisco_ios |
 | iosxr | → | cisco_xr |
 | junos | → | juniper_junos |
 | nxos | → | cisco_nxos |
diff --git a/docs/user/lib_mapper/hierconfig_reverse.md b/docs/user/lib_mapper/hierconfig_reverse.md
@@ -4,7 +4,7 @@
 | brocade_vyos | → | vyos |
 | cisco_ios | → | ios |
 | cisco_nxos | → | nxos |
-| cisco_xe | → | iosxe |
+| cisco_xe | → | ios |
 | cisco_xr | → | iosxr |
 | juniper_junos | → | junos |
 | ruckus_fastiron | → | fastiron |
diff --git a/docs/user/lib_mapper/napalm_reverse.md b/docs/user/lib_mapper/napalm_reverse.md
@@ -8,7 +8,7 @@
 | cisco_ios | → | ios |
 | cisco_nxos | → | nxos |
 | cisco_wlc | → | cisco_wlc_ssh |
-| cisco_xe | → | cisco_ios |
+| cisco_xe | → | ios |
 | cisco_xr | → | iosxr |
 | fortinet | → | fortios |
 | huawei | → | huawei_vrp |
diff --git a/docs/user/lib_mapper/netmiko.md b/docs/user/lib_mapper/netmiko.md
@@ -13,6 +13,7 @@
 | aruba_procurve | → | aruba_procurve |
 | avaya_ers | → | avaya_ers |
 | avaya_vsp | → | avaya_vsp |
+| bigip_f5 | → | bigip_f5 |
 | broadcom_icos | → | broadcom_icos |
 | brocade_fastiron | → | brocade_fastiron |
 | brocade_fos | → | brocade_fos |
@@ -57,9 +58,9 @@
 | extreme_vdx | → | extreme_vdx |
 | extreme_vsp | → | extreme_vsp |
 | extreme_wing | → | extreme_wing |
-| f5_linux | → | f5_linux |
-| f5_ltm | → | f5_ltm |
-| f5_tmsh | → | f5_tmsh |
+| f5_linux | → | bigip_f5 |
+| f5_ltm | → | bigip_f5 |
+| f5_tmsh | → | bigip_f5 |
 | flexvnf | → | flexvnf |
 | fortinet | → | fortinet |
 | generic | → | generic |
diff --git a/docs/user/lib_mapper/netmiko_reverse.md b/docs/user/lib_mapper/netmiko_reverse.md
@@ -13,6 +13,7 @@
 | aruba_procurve | → | aruba_procurve |
 | avaya_ers | → | avaya_ers |
 | avaya_vsp | → | avaya_vsp |
+| bigip_f5 | → | bigip_f5 |
 | broadcom_icos | → | broadcom_icos |
 | brocade_fastiron | → | brocade_fastiron |
 | brocade_fos | → | brocade_fos |
@@ -57,9 +58,6 @@
 | extreme_vdx | → | extreme_vdx |
 | extreme_vsp | → | extreme_vsp |
 | extreme_wing | → | extreme_wing |
-| f5_linux | → | f5_linux |
-| f5_ltm | → | f5_ltm |
-| f5_tmsh | → | f5_tmsh |
 | flexvnf | → | flexvnf |
 | fortinet | → | fortinet |
 | generic | → | generic |
diff --git a/docs/user/lib_mapper/netutilsparser.md b/docs/user/lib_mapper/netutilsparser.md
@@ -10,7 +10,7 @@
 | cisco_nxos | → | cisco_nxos |
 | citrix_netscaler | → | citrix_netscaler |
 | extreme_netiron | → | extreme_netiron |
-| fortinet_fortios | → | fortinet_fortios |
+| fortinet_fortios | → | fortinet |
 | juniper_junos | → | juniper_junos |
 | linux | → | linux |
 | mikrotik_routeros | → | mikrotik_routeros |
diff --git a/docs/user/lib_mapper/netutilsparser_reverse.md b/docs/user/lib_mapper/netutilsparser_reverse.md
@@ -7,10 +7,11 @@
 | cisco_asa | → | cisco_asa |
 | cisco_ios | → | cisco_ios |
 | cisco_nxos | → | cisco_nxos |
+| cisco_xe | → | cisco_ios |
 | cisco_xr | → | cisco_iosxr |
 | citrix_netscaler | → | citrix_netscaler |
 | extreme_netiron | → | extreme_netiron |
-| fortinet_fortios | → | fortinet_fortios |
+| fortinet | → | fortinet_fortios |
 | juniper_junos | → | juniper_junos |
 | linux | → | linux |
 | mikrotik_routeros | → | mikrotik_routeros |
diff --git a/docs/user/lib_mapper/ntctemplates.md b/docs/user/lib_mapper/ntctemplates.md
@@ -14,6 +14,7 @@
 | aruba_procurve | → | aruba_procurve |
 | avaya_ers | → | avaya_ers |
 | avaya_vsp | → | avaya_vsp |
+| bigip_f5 | → | bigip_f5 |
 | broadcom_icos | → | broadcom_icos |
 | brocade_fastiron | → | brocade_fastiron |
 | brocade_fos | → | brocade_fos |
@@ -58,9 +59,9 @@
 | extreme_vdx | → | extreme_vdx |
 | extreme_vsp | → | extreme_vsp |
 | extreme_wing | → | extreme_wing |
-| f5_linux | → | f5_linux |
-| f5_ltm | → | f5_ltm |
-| f5_tmsh | → | f5_tmsh |
+| f5_linux | → | bigip_f5 |
+| f5_ltm | → | bigip_f5 |
+| f5_tmsh | → | bigip_f5 |
 | flexvnf | → | flexvnf |
 | fortinet | → | fortinet |
 | generic | → | generic |
diff --git a/docs/user/lib_mapper/ntctemplates_reverse.md b/docs/user/lib_mapper/ntctemplates_reverse.md
@@ -14,6 +14,7 @@
 | aruba_procurve | → | aruba_procurve |
 | avaya_ers | → | avaya_ers |
 | avaya_vsp | → | avaya_vsp |
+| bigip_f5 | → | bigip_f5 |
 | broadcom_icos | → | broadcom_icos |
 | brocade_fastiron | → | brocade_fastiron |
 | brocade_fos | → | brocade_fos |
@@ -58,9 +59,6 @@
 | extreme_vdx | → | extreme_vdx |
 | extreme_vsp | → | extreme_vsp |
 | extreme_wing | → | extreme_wing |
-| f5_linux | → | f5_linux |
-| f5_ltm | → | f5_ltm |
-| f5_tmsh | → | f5_tmsh |
 | flexvnf | → | flexvnf |
 | fortinet | → | fortinet |
 | generic | → | generic |
diff --git a/docs/user/lib_mapper/pyats.md b/docs/user/lib_mapper/pyats.md
@@ -1,7 +1,7 @@
 | PYATS | | NORMALIZED |
 | ---------- | -- | ------ |
 | asa | → | cisco_asa |
-| bigip | → | f5_tmsh |
+| bigip | → | bigip_f5 |
 | dnac | → | cisco_dnac |
 | ios | → | cisco_ios |
 | iosxe | → | cisco_ios |
diff --git a/docs/user/lib_mapper/pyats_reverse.md b/docs/user/lib_mapper/pyats_reverse.md
@@ -1,13 +1,13 @@
 | NORMALIZED | | PYATS |
 | ---------- | -- | ------ |
+| bigip_f5 | → | bigip |
 | cisco_asa | → | asa |
 | cisco_dnac | → | dnac |
 | cisco_ios | → | iosxe |
 | cisco_nxos | → | nxos |
 | cisco_viptella | → | viptela |
 | cisco_xe | → | iosxe |
 | cisco_xr | → | iosxr |
-| f5_tmsh | → | bigip |
 | juniper_junos | → | junos |
 | linux | → | linux |
 | nokia_sros | → | sros |
diff --git a/docs/user/lib_mapper/pyntc.md b/docs/user/lib_mapper/pyntc.md
@@ -5,5 +5,5 @@
 | cisco_asa_ssh | → | cisco_asa |
 | cisco_ios_ssh | → | cisco_ios |
 | cisco_nxos_nxapi | → | cisco_nxos |
-| f5_tmos_icontrol | → | f5_tmsh |
+| f5_tmos_icontrol | → | bigip_f5 |
 | juniper_junos_netconf | → | juniper_junos |
diff --git a/docs/user/lib_mapper/pyntc_reverse.md b/docs/user/lib_mapper/pyntc_reverse.md
@@ -1,10 +1,10 @@
 | NORMALIZED | | PYNTC |
 | ---------- | -- | ------ |
 | arista_eos | → | arista_eos_eapi |
+| bigip_f5 | → | f5_tmos_icontrol |
 | cisco_asa | → | cisco_asa_ssh |
 | cisco_ios | → | cisco_ios_ssh |
 | cisco_nxos | → | cisco_nxos_nxapi |
 | cisco_wlc | → | cisco_aireos_ssh |
 | cisco_xe | → | cisco_ios_ssh |
-| f5_tmsh | → | f5_tmos_icontrol |
 | juniper_junos | → | juniper_junos_netconf |
diff --git a/docs/user/lib_mapper/scrapli_reverse.md b/docs/user/lib_mapper/scrapli_reverse.md
@@ -4,5 +4,6 @@
 | aruba_aoscx | → | aruba_aoscx |
 | cisco_ios | → | cisco_iosxe |
 | cisco_nxos | → | cisco_nxos |
+| cisco_xe | → | cisco_iosxe |
 | cisco_xr | → | cisco_iosxr |
 | juniper_junos | → | juniper_junos |
diff --git a/netutils/lib_mapper.py b/netutils/lib_mapper.py
diff --git a/tests/unit/test_lib_mapper.py b/tests/unit/test_lib_mapper.py
