pool/python-junos-eznc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 811738 from devel:languages:python

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/811738
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-junos-eznc?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2020-06-15 18:28:05 +00:00 committed by Git OBS Bridge
commit 81abda5f77
5 changed files with 371 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python-junos-eznc-2.3.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3efbd1226fb5066ea53c3de316664f17a0f7c9dd88915507ea8b828c2810de7
size 550912

3
python-junos-eznc-2.4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:843020e14d53c68dbbc331bcbcc1ed5c8248a1258f5475ddc6bfadbb5152224b
size 554677

277
python-junos-eznc-no-unittest2.patch Normal file
View File

@ -0,0 +1,277 @@
Index: py-junos-eznc-2.3.1/development.txt
===================================================================
--- py-junos-eznc-2.3.1.orig/development.txt 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/development.txt 2020-06-02 09:22:40.050714175 +0200
@@ -6,4 +6,3 @@ nose # http://nose.readthedocs.o
pep8 # https://github.com/jcrocholl/pep8
pyflakes # https://launchpad.net/pyflakes
coveralls # https://coveralls.io/
-unittest2>=0.5.1 # https://pypi.python.org/pypi/unittest2
Index: py-junos-eznc-2.3.1/tests/functional/test_core.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/functional/test_core.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/functional/test_core.py 2020-06-02 09:24:17.503246419 +0200
@@ -1,6 +1,9 @@
__author__ = "rsherman, vnitinv"
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from jnpr.junos.exception import RpcTimeoutError
Index: py-junos-eznc-2.3.1/tests/functional/test_table.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/functional/test_table.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/functional/test_table.py 2020-06-02 09:24:46.555405079 +0200
@@ -1,6 +1,9 @@
__author__ = "rsherman, vnitinv"
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from jnpr.junos.op.routes import RouteTable
Index: py-junos-eznc-2.3.1/tests/unit/factory/test_to_json.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/factory/test_to_json.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/factory/test_to_json.py 2020-06-02 09:37:16.499457233 +0200
@@ -1,6 +1,9 @@
__author__ = "Rick Sherman"
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import patch
import os
Index: py-junos-eznc-2.3.1/tests/unit/facts/test__init__.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/facts/test__init__.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/facts/test__init__.py 2020-06-02 09:38:06.663731374 +0200
@@ -1,7 +1,10 @@
__author__ = "Stacy Smith"
__credits__ = "Jeremy Schulman, Nitin Kumar"
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
import importlib
import sys
Index: py-junos-eznc-2.3.1/tests/unit/facts/test_swver.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/facts/test_swver.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/facts/test_swver.py 2020-06-04 12:31:16.270468805 +0200
@@ -1,7 +1,11 @@
__author__ = "Stacy Smith"
__credits__ = "Jeremy Schulman, Nitin Kumar"
-import unittest2 as unittest
+import six
+try:
+ import unittest2 as unittest
+except:
+ import unittest
from nose.plugins.attrib import attr
from jnpr.junos.facts.swver import version_info, get_facts
@@ -9,17 +13,18 @@ from jnpr.junos.facts.swver import versi
@attr('unit')
class TestVersionInfo(unittest.TestCase):
-
+ if six.PY2:
+ assertCountEqual = unittest.TestCase.assertItemsEqual
def test_version_info_after_type_len_else(self):
self.assertEqual(version_info('12.1X46-D10').build, None)
def test_version_info_X_type_non_hyphenated(self):
- self.assertItemsEqual(
+ self.assertCountEqual(
version_info('11.4X12.2'),
[('build', 2), ('major', (11, 4)), ('minor', '12'), ('type', 'X')])
def test_version_info_X_type_non_hyphenated_nobuild(self):
- self.assertItemsEqual(
+ self.assertCountEqual(
version_info('11.4X12'),
[('build', None), ('major', (11, 4)), ('minor', '12'), ('type', 'X')])
@@ -61,12 +66,12 @@ class TestVersionInfo(unittest.TestCase)
"build: 5\nmajor: !!python/tuple\n- 11\n- 4\nminor: '7'\ntype: R\n")
def test_version_iter(self):
- self.assertItemsEqual(
+ self.assertCountEqual(
version_info('11.4R7.5'),
[('build', 5), ('major', (11, 4)), ('minor', '7'), ('type', 'R')])
def test_version_feature_velocity(self):
- self.assertItemsEqual(
+ self.assertCountEqual(
version_info('15.4F7.5'),
[('build', 5), ('major', (15, 4)), ('minor', '7'), ('type', 'F')])
Index: py-junos-eznc-2.3.1/tests/unit/ofacts/test_swver.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/ofacts/test_swver.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/ofacts/test_swver.py 2020-06-02 09:39:36.380221690 +0200
@@ -1,7 +1,10 @@
__author__ = "Nitin Kumar, Rick Sherman"
__credits__ = "Jeremy Schulman"
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import patch, MagicMock
import os
Index: py-junos-eznc-2.3.1/tests/unit/test_console.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/test_console.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/test_console.py 2020-06-02 09:40:33.860535824 +0200
@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from jnpr.junos.utils.config import Config
from nose.plugins.attrib import attr
from mock import patch, MagicMock, call
Index: py-junos-eznc-2.3.1/tests/unit/test_decorators.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/test_decorators.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/test_decorators.py 2020-06-02 09:40:56.432659185 +0200
@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from lxml.etree import XML
Index: py-junos-eznc-2.3.1/tests/unit/test_device.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/test_device.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/test_device.py 2020-06-02 09:41:17.232772861 +0200
@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import MagicMock, patch, mock_open, call
import os
Index: py-junos-eznc-2.3.1/tests/unit/test_factcache.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/test_factcache.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/test_factcache.py 2020-06-02 09:42:15.129089270 +0200
@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import patch, MagicMock, call
from jnpr.junos.exception import FactLoopError
Index: py-junos-eznc-2.3.1/tests/unit/transport/test_serial.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/transport/test_serial.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/transport/test_serial.py 2020-06-02 09:44:13.877738198 +0200
@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import MagicMock, patch
import sys
Index: py-junos-eznc-2.3.1/tests/unit/transport/test_tty_netconf.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/transport/test_tty_netconf.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/transport/test_tty_netconf.py 2020-06-02 09:44:54.209958559 +0200
@@ -1,4 +1,7 @@
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import MagicMock, patch
from jnpr.junos.transport.tty_netconf import tty_netconf
Index: py-junos-eznc-2.3.1/tests/unit/transport/test_tty.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/transport/test_tty.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/transport/test_tty.py 2020-06-02 09:44:28.917820369 +0200
@@ -1,5 +1,8 @@
import logging
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import MagicMock, patch
Index: py-junos-eznc-2.3.1/tests/unit/transport/test_tty_ssh.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/transport/test_tty_ssh.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/transport/test_tty_ssh.py 2020-06-02 09:45:28.666146801 +0200
@@ -1,6 +1,9 @@
import socket
import sys
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import MagicMock, patch
from jnpr.junos.transport.tty_ssh import SSH
Index: py-junos-eznc-2.3.1/tests/unit/transport/test_tty_telnet.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/transport/test_tty_telnet.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/transport/test_tty_telnet.py 2020-06-02 09:48:57.923290082 +0200
@@ -1,5 +1,8 @@
import sys
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from mock import MagicMock, patch
from jnpr.junos.transport.tty_telnet import Telnet
Index: py-junos-eznc-2.3.1/tests/unit/utils/test_sw.py
===================================================================
--- py-junos-eznc-2.3.1.orig/tests/unit/utils/test_sw.py 2019-12-10 07:54:12.000000000 +0100
+++ py-junos-eznc-2.3.1/tests/unit/utils/test_sw.py 2020-06-02 09:43:36.313532958 +0200
@@ -2,7 +2,10 @@ from __future__ import print_function
import os
import sys
from six import StringIO
-import unittest2 as unittest
+try:
+ import unittest2 as unittest
+except ImportError:
+ import unittest
from nose.plugins.attrib import attr
from contextlib import contextmanager
from jnpr.junos import Device

83
python-junos-eznc.changes
View File

@ -1,3 +1,86 @@
-------------------------------------------------------------------
Thu Jun 4 11:04:08 UTC 2020 - pgajdos@suse.com
- version update to 2.4.1
## [1.4.0]
### Fixed
- [#617] - IOS show ip ospf database router: Removed reliance on static spacing
- [#620] - NXOS show fex: Allow spaces in descriptions
- [#621] - Juniper show arp, etc.: Account for virtual chassis output (`{master:0}`)
- [#626] - ASA show vpn-sessiondb anyconnect: Require index, capture different format style
- [#650] - IOS show ip ospf database network: Change to allow one or more whitespace at the beginning of the line rather than 1 or more due to different output
- [#647] - ASA show route: Allow multiline route statements
- [#659] - IOS show mac address-table: Allow VLAN to be non-whitespace to allow N/A as an option
### Added
- [#618] - IOS show ip ospf database network: New template
- [#619] - HP Comware display lldp neighbor information verbose: New template
- [#625] - ASA show vpn-sessiondb anyconnect: New template
- [#628] - Cisco WLC show mobility sum: New template
- [#631] - ASA show vpn-sessiondb anyconnect: Account for new data for assigned/public IP, group policy, and tunnel group
- [#629] - ASA show crypto ipsec sa - Add LOCAL_ADDRESS_NAME, CURRENT_PEER_NAME, DYNAMIC_PEER_NAME, LOCAL_CRYPTO_ENDPOINT_NAME, REMOTE_CRYPTO_ENDPOINT_NAME
- [#632] - ASA show nat: Added SERVICE_PROTOCOL
- [#635] - IOS show ip route summary: New template
- [#636] - ASA show vpn-sessiondb: New template
- [#638] - ASA show inventory: Capture PID and VID withoout serial
- [#637] - Cisco WLC show band select: New template
## [1.4.0]
### Fixed
- [#548] IOS show mac address-table: Account for Total Mac Addresses
- [#565] IOS show license: Avoid trailing spaces for features
- [#575] NXOS show version: Match N5K PLATFORM & LAST_REBOOT captures split words
- [#574] ASA show failover: Account for new output (IPS)
- [#577] IOS show mac address-table: Account for Multicast Entries
- [#582] NXOS show interface transceiver: Remove requirement for TYPE
- [#585] IOS show mac address-table: Fixed ordering for TYPE2
- [#587] IOS show interfaces switchport: Account for Vepa Enabled and Operational Dot1q Ethertype
- [#584] IOS show switch detail: Account for Mac persistency wait time
- [#589] EOS show ip route: Filldown for DISTANCE and METRIC - Added new data formats for VRF and NEXT_HOP and INTERFACE
- [#592] Fortinet get router info bgp summary: Account for more data, fix UP_DOWN regex from word to non-whitespace
- [#603] IOS show ip access-list: Update PROTOCOL to capture numbered protocols
- [610] Aruba os show arp: Fix tests to have the full output from the command and device
- [#608] Vyatta VyOS show interfaces: Capture IP_ADDRESS with or without netmask
- [#614] IOS show interfaces status: Remove reliance on whitespaces
### Added
- [#406] Testing: Add yamllint to test suite
- [#407] Testing: Add python black to test suite
- [#553] IOS show lldp neighbors: Added CAPABILITIES capture group
- [#554] IOS show logging: New template
- [#563] IOS show interfaces switchport: Added ADMIN_MDOE capture group
- [#562] ASA show logging: New template
- [#564] NXOS show interface transceiver: New template
- [#567] XR show arp: New template
- [#572] IOS show lldp neighbors detail: Added SERIAL capture group
- [#573] ASA show arp: New template
- [#578] Fortinet get system interface: New template
- [#576] Huawei VRP display lldp neighbor: New template
- [#581] Cisco WLC show vlan sum: New template
- [#580] XR show interfaces summary: New template
- [#590] IOS show ip bgp neighbors: New template
- [#591] NXOS show vdc: New template
- [#595] Checkpoint GAIA show arp dynamic all: New template
- [#593] IOS show module: New template
- [#597] Huwai VRP display version: New template
- [#602] NXOS show vrf interface: New template
- [#598] IOS show running-config partition access list: Added TCP_FLAG capture group
- [#598] IOS show running-config partition access list: Convert COMMENT to list
- [#598] IOS show running-config partition access list: Update PROTOCOL to include numbered protocols
- [#596] XR admin show environment power: New template
- [#594] Aruba os show arp: New template
- [#605] SG300 show version: New template
- [#604] NXOS show vlan: Added INTERFACES capture group, Require VLAN_ID
- [#600] IOS show mpls interfaces: New template
- [#599] IOS show etherchannel summary: New template
- [#611] NXOS show interface: Added MODE capture group
- [#612] NXOS show interfaces switchport: Added ACCESS_VLAN_NAME and NATIVE_VLAN_NAME capture groups
- [#609] HP Comware display ip interface: New template
- [#606] IOS show ip ospf database router: New template
### Changed
- [#406] Helpers: Added development_helpers cli utility to replace existing helpers
- python3 package only, as ntc-templates is python3 only
- added patches
https://github.com/Juniper/py-junos-eznc/pull/1040
+ python-junos-eznc-no-unittest2.patch
-------------------------------------------------------------------
Tue Dec 10 18:53:42 UTC 2019 - Martin Hauke <mardnh@gmx.de>

11
python-junos-eznc.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-junos-eznc
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
#
# All modifications and additions to the file contributed by third parties
@ -18,13 +18,16 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-junos-eznc
Version: 2.3.1
Version: 2.4.1
Release: 0
Summary: Junos 'EZ' automation for non-programmers
License: Apache-2.0
URL: https://www.github.com/Juniper/py-junos-eznc
Source: https://github.com/Juniper/py-junos-eznc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# https://github.com/Juniper/py-junos-eznc/pull/1040
Patch0: python-junos-eznc-no-unittest2.patch
BuildRequires: %{python_module Jinja2 >= 2.7.1}
BuildRequires: %{python_module PyYAML >= 5.1}
BuildRequires: %{python_module lxml >= 3.2.4}
@ -32,6 +35,7 @@ BuildRequires: %{python_module mock}
BuildRequires: %{python_module ncclient >= 0.6.3}
BuildRequires: %{python_module netaddr}
BuildRequires: %{python_module nose}
BuildRequires: %{python_module ntc-templates}
BuildRequires: %{python_module paramiko >= 1.15.2}
BuildRequires: %{python_module pyparsing}
BuildRequires: %{python_module pyserial}
@ -40,7 +44,6 @@ BuildRequires: %{python_module selectors2}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: %{python_module transitions}
BuildRequires: %{python_module unittest2 >= 0.5.1}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-Jinja2 >= 2.7.1
@ -48,6 +51,7 @@ Requires: python-PyYAML >= 5.1
Requires: python-lxml >= 3.2.4
Requires: python-ncclient >= 0.6.3
Requires: python-netaddr
Requires: python-ntc-templates
Requires: python-paramiko >= 1.15.2
Requires: python-pyparsing
Requires: python-pyserial
@ -72,6 +76,7 @@ These capabilities include, but are not limited to:
%prep
%setup -q -n py-junos-eznc-%{version}
%patch0 -p1
sed -i -e '/yamlordereddictloader/d' requirements.txt
# requires deprecated and not working yamlordereddictloader
rm tests/unit/factory/test_cmdtable.py