Skip to content

Commit 960225c

Browse files
authored
Merging develop into master (#352)
* Add explanation of how the _name keyword works (#346) * Add explanation of how the _name keyword works * Fix typo * Deprecate IBM driver (#349) * Remove IBM driver * Removing napalm-ibm * Remove IBM
1 parent 65fbbd0 commit 960225c

File tree

4 files changed

+28
-30
lines changed

4 files changed

+28
-30
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ FAQ
108108
If you have any issues using NAPALM or encounter any errors, before submitting any questions (directly by email or on Slack), please go through the following checklist:
109109

110110
- Double or triple check if you indeed are able to access the device using the credentials provided.
111-
- Does your device meet the minimum [requrirements](http://napalm.readthedocs.io/en/latest/support/index.html#general-support-matrix)?
111+
- Does your device meet the minimum [requirements](http://napalm.readthedocs.io/en/latest/support/index.html#general-support-matrix)?
112112
- Some operating systems have some specific [constraints](http://napalm.readthedocs.io/en/latest/support/index.html#caveats). (e.g. have you enabled the XML agent on IOS-XR, or the NXAPI feature on NXOS?)
113113
- Are you able to connect to the device using NAPALM? Check using the CLI test tool:
114114

docs/support/index.rst

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,21 @@ General support matrix
66

77

88

9-
===================== ========== ============= ============ ============== ============= ============ ============ =============== ========================= ============== ==============
10-
_ EOS JunOS IOS-XR FortiOS IBM NXOS IOS Pluribus PANOS MikroTik VyOS
11-
===================== ========== ============= ============ ============== ============= ============ ============ =============== ========================= ============== ==============
12-
**Module Name** napalm-eos napalm-junos napalm-iosxr napalm-fortios napalm-ibm napalm-nxos napalm-ios napalm-pluribus napalm-panos napalm-ros napalm-vyos
13-
**Driver Name** eos junos iosxr fortios ibm nxos ios pluribus panos ros vyos
14-
**Structured data** Yes Yes No No Yes Yes No No Yes Yes Yes
15-
**Minimum version** 4.15.0F 12.1 5.1.0 5.2.0 ??? 6.1 [#g1]_ 12.4(20)T N/A 7.0 3.30 1.1.6
16-
**Backend library** `pyeapi`_ `junos-eznc`_ `pyIOSXR`_ `pyFG`_ `bnclient`_ `pycsco`_ `netmiko`_ `pyPluribus`_ `netmiko`_, `pan-python`_ `librouteros`_ `netmiko`_
17-
**Caveats** :doc:`eos` :doc:`fortios` :doc:`ibm` :doc:`nxos` :doc:`ios` :doc:`panos` :doc:`vyos`
18-
===================== ========== ============= ============ ============== ============= ============ ============ =============== ========================= ============== ==============
9+
===================== ========== ============= ============ ============== ============ ============ =============== ========================= ============== ==============
10+
_ EOS JunOS IOS-XR FortiOS NXOS IOS Pluribus PANOS MikroTik VyOS
11+
===================== ========== ============= ============ ============== ============ ============ =============== ========================= ============== ==============
12+
**Module Name** napalm-eos napalm-junos napalm-iosxr napalm-fortios napalm-nxos napalm-ios napalm-pluribus napalm-panos napalm-ros napalm-vyos
13+
**Driver Name** eos junos iosxr fortios nxos ios pluribus panos ros vyos
14+
**Structured data** Yes Yes No No Yes No No Yes Yes Yes
15+
**Minimum version** 4.15.0F 12.1 5.1.0 5.2.0 6.1 [#g1]_ 12.4(20)T N/A 7.0 3.30 1.1.6
16+
**Backend library** `pyeapi`_ `junos-eznc`_ `pyIOSXR`_ `pyFG`_ `pycsco`_ `netmiko`_ `pyPluribus`_ `netmiko`_, `pan-python`_ `librouteros`_ `netmiko`_
17+
**Caveats** :doc:`eos` :doc:`fortios` :doc:`nxos` :doc:`ios` :doc:`panos` :doc:`vyos`
18+
===================== ========== ============= ============ ============== ============ ============ =============== ========================= ============== ==============
1919

2020
.. _pyeapi: https://github.com/arista-eosplus/pyeapi
2121
.. _junos-eznc: https://github.com/Juniper/py-junos-eznc
2222
.. _pyIOSXR: https://github.com/fooelisa/pyiosxr
2323
.. _pyFG: https://github.com/spotify/pyfg
24-
.. _bnclient: https://github.com/kderynski/blade-netconf-python-client
2524
.. _pycsco: https://github.com/jedelman8/pycsco
2625
.. _netmiko: https://github.com/ktbyers/netmiko
2726
.. _pyPluribus: https://github.com/mirceaulinic/pypluribus
@@ -36,15 +35,15 @@ General support matrix
3635
Configuration support matrix
3736
----------------------------
3837

39-
===================== ========== ===== ========== ============== ============= ============== ============== ============== ============== ======== ========
40-
_ EOS JunOS IOS-XR FortiOS IBM NXOS IOS Pluribus PANOS MikroTik VyOS
41-
===================== ========== ===== ========== ============== ============= ============== ============== ============== ============== ======== ========
42-
**Config. replace** Yes Yes Yes Yes Yes [#c3]_ Yes Yes No Yes No Yes
43-
**Config. merge** Yes Yes Yes Yes Yes Yes Yes No Yes No Yes
44-
**Compare config** Yes Yes Yes [#c1]_ Yes [#c1]_ Yes [#c1]_ Yes [#c4]_ Yes No Yes No Yes
45-
**Atomic Changes** Yes Yes Yes No [#c2]_ No [#c2]_ Yes/No [#c5]_ Yes Yes Yes/No [#c5]_ No Yes
46-
**Rollback** Yes [#c2]_ Yes Yes Yes Yes [#c2]_ Yes/No [#c5]_ Yes No Yes No Yes
47-
===================== ========== ===== ========== ============== ============= ============== ============== ============== ============== ======== ========
38+
===================== ========== ===== ========== ============== ============== ============== ============== ============== ======== ========
39+
_ EOS JunOS IOS-XR FortiOS NXOS IOS Pluribus PANOS MikroTik VyOS
40+
===================== ========== ===== ========== ============== ============== ============== ============== ============== ======== ========
41+
**Config. replace** Yes Yes Yes Yes Yes Yes No Yes No Yes
42+
**Config. merge** Yes Yes Yes Yes Yes Yes No Yes No Yes
43+
**Compare config** Yes Yes Yes [#c1]_ Yes [#c1]_ Yes [#c4]_ Yes No Yes No Yes
44+
**Atomic Changes** Yes Yes Yes No [#c2]_ Yes/No [#c5]_ Yes Yes Yes/No [#c5]_ No Yes
45+
**Rollback** Yes [#c2]_ Yes Yes Yes Yes/No [#c5]_ Yes No Yes No Yes
46+
===================== ========== ===== ========== ============== ============== ============== ============== ============== ======== ========
4847

4948
.. [#c1] Hand-crafted by the API as the device doesn't support the feature.
5049
.. [#c2] Not supported but emulated. Check caveats.
@@ -70,13 +69,13 @@ Other methods
7069
.. |yes| unicode:: U+02705 .. Yes
7170
.. |no| unicode:: U+0274C .. No
7271

73-
============================== ===== ===== ====== ======= ====== ====== ===== ========= ========= ======== ========
74-
_ EOS JunOS IOS-XR FortiOS IBM NXOS IOS Pluribus PANOS MikroTik VyOS
75-
============================== ===== ===== ====== ======= ====== ====== ===== ========= ========= ======== ========
76-
**load_template** |yes| |yes| |yes| |yes| |yes| |yes| |yes| |yes| |yes| |no| |yes|
77-
**ping** |no| |no| |no| |no| |no| |no| |yes| |no| |no| |yes| |yes|
78-
**traceroute** |yes| |yes| |yes| |no| |no| |yes| |yes| |yes| |no| |no| |no|
79-
============================== ===== ===== ====== ======= ====== ====== ===== ========= ========= ======== ========
72+
============================== ===== ===== ====== ======= ====== ===== ========= ========= ======== ========
73+
_ EOS JunOS IOS-XR FortiOS NXOS IOS Pluribus PANOS MikroTik VyOS
74+
============================== ===== ===== ====== ======= ====== ===== ========= ========= ======== ========
75+
**load_template** |yes| |yes| |yes| |yes| |yes| |yes| |yes| |yes| |no| |yes|
76+
**ping** |no| |no| |no| |no| |no| |yes| |no| |no| |yes| |yes|
77+
**traceroute** |yes| |yes| |yes| |no| |yes| |yes| |yes| |no| |no| |no|
78+
============================== ===== ===== ====== ======= ====== ===== ========= ========= ======== ========
8079

8180
Available configuration templates
8281
---------------------------------

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
napalm-base
22
napalm-eos
33
napalm-fortios
4-
napalm-ibm
54
napalm-ios
65
napalm-iosxr
76
napalm-junos

test/unit/TestGetNetworkDriver.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class TestGetNetworkDriver(unittest.TestCase):
1212
"""Test the method get_network_driver."""
1313

14-
@data('eos', 'fortios', 'ibm', 'ios', 'iosxr', 'junos', 'nxos', 'pluribus')
14+
@data('eos', 'fortios', 'ios', 'iosxr', 'junos', 'nxos', 'pluribus')
1515
def test_get_network_driver(self, driver):
1616
"""Check that we can get the desired driver."""
1717
self.assertTrue(get_network_driver(driver))

0 commit comments

Comments
 (0)