pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Add py-napalm to version 1.2.0.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Mon May 22 16:02:19 2017 +0200
Changeset:	2a016539f4156cd624c18afddcdc42faa345bad9

Modified Files:
	py-napalm/Makefile
	py-napalm/PLIST
	py-napalm/distinfo
Removed Files:
	py-napalm/patches/patch-napalm_____init____.py
	py-napalm/patches/patch-napalm_exceptions.py
	py-napalm/patches/patch-napalm_ios.py

Log Message:
Add py-napalm to version 1.2.0.

This new version has split out the OS-specific packages to
separate packages which this one depends on.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2a016539f4156cd624c18afddcdc42faa345bad9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-napalm/Makefile                             | 34 ++++++++-----------
 py-napalm/PLIST                                | 45 --------------------------
 py-napalm/distinfo                             |  8 ++---
 py-napalm/patches/patch-napalm_____init____.py | 32 ------------------
 py-napalm/patches/patch-napalm_exceptions.py   | 12 -------
 py-napalm/patches/patch-napalm_ios.py          | 38 ----------------------
 6 files changed, 17 insertions(+), 152 deletions(-)

diffs:
diff --git a/py-napalm/Makefile b/py-napalm/Makefile
index 73ccafe356..d10fa751ac 100644
--- a/py-napalm/Makefile
+++ b/py-napalm/Makefile
@@ -1,38 +1,30 @@
 # $NetBSD$
 
-DISTNAME=	napalm-0.51.0
+DISTNAME=	napalm-1.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=napalm-automation/}
+GITHUB_PROJECT=	napalm
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/napalm-automation/napalm/
 COMMENT=	Interact with different router vendors using unified API
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-netmiko-[0-9]*:../../wip/py-netmiko
-DEPENDS+=	${PYPKGPREFIX}-IOSXR-[0-9]*:../../wip/py-IOSXR
-DEPENDS+=	${PYPKGPREFIX}-junos-eznc-[0-9]*:../../net/py-junos-eznc
-DEPENDS+=	${PYPKGPREFIX}-ncclient-[0-9]*:../../net/py-ncclient
-DEPENDS+=	${PYPKGPREFIX}-eapi-[0-9]*:../../wip/py-eapi
+DEPENDS+=	${PYPKGPREFIX}-napalm-junos-[0-9]*:../../wip/py-napalm-junos
+DEPENDS+=	${PYPKGPREFIX}-napalm-iosxr-[0-9]*:../../wip/py-napalm-iosxr
+DEPENDS+=	${PYPKGPREFIX}-napalm-ios-[0-9]*:../../wip/py-napalm-ios
 
-# Not yet packaged, this may depend on:
-# pyFG		API for FortiOS or how to turn FortiOS into JunOS
-# pycsco	Library for working with Cisco NX-OS switches
-# bnclient	Blade Network Technologies Netconf Python Client
+# Not yet packaged:
+#DEPENDS+=	${PYPKGPREFIX}-napalm-eos-[0-9]*:../../wip/py-napalm-eos
+#DEPENDS+=	${PYPKGPREFIX}-napalm-fortios-[0-9]*:../../wip/py-napalm-fortios
+#DEPENDS+=	${PYPKGPREFIX}-napalm-nxos-[0-9]*:../../wip/py-napalm-nxos
+#DEPENDS+=	${PYPKGPREFIX}-napalm-pluribus-[0-9]*:../../wip/py-napalm-pluribus
+#DEPENDS+=	${PYPKGPREFIX}-napalm-panos-[0-9]*:../../wip/py-napalm-panos
+#DEPENDS+=	${PYPKGPREFIX}-napalm-ros-[0-9]*:../../wip/py-napalm-ros
+#DEPENDS+=	${PYPKGPREFIX}-napalm-vyos-[0-9]*:../../wip/py-napalm-vyos
 
 USE_LANGUAGES=	# none
 
-# Target dir already exists...
-INSTALL_EXTRA_FILES=	napalm/utils/*.yml
-
-post-install:
-	cd ${WRKSRC}; \
-	for f in ${INSTALL_EXTRA_FILES}; do \
-		${INSTALL_DATA} $$f  \
-			${DESTDIR}/${PREFIX}/${PYSITELIB}/`dirname $$f`; \
-	done
-
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-napalm/PLIST b/py-napalm/PLIST
index 4598683289..cc32755eca 100644
--- a/py-napalm/PLIST
+++ b/py-napalm/PLIST
@@ -1,54 +1,9 @@
 @comment $NetBSD$
-bin/cl_napalm_configure
 ${PYSITELIB}/${EGG_FILE}/PKG-INFO
 ${PYSITELIB}/${EGG_FILE}/SOURCES.txt
 ${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
 ${PYSITELIB}/${EGG_FILE}/requires.txt
 ${PYSITELIB}/${EGG_FILE}/top_level.txt
 ${PYSITELIB}/napalm/__init__.py
 ${PYSITELIB}/napalm/__init__.pyc
 ${PYSITELIB}/napalm/__init__.pyo
-${PYSITELIB}/napalm/base.py
-${PYSITELIB}/napalm/base.pyc
-${PYSITELIB}/napalm/base.pyo
-${PYSITELIB}/napalm/clitools/__init__.py
-${PYSITELIB}/napalm/clitools/__init__.pyc
-${PYSITELIB}/napalm/clitools/__init__.pyo
-${PYSITELIB}/napalm/clitools/cl_napalm_configure.py
-${PYSITELIB}/napalm/clitools/cl_napalm_configure.pyc
-${PYSITELIB}/napalm/clitools/cl_napalm_configure.pyo
-${PYSITELIB}/napalm/eos.py
-${PYSITELIB}/napalm/eos.pyc
-${PYSITELIB}/napalm/eos.pyo
-${PYSITELIB}/napalm/exceptions.py
-${PYSITELIB}/napalm/exceptions.pyc
-${PYSITELIB}/napalm/exceptions.pyo
-${PYSITELIB}/napalm/fortios.py
-${PYSITELIB}/napalm/fortios.pyc
-${PYSITELIB}/napalm/fortios.pyo
-${PYSITELIB}/napalm/ibm.py
-${PYSITELIB}/napalm/ibm.pyc
-${PYSITELIB}/napalm/ibm.pyo
-${PYSITELIB}/napalm/ios.py
-${PYSITELIB}/napalm/ios.pyc
-${PYSITELIB}/napalm/ios.pyo
-${PYSITELIB}/napalm/iosxr.py
-${PYSITELIB}/napalm/iosxr.pyc
-${PYSITELIB}/napalm/iosxr.pyo
-${PYSITELIB}/napalm/junos.py
-${PYSITELIB}/napalm/junos.pyc
-${PYSITELIB}/napalm/junos.pyo
-${PYSITELIB}/napalm/nxos.py
-${PYSITELIB}/napalm/nxos.pyc
-${PYSITELIB}/napalm/nxos.pyo
-${PYSITELIB}/napalm/utils/__init__.py
-${PYSITELIB}/napalm/utils/__init__.pyc
-${PYSITELIB}/napalm/utils/__init__.pyo
-${PYSITELIB}/napalm/utils/junos_views.py
-${PYSITELIB}/napalm/utils/junos_views.pyc
-${PYSITELIB}/napalm/utils/junos_views.pyo
-${PYSITELIB}/napalm/utils/junos_views.yml
-${PYSITELIB}/napalm/utils/string_parsers.py
-${PYSITELIB}/napalm/utils/string_parsers.pyc
-${PYSITELIB}/napalm/utils/string_parsers.pyo
diff --git a/py-napalm/distinfo b/py-napalm/distinfo
index a03204cc42..ef40f0a527 100644
--- a/py-napalm/distinfo
+++ b/py-napalm/distinfo
@@ -1,9 +1,9 @@
 $NetBSD$
 
-SHA1 (napalm-0.51.0.tar.gz) = 0e6d1737799aa705d6d62e74ebe3c879196b5c73
-RMD160 (napalm-0.51.0.tar.gz) = d77028e76ed653304fca19cfea444b971b320943
-SHA512 (napalm-0.51.0.tar.gz) = 99d749a50ee7d09c1a0de994055d86fd5f9603daa14fd73c847ffe9dc6ed8315d27758c16cb22a8d8dfcc031d80f24e41b0870b1b52d60530df167677661cd56
-Size (napalm-0.51.0.tar.gz) = 292674 bytes
+SHA1 (napalm-1.2.0.tar.gz) = 4dedbafef06b4477a386012ffe8074a87470f89c
+RMD160 (napalm-1.2.0.tar.gz) = f0a30841f1010adf09a42547741dfbc8f20eb032
+SHA512 (napalm-1.2.0.tar.gz) = b8012d4d68078ea148a94c1c51f7923961916e074838bba4627042f167ef738c79e474e7a69737d8f822ec52a6c6378f2ae38d3ac6c4cd072aee633e6255033b
+Size (napalm-1.2.0.tar.gz) = 78077 bytes
 SHA1 (patch-napalm_____init____.py) = a63759bbf2262a12fa30c8698574f92255d82e61
 SHA1 (patch-napalm_exceptions.py) = 59f90a81d342e123c228332de5a338ce215b1c4f
 SHA1 (patch-napalm_ios.py) = 7e298cdd23eb2bbf3c4b20285f37a13e6a0ac9be
diff --git a/py-napalm/patches/patch-napalm_____init____.py b/py-napalm/patches/patch-napalm_____init____.py
deleted file mode 100644
index 208917b484..0000000000
--- a/py-napalm/patches/patch-napalm_____init____.py
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-Comment out modules where we've not packaged the prerequisites yet.
-
---- napalm/__init__.py.orig	2016-02-08 08:22:24.000000000 +0000
-+++ napalm/__init__.py
-@@ -15,9 +15,9 @@
- from eos import EOSDriver
- from iosxr import IOSXRDriver
- from junos import JunOSDriver
--from fortios import FortiOSDriver
--from nxos import NXOSDriver
--from ibm import IBMDriver
-+# from fortios import FortiOSDriver
-+# from nxos import NXOSDriver
-+# from ibm import IBMDriver
- from ios import IOSDriver
- 
- def get_network_driver(vendor):
-@@ -28,9 +28,9 @@ def get_network_driver(vendor):
-         'IOSXR': IOSXRDriver,
-         'JUNOS': JunOSDriver,
-         'JUNIPER': JunOSDriver,
--        'FORTIOS': FortiOSDriver,
--        'NXOS': NXOSDriver,
--        'IBM': IBMDriver,
-+#        'FORTIOS': FortiOSDriver,
-+#        'NXOS': NXOSDriver,
-+#         'IBM': IBMDriver,
-         'IOS' : IOSDriver,
-     }
-     try:
diff --git a/py-napalm/patches/patch-napalm_exceptions.py b/py-napalm/patches/patch-napalm_exceptions.py
deleted file mode 100644
index b60295f4a5..0000000000
--- a/py-napalm/patches/patch-napalm_exceptions.py
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Add an EnableModeException.
-
---- napalm/exceptions.py.orig	2016-02-08 08:22:24.000000000 +0000
-+++ napalm/exceptions.py
-@@ -20,3 +20,5 @@ class MergeConfigException(Exception):
- 
- class SessionLockedException(Exception):
-     pass
-+class EnableModeException(Exception):
-+    pass
diff --git a/py-napalm/patches/patch-napalm_ios.py b/py-napalm/patches/patch-napalm_ios.py
deleted file mode 100644
index 8059d50e1f..0000000000
--- a/py-napalm/patches/patch-napalm_ios.py
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-Optionally use "enable" to enter privileged mode, not everyone have
-their AAA set up to log directly in as privileged.
-
---- napalm/ios.py.orig	2016-02-08 08:22:24.000000000 +0000
-+++ napalm/ios.py
-@@ -21,7 +21,7 @@ from datetime import datetime
- 
- from netmiko import ConnectHandler, FileTransfer
- from napalm.base import NetworkDriver
--from napalm.exceptions import ReplaceConfigException, MergeConfigException
-+from napalm.exceptions import ReplaceConfigException, MergeConfigException, EnableModeException
- 
- # Easier to store these as constants
- HOUR_SECONDS = 3600
-@@ -47,6 +47,7 @@ class IOSDriver(NetworkDriver):
-         self.global_delay_factor = optional_args.get('global_delay_factor', .5)
-         self.port = optional_args.get('port', 22)
-         self.auto_rollback_on_error = optional_args.get('auto_rollback_on_error', True)
-+        self.secret = optional_args.get('secret', '')
-         self.device = None
-         self.config_replace = False
- 
-@@ -58,7 +59,13 @@ class IOSDriver(NetworkDriver):
-                                      username=self.username,
-                                      password=self.password,
-                                      global_delay_factor=self.global_delay_factor,
-+                                     secret=self.secret,
-                                      verbose=False)
-+        if self.secret:
-+          self.device.enable()
-+          if not self.device.check_enable_mode():
-+            raise EnableModeException('not in enable, Wrong password?')
-+
- 
-     def close(self):
-         """Closes the connection to the device."""


Home | Main Index | Thread Index | Old Index