MFH: r535274 r536372

net-mgmt/py-napalm: Update to 3.0.0
net-mgmt/py-napalm: Update to 3.0.1

* Remove the patch that fixed some issues with net-mgmt/py-junos-eznc as it
  has been merged by upstream.

  Get rid of the post-patch target as well because it's no longer required.

* Add some instructions to cope with the command changes that were
  introduced to newer versions of Arista EOS.

Changelog with some notable changes/fixes:

General:
* Integrated nxapi_plumbing and pyIOSXR into NAPALM.
* Updated support for TwoGigabit & TwentyFiveGig interfaces to
  canonical_map.py

NXOS:
* Fix exception when trying to get environmental data from certain Nexus
  devices
* Fix "cmd_verify" and null character

IOS:
* Fix traceroute output parsing in ios
* Fix vrf detection when no vrf is defined
* Fix show interfaces summary for 10/40/100 Gig Interfaces
* Fix get_bgp_neighbors_detail
* "get_interfaces_counters" broken with Managment Interface
* "get_optics" does not work on VSS setup
* "get_optics" broken if input value is N/A

IOS-XE:
* Update to handle Cisco ISR mac address table with multiple EHWIC modules
  installed

IOS-XR:
* Add support for XML namespace prefixes in find_txt

Junos:
* Added auto_probe optional argument
* Add support for configure private in Junos
* SRX cluster devices stack RPC replies under multi-routing-engine-results
* Close configuration in case "configure_private" is set to avoid configure
  session to stay forever

https://github.com/napalm-automation/napalm/releases/tag/3.0.0
https://github.com/napalm-automation/napalm/releases/tag/3.0.1

Approved by:	ports-secteam (joneum)

4 files changed, 28 insertions, 29 deletions

diff --git a/net-mgmt/py-napalm/Makefile b/net-mgmt/py-napalm/Makefile
index 551bb1626b4b..0c85cdf860ad 100644
--- a/net-mgmt/py-napalm/Makefile
+++ b/net-mgmt/py-napalm/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	napalm
-DISTVERSION=	2.5.0
+DISTVERSION=	3.0.1
 CATEGORIES=	net-mgmt python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -13,14 +13,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=4.3.0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}textfsm>0:textproc/py-textfsm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}junos-eznc>=2.2.1:net-mgmt/py-junos-eznc@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}netmiko>=2.4.2:security/py-netmiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paramiko>=2.4.2:security/py-paramiko@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nxapi-plumbing>=0.5.2:net-mgmt/py-nxapi-plumbing@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}netmiko>=3.1.0:security/py-netmiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paramiko>=2.6.0:security/py-paramiko@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.7.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyeapi>=0.8.2:net-mgmt/py-pyeapi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyIOSXR>=0.53:net-mgmt/py-pyIOSXR@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scp>0:security/py-scp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.11.3:devel/py-cffi@${PY_FLAVOR} \
@@ -36,9 +36,6 @@ GH_ACCOUNT=	napalm-automation
 
 NO_ARCH=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|==|>=|' ${WRKSRC}/requirements.txt
-
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
diff --git a/net-mgmt/py-napalm/distinfo b/net-mgmt/py-napalm/distinfo
index f4c555093f66..796909c41946 100644
--- a/net-mgmt/py-napalm/distinfo
+++ b/net-mgmt/py-napalm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571639020
-SHA256 (napalm-automation-napalm-2.5.0_GH0.tar.gz) = c30254303f0d908f64902d89ea73673a922d3a27f94c2af674264a1b5a230249
-SIZE (napalm-automation-napalm-2.5.0_GH0.tar.gz) = 1104384
+TIMESTAMP = 1589873376
+SHA256 (napalm-automation-napalm-3.0.1_GH0.tar.gz) = a2d159e91a2d1355fc1eed323a189981999f99776d15c628a8b6aba822fb855a
+SIZE (napalm-automation-napalm-3.0.1_GH0.tar.gz) = 1197783
diff --git a/net-mgmt/py-napalm/files/patch-test_junos_conftest.py b/net-mgmt/py-napalm/files/patch-test_junos_conftest.py
deleted file mode 100644
index 870f49399f52..000000000000
--- a/net-mgmt/py-napalm/files/patch-test_junos_conftest.py
+++ /dev/null
@@ -1,18 +0,0 @@
-Fixes unittests with net-mgmt/py-junos-eznc >= 2.3.0
-
-See also:
-https://github.com/napalm-automation/napalm/issues/1060
-
---- test/junos/conftest.py.orig	2019-10-10 10:31:18 UTC
-+++ test/junos/conftest.py
-@@ -77,6 +77,10 @@ class FakeJunOSDevice(BaseTestDouble):
-         }
-         self._uptime = 4380
- 
-+        # Since junos-eznc 2.3.0 the new SAX parser is used as default. Thus
-+        # disable it to use the DOM parser which was used prior.
-+        self._use_filter = False
-+
-     @property
-     def facts(self):
-         # we want to reinitialize it every time to avoid side effects
diff --git a/net-mgmt/py-napalm/pkg-message b/net-mgmt/py-napalm/pkg-message
new file mode 100644
index 000000000000..4a6e3205deff
--- /dev/null
+++ b/net-mgmt/py-napalm/pkg-message
@@ -0,0 +1,20 @@
+[
+{ type: upgrade
+  maximum_version: "3.0.1"
+  message: <<EOD
+Release 3.0.0 introduced support for the Arista FN 0039 command changes (Github
+issue #1093), by replacing the old style commands with the new style commands.
+
+This also affected the way NAPALM loads the configuration on the device (i.e.,
+it would transform the configuration before loading).
+
+In order to prevent this, and avoid unexpected results, a new optional argument
+"eos_fn0039_config" was introduced, defaulting to "False", which can be used to
+select whether NAPALM should convert the configuration command before loading.
+
+By default, NAPALM won't transform the configuration, but setting the variable
+"eos_fn0039_config" to "True" it would help one to transition to newer EOS
+versions.
+EOD
+}
+]