Commit 84f3520c authored by K900's avatar K900
Browse files

nixos/tests/nat: remove conntrack helpers test 

Removed upstream
parent 18f85de7

nixos/tests/all-tests.nix

+0 −2
Original line number Diff line number Diff line
@@ -433,10 +433,8 @@ in { 
  nagios = handleTest ./nagios.nix {};

  nar-serve = handleTest ./nar-serve.nix {};

  nat.firewall = handleTest ./nat.nix { withFirewall = true; };

  nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; };

  nat.standalone = handleTest ./nat.nix { withFirewall = false; };

  nat.nftables.firewall = handleTest ./nat.nix { withFirewall = true; nftables = true; };

  nat.nftables.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; nftables = true; };

  nat.nftables.standalone = handleTest ./nat.nix { withFirewall = false; nftables = true; };

  nats = handleTest ./nats.nix {};

  navidrome = handleTest ./navidrome.nix {};

nixos/tests/nat.nix

+3 −12
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# client on the inside network, a server on the outside network, and a

# router connected to both that performs Network Address Translation

# for the client.

import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, nftables ? false, ... }:

import ./make-test-python.nix ({ pkgs, lib, withFirewall, nftables ? false, ... }:

  let

    unit = if nftables then "nftables" else (if withFirewall then "firewall" else "nat");
@@ -16,16 +16,11 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? 
          networking.nat.internalIPs = [ "192.168.1.0/24" ];

          networking.nat.externalInterface = "eth1";

        }

        (lib.optionalAttrs withConntrackHelpers {

          networking.firewall.connectionTrackingModules = [ "ftp" ];

          networking.firewall.autoLoadConntrackHelpers = true;

        })

      ];

  in

  {

    name = "nat" + (lib.optionalString nftables "Nftables")

                 + (if withFirewall then "WithFirewall" else "Standalone")

                 + (lib.optionalString withConntrackHelpers "withConntrackHelpers");

                 + (if withFirewall then "WithFirewall" else "Standalone");

    meta = with pkgs.lib.maintainers; {

      maintainers = [ eelco rob ];

    };
@@ -39,10 +34,6 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? 
                (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ipv4.addresses).address;

              networking.nftables.enable = nftables;

            }

            (lib.optionalAttrs withConntrackHelpers {

              networking.firewall.connectionTrackingModules = [ "ftp" ];

              networking.firewall.autoLoadConntrackHelpers = true;

            })

          ];



        router =
@@ -95,7 +86,7 @@ import ./make-test-python.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? 
        client.succeed("curl -v ftp://server/foo.txt >&2")



        # Test whether active FTP works.

        client.${if withConntrackHelpers then "succeed" else "fail"}("curl -v -P - ftp://server/foo.txt >&2")

        client.fail("curl -v -P - ftp://server/foo.txt >&2")



        # Test ICMP.

        client.succeed("ping -c 1 router >&2")