diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-27 15:22:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-27 15:22:56 +0100 |
| commit | 957c99f20f9c08b0fc5dd51664a06cae16bc52c1 (patch) | |
| tree | b9d1beed0c481efb11d38c8f2a3a6aded7842733 /smoketest | |
| parent | 7324edfeb7ededc888a23bf72562673da2797f16 (diff) | |
| parent | 714a6b1dd5e4de6c85911fa64f4b5f37b44979cf (diff) | |
| download | vyos-1x-957c99f20f9c08b0fc5dd51664a06cae16bc52c1.tar.gz vyos-1x-957c99f20f9c08b0fc5dd51664a06cae16bc52c1.zip | |
Merge pull request #2693 from aapostoliuk/T5859-circinus
T5859: Fixed format of pool range in the accel-ppp config
Diffstat (limited to 'smoketest')
| -rw-r--r-- | smoketest/scripts/cli/base_accel_ppp_test.py | 3 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_service_ipoe-server.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py index 32624719f..fad765c0d 100644 --- a/smoketest/scripts/cli/base_accel_ppp_test.py +++ b/smoketest/scripts/cli/base_accel_ppp_test.py @@ -365,6 +365,7 @@ class BasicAccelPPPTest: first_pool = "POOL1" second_pool = "POOL2" range = "192.0.2.10-192.0.2.20" + range_config = "192.0.2.10-20" self.set(["gateway-address", gateway]) self.set(["client-ip-pool", first_pool, "range", subnet]) @@ -382,7 +383,7 @@ class BasicAccelPPPTest: self.assertEqual( f"{first_pool},next={second_pool}", conf["ip-pool"][f"{subnet},name"] ) - self.assertEqual(second_pool, conf["ip-pool"][f"{range},name"]) + self.assertEqual(second_pool, conf["ip-pool"][f"{range_config},name"]) self.assertEqual(gateway, conf["ip-pool"]["gw-ip-address"]) self.assertEqual(first_pool, conf[self._protocol_section]["ip-pool"]) diff --git a/smoketest/scripts/cli/test_service_ipoe-server.py b/smoketest/scripts/cli/test_service_ipoe-server.py index 358668e0d..6e95b3bd1 100755 --- a/smoketest/scripts/cli/test_service_ipoe-server.py +++ b/smoketest/scripts/cli/test_service_ipoe-server.py @@ -117,6 +117,7 @@ class TestServiceIPoEServer(BasicAccelPPPTest.TestCase): first_pool = "POOL1" second_pool = "POOL2" range = "192.0.2.10-192.0.2.20" + range_config = "192.0.2.10-20" for gw in gateway: self.set(["gateway-address", gw]) @@ -141,7 +142,7 @@ class TestServiceIPoEServer(BasicAccelPPPTest.TestCase): self.assertIn( f"{first_pool},next={second_pool}", conf["ip-pool"][f"{subnet},name"] ) - self.assertIn(second_pool, conf["ip-pool"][f"{range},name"]) + self.assertIn(second_pool, conf["ip-pool"][f"{range_config},name"]) gw_pool_config_list = conf.get("ip-pool", "gw-ip-address") gw_ipoe_config_list = conf.get(self._protocol_section, "gw-ip-address") |