Unverified Commit 52335fc1 authored by Adam Stephens's avatar Adam Stephens
Browse files

openvswitch: init simple bridge test and add incus test

parent 666014db

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -740,6 +740,7 @@ in { 
  image-contents = handleTest ./image-contents.nix {};

  openvscode-server = handleTest ./openvscode-server.nix {};

  open-webui = runTest ./open-webui.nix;

  openvswitch = runTest ./openvswitch.nix;

  orangefs = handleTest ./orangefs.nix {};

  os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};

  osquery = handleTestOn ["x86_64-linux"] ./osquery.nix {};

nixos/tests/openvswitch.nix

0 → 100644
+62 −0
Original line number Diff line number Diff line 
{

  name = "openvswitch";



  nodes = {

    node1 = {

      virtualisation.vlans = [ 1 ];



      networking = {

        useNetworkd = true;

        useDHCP = false;

        firewall.enable = false;



        vswitches.vs0 = {

          interfaces = {

            eth1 = { };

          };

        };



      };



      systemd.network.networks."40-vs0" = {

        name = "vs0";

        networkConfig.Address = "10.0.0.1/24";

      };



    };



    node2 = {

      virtualisation.vlans = [ 1 ];



      networking = {

        useNetworkd = true;

        useDHCP = false;

        firewall.enable = false;



        vswitches.vs0 = {

          interfaces = {

            eth1 = { };

          };

        };



      };



      systemd.network.networks."40-vs0" = {

        name = "vs0";

        networkConfig.Address = "10.0.0.2/24";

      };

    };

  };



  testScript = # python

    ''

      start_all()

      node1.wait_for_unit("ovsdb.service")

      node1.wait_for_unit("ovs-vswitchd.service")

      node2.wait_for_unit("ovsdb.service")

      node2.wait_for_unit("ovs-vswitchd.service")



      node1.succeed("ping -c3 10.0.0.2")

      node2.succeed("ping -c3 10.0.0.1")

    '';

}

pkgs/by-name/op/openvswitch/package.nix

+8 −1
Original line number Diff line number Diff line
@@ -125,7 +125,14 @@ stdenv.mkDerivation rec { 
      setuptools

    ]);



  passthru.updateScript = nix-update-script { };

  passthru = {

    tests = {

      default = nixosTests.openvswitch;

      incus = nixosTests.incus-lts.openvswitch;

    };



    updateScript = nix-update-script { };

  };



  meta = with lib; {

    changelog = "https://www.openvswitch.org/releases/NEWS-${version}.txt";