diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-12-25 23:27:42 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-12-25 23:27:42 +0100 |
| commit | 25eb2a82b29d02a332551975456743b3f791a6eb (patch) | |
| tree | 9204740994ea569f0d500e131735050b7575c78a /smoketest | |
| parent | 2b891ab8df43aadccc56c14183607e90d0f6f381 (diff) | |
| parent | 344c2776bd6e157d33ea81f548d1eacde1d3e644 (diff) | |
| download | vyos-1x-25eb2a82b29d02a332551975456743b3f791a6eb.tar.gz vyos-1x-25eb2a82b29d02a332551975456743b3f791a6eb.zip | |
Merge branch 't4097-flow-accounting' into current
* t4097-flow-accounting:
flow-accounting: T4106: support specification of capture packet length
flow-accounting: T4105: drop "sflow agent-address auto"
flow-accounting: T4099: rename "netflow source-ip" to source-address
flow-accounting: T4097: move to get_config_dict()
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/configs/bgp-big-as-cloud | 6 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_system_flow-accounting.py | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/smoketest/configs/bgp-big-as-cloud b/smoketest/configs/bgp-big-as-cloud index 694243d1e..10660ec87 100644 --- a/smoketest/configs/bgp-big-as-cloud +++ b/smoketest/configs/bgp-big-as-cloud @@ -1819,6 +1819,12 @@ system { } version 9 } + sflow { + agent-address auto + server 1.2.3.4 { + port 1234 + } + } syslog-facility daemon } host-name vyos diff --git a/smoketest/scripts/cli/test_system_flow-accounting.py b/smoketest/scripts/cli/test_system_flow-accounting.py index 57866a198..f3bed635c 100755 --- a/smoketest/scripts/cli/test_system_flow-accounting.py +++ b/smoketest/scripts/cli/test_system_flow-accounting.py @@ -201,11 +201,11 @@ class TestSystemFlowAccounting(VyOSUnitTestSHIM.TestCase): uacctd = read_file(uacctd_conf) - tmp = 'plugins: ' + tmp = [] + tmp.append('memory') for server, server_config in netflow_server.items(): - tmp += f'nfprobe[nf_{server}],' - tmp += 'memory' - self.assertIn(f'{tmp}', uacctd) + tmp.append(f'nfprobe[nf_{server}]') + self.assertIn('plugins: ' + ','.join(tmp), uacctd) for server, server_config in netflow_server.items(): self.assertIn(f'nfprobe_engine[nf_{server}]: {engine_id}', uacctd) |