commit 2eb3f8174077d6fb3b3176513657762d6ce714fc · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       905
       905
        
         music-assistant = runTest ./music-assistant.nix;

     

       906
       906
        
         munin = runTest ./munin.nix;

     

       907
       907
        
         mutableUsers = runTest ./mutable-users.nix;

     

       908
       908
       -
         mycelium = handleTest ./mycelium { };

     

       908
       908
       +
         mycelium = runTest ./mycelium;

     

       909
       909
        
         mympd = runTest ./mympd.nix;

     

       910
       910
        
         mysql = handleTest ./mysql/mysql.nix { };

     

       911
       911
        
         mysql-autobackup = handleTest ./mysql/mysql-autobackup.nix { };

+54 -61

nixos/tests/mycelium/default.nix

···

       1
       1
       -
       import ../make-test-python.nix (

     

       2
       2
       -
         { lib, ... }:

     

       3
       3
       -
         let

     

       4
       4
       -
           peer1-ip = "538:f40f:1c51:9bd9:9569:d3f6:d0a1:b2df";

     

       5
       5
       -
           peer2-ip = "5b6:6776:fee0:c1f3:db00:b6a8:d013:d38f";

     

       6
       6
       -
         in

     

       7
       7
       -
         {

     

       8
       8
       -
           name = "mycelium";

     

       9
       9
       -
           meta.maintainers = with lib.maintainers; [ lassulus ];

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         peer1-ip = "538:f40f:1c51:9bd9:9569:d3f6:d0a1:b2df";

     

       4
       4
       +
         peer2-ip = "5b6:6776:fee0:c1f3:db00:b6a8:d013:d38f";

     

       5
       5
       +
       in

     

       6
       6
       +
       {

     

       7
       7
       +
         name = "mycelium";

     

       8
       8
       +
         meta.maintainers = with lib.maintainers; [ lassulus ];

     

       10
       9
        
       

     

       11
       11
       -
           nodes = {

     

       12
       12
       -
       

     

       13
       13
       -
             peer1 =

     

       14
       14
       -
               { config, pkgs, ... }:

     

       10
       10
       +
         nodes = {

     

       11
       11
       +
           peer1 = {

     

       12
       12
       +
             virtualisation.vlans = [ 1 ];

     

       13
       13
       +
             networking.interfaces.eth1.ipv4.addresses = [

     

       15
       14
        
               {

     

       16
       16
       -
                 virtualisation.vlans = [ 1 ];

     

       17
       17
       -
                 networking.interfaces.eth1.ipv4.addresses = [

     

       18
       18
       -
                   {

     

       19
       19
       -
                     address = "192.168.1.11";

     

       20
       20
       -
                     prefixLength = 24;

     

       21
       21
       -
                   }

     

       22
       22
       -
                 ];

     

       15
       15
       +
                 address = "192.168.1.11";

     

       16
       16
       +
                 prefixLength = 24;

     

       17
       17
       +
               }

     

       18
       18
       +
             ];

     

       23
       19
        
       

     

       24
       24
       -
                 services.mycelium = {

     

       25
       25
       -
                   enable = true;

     

       26
       26
       -
                   addHostedPublicNodes = false;

     

       27
       27
       -
                   openFirewall = true;

     

       28
       28
       -
                   keyFile = ./peer1.key;

     

       29
       29
       -
                   peers = [

     

       30
       30
       -
                     "quic://192.168.1.12:9651"

     

       31
       31
       -
                     "tcp://192.168.1.12:9651"

     

       32
       32
       -
                   ];

     

       33
       33
       -
                 };

     

       34
       34
       -
               };

     

       20
       20
       +
             services.mycelium = {

     

       21
       21
       +
               enable = true;

     

       22
       22
       +
               addHostedPublicNodes = false;

     

       23
       23
       +
               openFirewall = true;

     

       24
       24
       +
               keyFile = ./peer1.key;

     

       25
       25
       +
               peers = [

     

       26
       26
       +
                 "quic://192.168.1.12:9651"

     

       27
       27
       +
                 "tcp://192.168.1.12:9651"

     

       28
       28
       +
               ];

     

       29
       29
       +
             };

     

       30
       30
       +
           };

     

       35
       31
        
       

     

       36
       36
       -
             peer2 =

     

       37
       37
       -
               { config, pkgs, ... }:

     

       32
       32
       +
           peer2 = {

     

       33
       33
       +
             virtualisation.vlans = [ 1 ];

     

       34
       34
       +
             networking.interfaces.eth1.ipv4.addresses = [

     

       38
       35
        
               {

     

       39
       39
       -
                 virtualisation.vlans = [ 1 ];

     

       40
       40
       -
                 networking.interfaces.eth1.ipv4.addresses = [

     

       41
       41
       -
                   {

     

       42
       42
       -
                     address = "192.168.1.12";

     

       43
       43
       -
                     prefixLength = 24;

     

       44
       44
       -
                   }

     

       45
       45
       -
                 ];

     

       36
       36
       +
                 address = "192.168.1.12";

     

       37
       37
       +
                 prefixLength = 24;

     

       38
       38
       +
               }

     

       39
       39
       +
             ];

     

       46
       40
        
       

     

       47
       47
       -
                 services.mycelium = {

     

       48
       48
       -
                   enable = true;

     

       49
       49
       -
                   addHostedPublicNodes = false;

     

       50
       50
       -
                   openFirewall = true;

     

       51
       51
       -
                   keyFile = ./peer2.key;

     

       52
       52
       -
                 };

     

       53
       53
       -
               };

     

       41
       41
       +
             services.mycelium = {

     

       42
       42
       +
               enable = true;

     

       43
       43
       +
               addHostedPublicNodes = false;

     

       44
       44
       +
               openFirewall = true;

     

       45
       45
       +
               keyFile = ./peer2.key;

     

       46
       46
       +
             };

     

       54
       47
        
           };

     

       48
       48
       +
         };

     

       55
       49
        
       

     

       56
       56
       -
           testScript = ''

     

       57
       57
       -
             start_all()

     

       50
       50
       +
         testScript = ''

     

       51
       51
       +
           start_all()

     

       58
       52
        
       

     

       59
       59
       -
             peer1.wait_for_unit("network-online.target")

     

       60
       60
       -
             peer2.wait_for_unit("network-online.target")

     

       61
       61
       -
             peer1.wait_for_unit("mycelium.service")

     

       62
       62
       -
             peer2.wait_for_unit("mycelium.service")

     

       53
       53
       +
           peer1.wait_for_unit("network-online.target")

     

       54
       54
       +
           peer2.wait_for_unit("network-online.target")

     

       55
       55
       +
           peer1.wait_for_unit("mycelium.service")

     

       56
       56
       +
           peer2.wait_for_unit("mycelium.service")

     

       63
       57
        
       

     

       64
       64
       -
             # Give mycelium some time to discover the other peer

     

       65
       65
       -
             peer1.wait_until_succeeds("ping -c1 ${peer2-ip}", timeout=10)

     

       66
       66
       -
             peer2.succeed("ping -c1 ${peer1-ip}")

     

       58
       58
       +
           # Give mycelium some time to discover the other peer

     

       59
       59
       +
           peer1.wait_until_succeeds("ping -c1 ${peer2-ip}", timeout=10)

     

       60
       60
       +
           peer2.succeed("ping -c1 ${peer1-ip}")

     

       67
       61
        
       

     

       68
       68
       -
             peer1.succeed("mycelium peers list | grep 192.168.1.12")

     

       69
       69
       -
             peer2.succeed("mycelium peers list | grep 192.168.1.11")

     

       62
       62
       +
           peer1.succeed("mycelium peers list | grep 192.168.1.12")

     

       63
       63
       +
           peer2.succeed("mycelium peers list | grep 192.168.1.11")

     

       70
       64
        
       

     

       71
       71
       -
           '';

     

       72
       72
       -
         }

     

       73
       73
       -
       )

     

       65
       65
       +
         '';

     

       66
       66
       +
       }