fixes #795, fixes #775, fixes #596

Author: jeffkala

changes/775.adderd

@@ -0,0 +1 @@
+Added a library mapping for `ncclient` which is used for NETCONF communication.

changes/775.fixed

@@ -120,6 +120,18 @@
             "_dict": lib_mapper.NAPALM_LIB_MAPPER_REVERSE,
             "_file": "docs/user/lib_mapper/napalm_reverse.md",
         },
+        "ncclient": {
+            "header_src": "NCCLIENT",
+            "header_dst": "NORMALIZED",
+            "_dict": lib_mapper.NCCLIENT_LIB_MAPPER,
+            "_file": "docs/user/lib_mapper/ncclient.md",
+        },
+        "ncclient_reverse": {
+            "header_src": "NORMALIZED",
+            "header_dst": "NCCLIENT",
+            "_dict": lib_mapper.NCCLIENT_LIB_MAPPER_REVERSE,
+            "_file": "docs/user/lib_mapper/ncclient_reverse.md",
+        },
         "netmiko": {
             "header_src": "NETMIKO",
             "header_dst": "NORMALIZED",

development_scripts.py

@@ -6,6 +6,7 @@
 | arubanetworks.aoscx | → | aruba_aoscx |
 | ciena.saos6.saos6 | → | ciena_saos |
 | cisco.asa.asa | → | cisco_asa |
+| cisco.catalystcenter | → | cisco_dnac |
 | cisco.ios.ios | → | cisco_ios |
 | cisco.iosxr.iosxr | → | cisco_xr |
 | cisco.meraki.meraki | → | cisco_meraki |

docs/user/lib_mapper/ansible.md

@@ -7,6 +7,7 @@
 | bigip_f5 | → | f5networks.f5_bigip.bigip |
 | ciena_saos | → | ciena.saos6.saos6 |
 | cisco_asa | → | cisco.asa.asa |
+| cisco_dnac | → | cisco.catalystcenter |
 | cisco_ios | → | cisco.ios.ios |
 | cisco_meraki | → | cisco.meraki.meraki |
 | cisco_nxos | → | cisco.nxos.nxos |

docs/user/lib_mapper/ansible_reverse.md

@@ -0,0 +1,11 @@
+| NCCLIENT | | NORMALIZED |
+| ---------- | -- | ------ |
+| alu | → | alcatel_sros |
+| ciena | → | ciena_saos |
+| h3c | → | h3c_comware |
+| hpcomware | → | hp_comware |
+| huawei | → | huawei |
+| huaweiyang | → | huawei_vrp |
+| iosxe | → | cisco_xe |
+| iosxr | → | cisco_xr |
+| junos | → | juniper_junos |

docs/user/lib_mapper/ncclient.md

@@ -0,0 +1,15 @@
+| NORMALIZED | | NCCLIENT |
+| ---------- | -- | ------ |
+| alcatel_sros | → | alu |
+| ciena_saos | → | ciena |
+| cisco_ios | → | iosxe |
+| cisco_nxos | → | nexus |
+| cisco_xe | → | iosxe |
+| cisco_xr | → | iosxr |
+| h3c_comware | → | h3c |
+| hp_comware | → | hpcomware |
+| huawei | → | huawei |
+| huawei_vrp | → | huaweiyang |
+| huawei_vrpv8 | → | huaweiyang |
+| juniper_junos | → | junos |
+| nokia_sros | → | alu |

docs/user/lib_mapper/ncclient_reverse.md

@@ -178,8 +178,8 @@
     "brocade_nos": "brocade_nos",
     "brocade_vdx": "brocade_vdx",
     "brocade_vyos": "brocade_vyos",
-    "casa_cmts": "casa_cmts",
     "calix_b6": "calix_b6",
+    "casa_cmts": "casa_cmts",
     "cdot_cros": "cdot_cros",
     "centec_os": "centec_os",
     "checkpoint_gaia": "checkpoint_gaia",
@@ -291,8 +291,8 @@
     "ubiquiti_edgerouter": "ubiquiti_edgerouter",
     "ubiquiti_edgeswitch": "ubiquiti_edgeswitch",
     "ubiquiti_unifiswitch": "ubiquiti_unifiswitch",
-    "vyatta_vyos": "vyatta_vyos",
     "vertiv_mph": "vertiv_mph",
+    "vyatta_vyos": "vyatta_vyos",
     "vyos": "vyos",
     "watchguard_fireware": "watchguard_fireware",
     "yamaha": "yamaha",
@@ -402,6 +402,7 @@
     "arubanetworks.aoscx": "aruba_aoscx",
     "ciena.saos6.saos6": "ciena_saos",
     "cisco.asa.asa": "cisco_asa",
+    "cisco.catalystcenter": "cisco_dnac",
     "cisco.ios.ios": "cisco_ios",
     "cisco.iosxr.iosxr": "cisco_xr",
     "cisco.meraki.meraki": "cisco_meraki",
@@ -522,6 +523,19 @@
     "SRX": "juniper_junos",  # no reverse
 }
 
+# NCCLIENT | Normalized
+NCCLIENT_LIB_MAPPER: t.Dict[str, str] = {
+    "alu": "alcatel_sros",
+    "ciena": "ciena_saos",
+    "iosxe": "cisco_xe",
+    "iosxr": "cisco_xr",
+    "h3c": "h3c_comware",
+    "huawei": "huawei",
+    "huaweiyang": "huawei_vrp",
+    "hpcomware": "hp_comware",
+    "junos": "juniper_junos",
+}
+
 # NIST | Normalized
 NIST_LIB_MAPPER: t.Dict[str, str] = {
     "arista:eos": "arista_eos",
@@ -578,6 +592,7 @@
     "bigip_f5": "f5networks.f5_bigip.bigip",
     "ciena_saos": "ciena.saos6.saos6",
     "cisco_asa": "cisco.asa.asa",
+    "cisco_dnac": "cisco.catalystcenter",
     "cisco_ios": "cisco.ios.ios",
     "cisco_meraki": "cisco.meraki.meraki",
     "cisco_nxos": "cisco.nxos.nxos",
@@ -711,6 +726,23 @@
     "paloalto_panos": "paloaltonetworks:pan-os",
 }
 
+# Normlized | NCCLIENT
+NCCLIENT_LIB_MAPPER_REVERSE: t.Dict[str, str] = {
+    "alcatel_sros": "alu",
+    "ciena_saos": "ciena",
+    "cisco_ios": "iosxe",
+    "cisco_nxos": "nexus",
+    "cisco_xe": "iosxe",
+    "cisco_xr": "iosxr",
+    "h3c_comware": "h3c",
+    "huawei": "huawei",
+    "huawei_vrp": "huaweiyang",
+    "huawei_vrpv8": "huaweiyang",
+    "hp_comware": "hpcomware",
+    "juniper_junos": "junos",
+    "nokia_sros": "alu",
+}
+
 # Deep copy the reverse, where there is no actual translation happening with special
 # consideration for OS's not in netmiko.
 _MAIN_LIB_MAPPER = copy.deepcopy(NETMIKO_LIB_MAPPER)
@@ -751,6 +783,7 @@
     "forward_networks": FORWARDNETWORKS_LIB_MAPPER,
     "hier_config": HIERCONFIG_LIB_MAPPER,
     "napalm": NAPALM_LIB_MAPPER,
+    "ncclient": NCCLIENT_LIB_MAPPER,
     "netmiko": NETMIKO_LIB_MAPPER,
     "netutils_parser": NETUTILSPARSER_LIB_MAPPER,
     "nist": NIST_LIB_MAPPER,
@@ -769,6 +802,7 @@
     "forward_networks": FORWARDNETWORKS_LIB_MAPPER_REVERSE,
     "hier_config": HIERCONFIG_LIB_MAPPER_REVERSE,
     "napalm": NAPALM_LIB_MAPPER_REVERSE,
+    "ncclient": NCCLIENT_LIB_MAPPER_REVERSE,
     "netmiko": NETMIKO_LIB_MAPPER_REVERSE,
     "netutils_parser": NETUTILSPARSER_LIB_MAPPER_REVERSE,
     "nist": NIST_LIB_MAPPER_REVERSE,