summaryrefslogtreecommitdiffstats
path: root/test/test_nat.py
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2019-01-14 08:51:17 -0800
committerNeale Ranns <nranns@cisco.com>2019-01-18 11:27:00 +0000
commitd75320988853736b3d497ccb3f054bc8cc27b207 (patch)
tree79701c10fa5b7d41efb31e0b45fb133eae21f519 /test/test_nat.py
parentd870ce441272d7057c8cb2b8f9731ebe41a17f0a (diff)
VTL: Don't swallow exceptions from syslog_rfc5424_parser
Change-Id: I4e93073ceb7b75476e847ae8d56301770c8b264f Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/test_nat.py')
-rw-r--r--test/test_nat.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/test/test_nat.py b/test/test_nat.py
index c64359a4db7..f51a950678c 100644
--- a/test/test_nat.py
+++ b/test/test_nat.py
@@ -1043,6 +1043,10 @@ class MethodHolder(VppTestCase):
message = data.decode('utf-8')
try:
message = SyslogMessage.parse(message)
+ except ParseError as e:
+ self.logger.error(e)
+ raise
+ else:
self.assertEqual(message.severity, SyslogSeverity.info)
self.assertEqual(message.appname, 'NAT')
self.assertEqual(message.msgid, 'APMADD' if is_add else 'APMDEL')
@@ -1057,13 +1061,15 @@ class MethodHolder(VppTestCase):
self.assertEqual(sd_params.get('PROTO'), "%d" % IP_PROTOS.tcp)
self.assertTrue(sd_params.get('SSUBIX') is not None)
self.assertEqual(sd_params.get('SVLAN'), '0')
- except ParseError as e:
- self.logger.error(e)
def verify_syslog_sess(self, data, is_add=True, is_ip6=False):
message = data.decode('utf-8')
try:
message = SyslogMessage.parse(message)
+ except ParseError as e:
+ self.logger.error(e)
+ raise
+ else:
self.assertEqual(message.severity, SyslogSeverity.info)
self.assertEqual(message.appname, 'NAT')
self.assertEqual(message.msgid, 'SADD' if is_add else 'SDEL')
@@ -1085,8 +1091,6 @@ class MethodHolder(VppTestCase):
self.assertEqual(sd_params.get('XDADDR'), self.pg1.remote_ip4)
self.assertEqual(sd_params.get('XDPORT'),
"%d" % self.tcp_external_port)
- except ParseError as e:
- self.logger.error(e)
def verify_mss_value(self, pkt, mss):
"""
@@ -8165,6 +8169,9 @@ class TestDSlite(MethodHolder):
message = data.decode('utf-8')
try:
message = SyslogMessage.parse(message)
+ except ParseError as e:
+ self.logger.error(e)
+ else:
self.assertEqual(message.severity, SyslogSeverity.info)
self.assertEqual(message.appname, 'NAT')
self.assertEqual(message.msgid, 'APMADD')
@@ -8179,8 +8186,6 @@ class TestDSlite(MethodHolder):
self.assertEqual(sd_params.get('PROTO'), "%d" % proto)
self.assertTrue(sd_params.get('SSUBIX') is not None)
self.assertEqual(sd_params.get('SV6ENC'), sv6enc)
- except ParseError as e:
- self.logger.error(e)
def test_dslite(self):
""" Test DS-Lite """