Hello community, here is the log from the commit of package python-ciscoconfparse for openSUSE:Factory checked in at 2016-10-10 16:25:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ciscoconfparse (Old) and /work/SRC/openSUSE:Factory/.python-ciscoconfparse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ciscoconfparse" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ciscoconfparse/python-ciscoconfparse.changes 2016-03-17 16:47:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-ciscoconfparse.new/python-ciscoconfparse.changes 2016-10-10 16:25:52.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Oct 9 17:25:20 UTC 2016 - mardnh@gmx.de + +- Update to version 1.2.40 + * Fix Github issue #44 (Could not parse 'ipv6 router ospf 6'). + * Modify default value for access_vlan. + * Add new is_portchannel property. + * Update copyright dates. + * Remove OSX from test matrix +- Fix source url + +------------------------------------------------------------------- Old: ---- ciscoconfparse-1.2.39.tar.gz New: ---- ciscoconfparse-1.2.40.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ciscoconfparse.spec ++++++ --- /var/tmp/diff_new_pack.L9ga3k/_old 2016-10-10 16:25:54.000000000 +0200 +++ /var/tmp/diff_new_pack.L9ga3k/_new 2016-10-10 16:25:54.000000000 +0200 @@ -17,13 +17,13 @@ Name: python-ciscoconfparse -Version: 1.2.39 +Version: 1.2.40 Release: 0 Summary: Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations License: GPL-3.0+ Group: Development/Languages/Python Url: http://www.pennington.net/py/ciscoconfparse/ -Source: https://pypi.python.org/packages/source/c/ciscoconfparse/ciscoconfparse-%{version}.tar.gz +Source: https://pypi.io/packages/source/c/ciscoconfparse/ciscoconfparse-%{version}.tar.gz # PATCH-FIX-OPENSUSE skip-setuptools-hg-require.patch Patch0: skip-setuptools-hg-require.patch BuildRequires: python-colorama @@ -35,11 +35,7 @@ Requires: python-dnspython Requires: python-ipaddr BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%else BuildArch: noarch -%endif %description ciscoconfparse is a Python library, which parses through Cisco IOS-style @@ -67,6 +63,8 @@ %files %defattr(-,root,root,-) %doc CHANGES LICENSE README.rst -%{python_sitelib}/* +%{python_sitelib}/ciscoconfparse +%{python_sitelib}/version_info +%{python_sitelib}/ciscoconfparse-%{version}-py%{py_ver}.egg-info %changelog ++++++ ciscoconfparse-1.2.39.tar.gz -> ciscoconfparse-1.2.40.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/.travis.yml new/ciscoconfparse-1.2.40/.travis.yml --- old/ciscoconfparse-1.2.39/.travis.yml 2015-10-28 02:35:30.000000000 +0100 +++ new/ciscoconfparse-1.2.40/.travis.yml 2016-05-01 22:11:13.000000000 +0200 @@ -12,7 +12,6 @@ # http://docs.travis-ci.com/user/multi-os/ os: - - osx - linux install: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/CHANGES new/ciscoconfparse-1.2.40/CHANGES --- old/ciscoconfparse-1.2.39/CHANGES 2015-10-28 02:40:14.000000000 +0100 +++ new/ciscoconfparse-1.2.40/CHANGES 2016-05-01 22:11:40.000000000 +0200 @@ -1,3 +1,4 @@ +1.2.40 20160430 Fix Github issue #44 (Could not parse 'ipv6 router ospf 6'). Modify default value for access_vlan. Add new is_portchannel property. Update copyright dates. Remove OSX from test matrix 1.2.39 20151027 Fix TravisCI breakage 1.2.38 20151027 Integrate PR #48, which fixes github issue #47 1.2.37 20150706 Fix Github issue #37 (sync_diff() includes double negatives) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/Makefile new/ciscoconfparse-1.2.40/Makefile --- old/ciscoconfparse-1.2.39/Makefile 2015-10-28 02:35:30.000000000 +0100 +++ new/ciscoconfparse-1.2.40/Makefile 2016-04-30 20:31:06.000000000 +0200 @@ -52,6 +52,9 @@ pip install --upgrade pytest==2.6.4 pip install --upgrade mccabe pip install --upgrade flake8 + pip install --upgrade dnspython + pip install --upgrade colorama + pip install --upgrade ipaddr .PHONY: flake flake: flake8 --ignore E501,E226,E225,E221,E303,E302,E265,E128,E125,E124,E41,W291 --max-complexity 10 ciscoconfparse | less diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/PKG-INFO new/ciscoconfparse-1.2.40/PKG-INFO --- old/ciscoconfparse-1.2.39/PKG-INFO 2015-10-28 02:53:47.000000000 +0100 +++ new/ciscoconfparse-1.2.40/PKG-INFO 2016-05-01 22:18:03.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ciscoconfparse -Version: 1.2.39 +Version: 1.2.40 Summary: Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations Home-page: http://www.pennington.net/py/ciscoconfparse/ Author: David Michael Pennington @@ -212,7 +212,7 @@ ===================== ciscoconfparse_ is licensed GPLv3_; Copyright `David Michael Pennington`_, - 2007-2015. + 2007-2016. .. _Author: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/README.rst new/ciscoconfparse-1.2.40/README.rst --- old/ciscoconfparse-1.2.39/README.rst 2015-10-28 02:40:22.000000000 +0100 +++ new/ciscoconfparse-1.2.40/README.rst 2016-04-30 20:48:43.000000000 +0200 @@ -204,7 +204,7 @@ ===================== ciscoconfparse_ is licensed GPLv3_; Copyright `David Michael Pennington`_, -2007-2015. +2007-2016. .. _Author: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/ciscoconfparse/models_cisco.py new/ciscoconfparse-1.2.40/ciscoconfparse/models_cisco.py --- old/ciscoconfparse-1.2.39/ciscoconfparse/models_cisco.py 2015-10-28 02:35:30.000000000 +0100 +++ new/ciscoconfparse-1.2.40/ciscoconfparse/models_cisco.py 2016-04-30 23:07:56.000000000 +0200 @@ -255,6 +255,15 @@ return True return False + @property + def is_portchannel(self): + """Return a boolean indicating whether this port is configured in a port-channel + + """ + retval = self.re_match_iter_typed(r'^\s*channel-group\s+(\d+)', + result_type=bool, default=False) + return retval + ## ##------------- IOS Interface ABC ## @@ -1093,9 +1102,13 @@ @property def access_vlan(self): - """Return an integer with the access vlan number. Return 0, if the port has no explicit vlan configured.""" + """Return an integer with the access vlan number. Return 1, if the switchport has no explicit vlan configured; return 0 if the port isn't a switchport""" + if self.is_switchport: + default_val = 1 + else: + default_val = 0 retval = self.re_match_iter_typed(r'^\s*switchport\s+access\s+vlan\s+(\d+)$', - result_type=int, default=0) + result_type=int, default=default_val) return retval ##------------- CDP @@ -1579,7 +1592,7 @@ @classmethod def is_object_for(cls, line="", re=re): - if (line[0:8]=='ip route') or (line[0:10]=='ipv6 route'): + if (line[0:8]=='ip route') or (line[0:11]=='ipv6 route '): return True return False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/ciscoconfparse/version.py new/ciscoconfparse-1.2.40/ciscoconfparse/version.py --- old/ciscoconfparse-1.2.39/ciscoconfparse/version.py 2015-10-28 02:40:49.000000000 +0100 +++ new/ciscoconfparse-1.2.40/ciscoconfparse/version.py 2016-05-01 22:17:33.000000000 +0200 @@ -1,3 +1,3 @@ ## This file is a workaround for Github issue #24 -__version_tuple__ = (1, 2, 39) +__version_tuple__ = (1, 2, 40) __version__ = '.'.join(map(str, __version_tuple__)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/ciscoconfparse.egg-info/PKG-INFO new/ciscoconfparse-1.2.40/ciscoconfparse.egg-info/PKG-INFO --- old/ciscoconfparse-1.2.39/ciscoconfparse.egg-info/PKG-INFO 2015-10-28 02:53:47.000000000 +0100 +++ new/ciscoconfparse-1.2.40/ciscoconfparse.egg-info/PKG-INFO 2016-05-01 22:18:02.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ciscoconfparse -Version: 1.2.39 +Version: 1.2.40 Summary: Parse, Audit, Query, Build, and Modify Cisco IOS-style configurations Home-page: http://www.pennington.net/py/ciscoconfparse/ Author: David Michael Pennington @@ -212,7 +212,7 @@ ===================== ciscoconfparse_ is licensed GPLv3_; Copyright `David Michael Pennington`_, - 2007-2015. + 2007-2016. .. _Author: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/ciscoconfparse.egg-info/SOURCES.txt new/ciscoconfparse-1.2.40/ciscoconfparse.egg-info/SOURCES.txt --- old/ciscoconfparse-1.2.39/ciscoconfparse.egg-info/SOURCES.txt 2015-10-28 02:53:47.000000000 +0100 +++ new/ciscoconfparse-1.2.40/ciscoconfparse.egg-info/SOURCES.txt 2016-05-01 22:18:03.000000000 +0200 @@ -29,7 +29,6 @@ ciscoconfparse.egg-info/SOURCES.txt ciscoconfparse.egg-info/dependency_links.txt ciscoconfparse.egg-info/not-zip-safe -ciscoconfparse.egg-info/pbr.json ciscoconfparse.egg-info/requires.txt ciscoconfparse.egg-info/top_level.txt configs/HP_Procurve.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/ciscoconfparse.egg-info/pbr.json new/ciscoconfparse-1.2.40/ciscoconfparse.egg-info/pbr.json --- old/ciscoconfparse-1.2.39/ciscoconfparse.egg-info/pbr.json 2015-10-28 02:53:47.000000000 +0100 +++ new/ciscoconfparse-1.2.40/ciscoconfparse.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -{"is_release": false, "git_version": "c1bb64e"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/sphinx-doc/license_copyright.rst new/ciscoconfparse-1.2.40/sphinx-doc/license_copyright.rst --- old/ciscoconfparse-1.2.39/sphinx-doc/license_copyright.rst 2015-10-28 02:35:31.000000000 +0100 +++ new/ciscoconfparse-1.2.40/sphinx-doc/license_copyright.rst 2016-04-30 20:47:27.000000000 +0200 @@ -2,7 +2,7 @@ ===================== ciscoconfparse_ is licensed GPLv3_; Copyright `David Michael Pennington`_, -2007-2015. +2007-2016. .. _`GPLv3`: http://www.gnu.org/licenses/gpl-3.0.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ciscoconfparse-1.2.39/tests/test_Models_Cisco.py new/ciscoconfparse-1.2.40/tests/test_Models_Cisco.py --- old/ciscoconfparse-1.2.39/tests/test_Models_Cisco.py 2015-10-28 02:35:31.000000000 +0100 +++ new/ciscoconfparse-1.2.40/tests/test_Models_Cisco.py 2016-04-30 23:29:06.000000000 +0200 @@ -149,6 +149,29 @@ obj = cfg.ConfigObjs[0] assert obj.name==result_correct +def testVal_IOSIntfLine_is_portchannel(parse_c01_factory): + cfg = parse_c01_factory + for intf_obj in cfg.find_objects('^interface\sGigabitEthernet4\/1$'): + assert intf_obj.is_portchannel is False + for intf_obj in cfg.find_objects('^interface\sGigabitEthernet4\/4$'): + assert intf_obj.is_portchannel is False + +def testVal_IOSIntfLine_is_switchport(parse_c01_factory): + cfg = parse_c01_factory + for intf_obj in cfg.find_objects('^interface\sGigabitEthernet4\/1$'): + assert intf_obj.is_switchport is True + for intf_obj in cfg.find_objects('^interface\sGigabitEthernet4\/4$'): + assert intf_obj.is_switchport is False + +def testVal_IOSIntfLine_access_vlan(parse_c01_factory): + cfg = parse_c01_factory + for intf_obj in cfg.find_objects('^interface\sGigabitEthernet4\/1$'): + assert intf_obj.access_vlan==100 + for intf_obj in cfg.find_objects('^interface\sGigabitEthernet4\/8$'): + assert intf_obj.access_vlan==110 + for intf_obj in cfg.find_objects('^interface\sGigabitEthernet4\/4$'): + assert intf_obj.access_vlan==0 + def testVal_IOSIntfLine_abbvs(parse_c03_factory): cfg = parse_c03_factory result_correct = {