X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_syslog.py;h=b084a1d1846f1b17dfc08c02061555923e6bd6e1;hb=92a8d761c412590f5112239be4c511091b2b2d5a;hp=90a0aef908fb96bf053dbb0fadf6b58101f9d454;hpb=7f9b7f9f492d1748d8ba025b3a713058fdb1943d;p=vpp.git diff --git a/test/test_syslog.py b/test/test_syslog.py index 90a0aef908f..b084a1d1846 100644 --- a/test/test_syslog.py +++ b/test/test_syslog.py @@ -1,18 +1,22 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import unittest from framework import VppTestCase, VppTestRunner 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 vpp_papi import VppEnum 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() @@ -99,8 +103,8 @@ class TestSyslog(VppTestCase): def test_syslog(self): """ Syslog Protocol test """ - self.vapi.syslog_set_sender(src_address=self.pg0.local_ip4n, - collector_address=self.pg0.remote_ip4n) + self.vapi.syslog_set_sender(src_address=self.pg0.local_ip4, + collector_address=self.pg0.remote_ip4) config = self.vapi.syslog_get_sender() self.assertEqual(str(config.collector_address), self.pg0.remote_ip4) @@ -145,9 +149,11 @@ class TestSyslog(VppTestCase): 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() - 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, @@ -172,8 +178,8 @@ class TestSyslog(VppTestCase): sd1, msg) - self.vapi.syslog_set_sender(self.pg0.local_ip4n, - self.pg0.remote_ip4n, + self.vapi.syslog_set_sender(self.pg0.local_ip4, + self.pg0.remote_ip4, collector_port=12345) config = self.vapi.syslog_get_sender() self.assertEqual(config.collector_port, 12345)