diff --git a/src/program/lwaftr/tests/data/missing_softwire_psidmap.conf b/src/program/lwaftr/tests/data/missing_softwire_psidmap.conf deleted file mode 100644 index 6a3cfd61fa..0000000000 --- a/src/program/lwaftr/tests/data/missing_softwire_psidmap.conf +++ /dev/null @@ -1,54 +0,0 @@ -softwire-config { - binding-table { - softwire { - ipv4 178.79.150.9; - psid 72; - b4-ipv6 127:12:13:14:15:16:17:128; - br-address 8:9:a:b:c:d:e:f; - port-set { - psid-length 0; - reserved-ports-bit-count 16; - shift 0; - } - } - softwire { - ipv4 178.79.150.233; - psid 4660; - b4-ipv6 127:11:12:13:14:15:16:128; - br-address 8:9:a:b:c:d:e:f; - port-set { - psid-length 0; - reserved-ports-bit-count 16; - shift 0; - } - } - } - external-interface { - allow-incoming-icmp false; - error-rate-limiting { - packets 600000; - } - ip 10.10.10.10; - mac 12:12:12:12:12:12; - next-hop { - mac 68:68:68:68:68:68; - } - reassembly { - max-fragments-per-packet 40; - } - } - internal-interface { - allow-incoming-icmp false; - error-rate-limiting { - packets 600000; - } - ip 8:9:a:b:c:d:e:f; - mac 22:22:22:22:22:22; - next-hop { - mac 44:44:44:44:44:44; - } - reassembly { - max-fragments-per-packet 40; - } - } -} diff --git a/src/program/lwaftr/tests/subcommands/bench_test.py b/src/program/lwaftr/tests/subcommands/bench_test.py index a6944996fb..01e568e864 100644 --- a/src/program/lwaftr/tests/subcommands/bench_test.py +++ b/src/program/lwaftr/tests/subcommands/bench_test.py @@ -33,14 +33,5 @@ def test_bench_reconfigurable(self): reconf_args.insert(3, '--reconfigurable') self.execute_bench_test(reconf_args) - def test_config_with_invalid_softwire(self): - config_file = str(DATA_DIR / "missing_softwire_psidmap.conf") - invalid_softwire_args = list(self.cmd_args) - invalid_softwire_args[-3] = config_file - # Verify it errors when there is a softwire lacking a PSID mapping entry - err = "Started with config file that has softwire without PSID mapping" - with self.assertRaises(AssertionError, msg=err): - self.execute_bench_test(invalid_softwire_args) - if __name__ == '__main__': unittest.main() diff --git a/src/program/lwaftr/tests/subcommands/config_test.py b/src/program/lwaftr/tests/subcommands/config_test.py index a7c8923bc9..99c01adc95 100644 --- a/src/program/lwaftr/tests/subcommands/config_test.py +++ b/src/program/lwaftr/tests/subcommands/config_test.py @@ -132,13 +132,6 @@ def test_add(self): """ Add a softwire section, get it back and check all the values. """ - # Add a PSID map for the IP we're going to use. - psidmap_add_args = self.get_cmd_args('add') - psidmap_add_args.extend(( - '/softwire-config/binding-table/psid-map', - '{ addr 1.2.3.4; psid-length 16; }' - )) - self.run_cmd(psidmap_add_args) # External IPv4. add_args = self.get_cmd_args('add') diff --git a/src/program/lwaftr/tests/subcommands/run_test.py b/src/program/lwaftr/tests/subcommands/run_test.py index 15281a1960..dedf103c19 100644 --- a/src/program/lwaftr/tests/subcommands/run_test.py +++ b/src/program/lwaftr/tests/subcommands/run_test.py @@ -35,14 +35,5 @@ def test_run_reconfigurable(self): reconf_args.insert(3, '--reconfigurable') self.execute_run_test(reconf_args) - def test_config_with_invalid_softwire(self): - config_file = str(DATA_DIR / "missing_softwire_psidmap.conf") - invalid_softwire_args = list(self.cmd_args) - invalid_softwire_args[-5] = config_file - # Verify it errors when there is a softwire lacking a PSID mapping entry - err = "Started with config file that has softwire without PSID mapping" - with self.assertRaises(AssertionError, msg=err): - self.execute_run_test(invalid_softwire_args) - if __name__ == '__main__': unittest.main()