diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-12-19 16:38:29 +0100 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-01-20 06:48:19 +0000 |
| commit | b0733dde5d153435b702315b15c0243632fc83c3 (patch) | |
| tree | d694bb94aa93ef1c7d13f92b5c3d279c2cd954b0 | |
| parent | ac9631e0bcf5069a699ff64b3447f4ee3e095283 (diff) | |
| download | vyos-1x-b0733dde5d153435b702315b15c0243632fc83c3.tar.gz vyos-1x-b0733dde5d153435b702315b15c0243632fc83c3.zip | |
dhcp: T4832: fix TypeError in smoketest
Commit cca7ec3e ("T4832: dhcp: Add IPv6-only dhcp option support (RFC 8925)")
extended the smoketests but used int over str when calilng the CLI wrapper.
This led to:
TypeError: sequence item 7: expected str instance, int found
(cherry picked from commit a741a9297f02f938653aeaa1af3c4a57364e9215)
| -rwxr-xr-x | smoketest/scripts/cli/test_service_dhcp-server.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/smoketest/scripts/cli/test_service_dhcp-server.py b/smoketest/scripts/cli/test_service_dhcp-server.py index 8568d96eb..b80566108 100755 --- a/smoketest/scripts/cli/test_service_dhcp-server.py +++ b/smoketest/scripts/cli/test_service_dhcp-server.py @@ -102,17 +102,17 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase): def test_dhcp_single_pool_options(self): shared_net_name = 'SMOKE-0815' - range_0_start = inc_ip(subnet, 10) - range_0_stop = inc_ip(subnet, 20) - smtp_server = '1.2.3.4' - time_server = '4.3.2.1' - tftp_server = 'tftp.vyos.io' - search_domains = ['foo.vyos.net', 'bar.vyos.net'] - bootfile_name = 'vyos' - bootfile_server = '192.0.2.1' - wpad = 'http://wpad.vyos.io/foo/bar' - server_identifier = bootfile_server - ipv6_only_preferred = 300 + range_0_start = inc_ip(subnet, 10) + range_0_stop = inc_ip(subnet, 20) + smtp_server = '1.2.3.4' + time_server = '4.3.2.1' + tftp_server = 'tftp.vyos.io' + search_domains = ['foo.vyos.net', 'bar.vyos.net'] + bootfile_name = 'vyos' + bootfile_server = '192.0.2.1' + wpad = 'http://wpad.vyos.io/foo/bar' + server_identifier = bootfile_server + ipv6_only_preferred = '300' pool = base_path + ['shared-network-name', shared_net_name, 'subnet', subnet] # we use the first subnet IP address as default gateway |