Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
make test: add option in pg interfaces for duplicating packets
[vpp.git]
/
test
/
test_syslog.py
diff --git
a/test/test_syslog.py
b/test/test_syslog.py
index
5c697ee
..
0acf7c2
100644
(file)
--- a/
test/test_syslog.py
+++ b/
test/test_syslog.py
@@
-5,14
+5,18
@@
from framework import VppTestCase, VppTestRunner
from util import ppp
from scapy.packet import Raw
from scapy.layers.inet import IP, UDP
from util import ppp
from scapy.packet import Raw
from scapy.layers.inet import IP, UDP
-from vpp_papi_provider import SYSLOG_SEVERITY
from syslog_rfc5424_parser import SyslogMessage, ParseError
from syslog_rfc5424_parser.constants import SyslogFacility, SyslogSeverity
from syslog_rfc5424_parser import SyslogMessage, ParseError
from syslog_rfc5424_parser.constants import SyslogFacility, SyslogSeverity
+from vpp_papi import VppEnum
class TestSyslog(VppTestCase):
""" Syslog Protocol Test Cases """
class TestSyslog(VppTestCase):
""" Syslog Protocol Test Cases """
+ @property
+ def SYSLOG_SEVERITY(self):
+ return VppEnum.vl_api_syslog_severity_t
+
@classmethod
def setUpClass(cls):
super(TestSyslog, cls).setUpClass()
@classmethod
def setUpClass(cls):
super(TestSyslog, cls).setUpClass()
@@
-27,6
+31,10
@@
class TestSyslog(VppTestCase):
super(TestSyslog, cls).tearDownClass()
raise
super(TestSyslog, cls).tearDownClass()
raise
+ @classmethod
+ def tearDownClass(cls):
+ super(TestSyslog, cls).tearDownClass()
+
def syslog_generate(self, facility, severity, appname, msgid, sd=None,
msg=None):
"""
def syslog_generate(self, facility, severity, appname, msgid, sd=None,
msg=None):
"""
@@
-95,7
+103,8
@@
class TestSyslog(VppTestCase):
def test_syslog(self):
""" Syslog Protocol test """
def test_syslog(self):
""" Syslog Protocol test """
- self.vapi.syslog_set_sender(self.pg0.remote_ip4n, self.pg0.local_ip4n)
+ self.vapi.syslog_set_sender(src_address=self.pg0.local_ip4n,
+ collector_address=self.pg0.remote_ip4n)
config = self.vapi.syslog_get_sender()
self.assertEqual(str(config.collector_address),
self.pg0.remote_ip4)
config = self.vapi.syslog_get_sender()
self.assertEqual(str(config.collector_address),
self.pg0.remote_ip4)
@@
-140,9
+149,11
@@
class TestSyslog(VppTestCase):
msg)
self.pg_enable_capture(self.pg_interfaces)
msg)
self.pg_enable_capture(self.pg_interfaces)
- self.vapi.syslog_set_filter(SYSLOG_SEVERITY.WARN)
+ self.vapi.syslog_set_filter(
+ self.SYSLOG_SEVERITY.SYSLOG_API_SEVERITY_WARN)
filter = self.vapi.syslog_get_filter()
filter = self.vapi.syslog_get_filter()
- self.assertEqual(filter.severity, SYSLOG_SEVERITY.WARN)
+ self.assertEqual(filter.severity,
+ self.SYSLOG_SEVERITY.SYSLOG_API_SEVERITY_WARN)
self.syslog_generate(SyslogFacility.local7,
SyslogSeverity.info,
appname,
self.syslog_generate(SyslogFacility.local7,
SyslogSeverity.info,
appname,
@@
-167,8
+178,8
@@
class TestSyslog(VppTestCase):
sd1,
msg)
sd1,
msg)
- self.vapi.syslog_set_sender(self.pg0.
remote
_ip4n,
- self.pg0.
local
_ip4n,
+ self.vapi.syslog_set_sender(self.pg0.
local
_ip4n,
+ self.pg0.
remote
_ip4n,
collector_port=12345)
config = self.vapi.syslog_get_sender()
self.assertEqual(config.collector_port, 12345)
collector_port=12345)
config = self.vapi.syslog_get_sender()
self.assertEqual(config.collector_port, 12345)