Hello community,
here is the log from the commit of package python-VyattaConfParser for
openSUSE:Factory checked in at 2019-12-23 22:43:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-VyattaConfParser (Old)
and /work/SRC/openSUSE:Factory/.python-VyattaConfParser.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-VyattaConfParser"
Mon Dec 23 22:43:13 2019 rev:3 rq:758730 version:0.5.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-VyattaConfParser/python-VyattaConfParser.changes
2019-10-25 18:43:07.527954181 +0200
+++
/work/SRC/openSUSE:Factory/.python-VyattaConfParser.new.6675/python-VyattaConfParser.changes
2019-12-23 22:45:36.770027078 +0100
@@ -1,0 +2,8 @@
+Sat Dec 21 14:49:38 UTC 2019 - [email protected]
+
+- Update to version 0.5.5:
+ * Add + sign to regexp pattern
+ * Upd version number
+ * Fix #9
+
+-------------------------------------------------------------------
Old:
----
VyattaConfParser-0.5.3.tar.xz
New:
----
VyattaConfParser-0.5.5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-VyattaConfParser.spec ++++++
--- /var/tmp/diff_new_pack.GwavRg/_old 2019-12-23 22:45:37.942027511 +0100
+++ /var/tmp/diff_new_pack.GwavRg/_new 2019-12-23 22:45:37.966027520 +0100
@@ -20,7 +20,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-VyattaConfParser
-Version: 0.5.3
+Version: 0.5.5
Release: 0
Summary: A python config parser for Vyatta/VyOS
License: MIT
++++++ VyattaConfParser-0.5.3.tar.xz -> VyattaConfParser-0.5.5.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/VyattaConfParser-0.5.3/test_vyattaconfparser.py
new/VyattaConfParser-0.5.5/test_vyattaconfparser.py
--- old/VyattaConfParser-0.5.3/test_vyattaconfparser.py 2019-10-23
10:53:22.000000000 +0200
+++ new/VyattaConfParser-0.5.5/test_vyattaconfparser.py 2019-12-20
07:11:20.000000000 +0100
@@ -30,7 +30,10 @@
'interfaces': {
'ethernet': {
'eth0': {
- 'address': {'192.168.0.2/24': {}, '192.168.1.2/24':
{}},
+ 'address': {
+ '192.168.0.2/24': {},
+ '192.168.1.2/24': {}
+ },
'description': 'eth0-upstream',
'duplex': 'auto',
'speed': 'auto',
@@ -231,7 +234,7 @@
assert isinstance(rv, dict)
assert_equal(correct, rv)
- def test_same_sub_key(self):
+ def test_nested_keys_with_same_names(self):
s = """
service {
dns {
@@ -321,5 +324,51 @@
assert isinstance(rv, dict)
assert_equal(correct, rv)
+ def test_wireguard_syntax(self):
+ s = """
+ wireguard wg0 {
+ address 10.200.200.1/24
+ listen-port 60000
+ mtu 1420
+ peer XXXX= {
+ allowed-ips 10.200.200.3/32
+ }
+ peer YYYY= {
+ allowed-ips 10.200.200.2/32
+ }
+ peer ZZ+Z= {
+ allowed-ips 10.200.200.1/32
+ }
+ private-key ****************
+ route-allowed-ips true
+ }
+ """
+ correct = {
+ 'wireguard': {
+ 'wg0': {
+ 'address': '10.200.200.1/24',
+ 'listen-port': '60000',
+ 'mtu': '1420',
+ 'peer': {
+ 'XXXX=': {
+ 'allowed-ips': '10.200.200.3/32',
+ },
+ 'YYYY=': {
+ 'allowed-ips': '10.200.200.2/32',
+ },
+ 'ZZ+Z=': {
+ 'allowed-ips': '10.200.200.1/32',
+ }
+ },
+ 'private-key': '****************',
+ 'route-allowed-ips': 'true'
+ }
+ }
+ }
+ rv = vparser.parse_conf(s)
+ assert isinstance(rv, dict)
+ assert_equal(correct, rv)
+
+
if __name__ == "__main__":
unittest.main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/VyattaConfParser-0.5.3/vyattaconfparser/__init__.py
new/VyattaConfParser-0.5.5/vyattaconfparser/__init__.py
--- old/VyattaConfParser-0.5.3/vyattaconfparser/__init__.py 2019-10-23
10:53:22.000000000 +0200
+++ new/VyattaConfParser-0.5.5/vyattaconfparser/__init__.py 2019-12-20
07:11:20.000000000 +0100
@@ -1,7 +1,7 @@
from .parser import parse_conf
__title__ = 'Vyatta Config Parser'
-__version__ = '0.5.3'
+__version__ = '0.5.5'
__author__ = 'Aleksandr Mironov'
__license__ = 'MIT'
__all__ = ['parse_conf']
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/VyattaConfParser-0.5.3/vyattaconfparser/parser.py
new/VyattaConfParser-0.5.5/vyattaconfparser/parser.py
--- old/VyattaConfParser-0.5.3/vyattaconfparser/parser.py 2019-10-23
10:53:22.000000000 +0200
+++ new/VyattaConfParser-0.5.5/vyattaconfparser/parser.py 2019-12-20
07:11:20.000000000 +0100
@@ -14,7 +14,7 @@
# Matches section start `interfaces {`
rx_section = re.compile(r'^([\w\-]+) \{$', re.UNICODE)
# Matches named section `ethernet eth0 {`
-rx_named_section = re.compile(r'^([\w\-]+) ([\w\-\"\./@:]+) \{$', re.UNICODE)
+rx_named_section = re.compile(r'^([\w\-]+) ([\w\-\"\./@:=\+]+) \{$',
re.UNICODE)
# Matches simple key-value pair `duplex auto`
rx_value = re.compile(r'^([\w\-]+) "?([^"]+)?"?$', re.UNICODE)
# Matches single value (flag) `disable`
++++++ _service ++++++
--- /var/tmp/diff_new_pack.GwavRg/_old 2019-12-23 22:45:38.666027778 +0100
+++ /var/tmp/diff_new_pack.GwavRg/_new 2019-12-23 22:45:38.666027778 +0100
@@ -2,11 +2,11 @@
<service mode="disabled" name="tar_scm">
<param name="url">https://github.com/hedin/vyatta-conf-parser.git</param>
<param name="scm">git</param>
- <param name="revision">084ba32</param>
+ <param name="revision">9a09e8375ecf75c054f1231fa989222e440313bf</param>
<param name="package-meta">no</param>
<param name="changesgenerate">enable</param>
<param name="filename">VyattaConfParser</param>
- <param name="versionformat">0.5.3</param>
+ <param name="versionformat">0.5.5</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.GwavRg/_old 2019-12-23 22:45:38.778027820 +0100
+++ /var/tmp/diff_new_pack.GwavRg/_new 2019-12-23 22:45:38.782027821 +0100
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/hedin/vyatta-conf-parser.git</param>
- <param
name="changesrevision">084ba320ae1d6079267b3785f618af85089b5367</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">9a09e8375ecf75c054f1231fa989222e440313bf</param></service></servicedata>
\ No newline at end of file
