commit e3c80a49c8a397d8e8c14c5db0570fcd6573696b · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1303
       1303
        
         yggdrasil = handleTest ./yggdrasil.nix {};

     

       1304
       1304
        
         your_spotify = handleTest ./your_spotify.nix {};

     

       1305
       1305
        
         zammad = handleTest ./zammad.nix {};

     

       1306
       1306
       -
         zenohd = handleTest ./zenohd.nix {};

     

       1306
       1306
       +
         zenohd = runTest ./zenohd.nix;

     

       1307
       1307
        
         zeronet-conservancy = runTest ./zeronet-conservancy.nix;

     

       1308
       1308
        
         zfs = handleTest ./zfs.nix {};

     

       1309
       1309
        
         zigbee2mqtt_1 = runTest {

+70 -73

nixos/tests/zenohd.nix

···

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

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       1
       1
       +
       { pkgs, lib, ... }:

     

       3
       2
        
       

     

       4
       4
       -
         {

     

       5
       5
       -
           name = "zenohd";

     

       6
       6
       -
           meta.maintainers = [ lib.maintainers.markuskowa ];

     

       3
       3
       +
       {

     

       4
       4
       +
         name = "zenohd";

     

       5
       5
       +
         meta.maintainers = [ lib.maintainers.markuskowa ];

     

       7
       6
        
       

     

       8
       8
       -
           nodes = {

     

       9
       9
       -
             router =

     

       10
       10
       -
               {

     

       11
       11
       -
                 pkgs,

     

       12
       12
       -
                 lib,

     

       13
       13
       -
                 config,

     

       14
       14
       -
                 ...

     

       15
       15
       -
               }:

     

       16
       16
       -
               {

     

       17
       17
       -
                 networking.firewall.allowedTCPPorts = [

     

       18
       18
       -
                   7447 # zenohd default port

     

       19
       19
       -
                   config.services.zenohd.settings.plugins.mqtt.port

     

       20
       20
       -
                   config.services.zenohd.settings.plugins.webserver.http_port

     

       21
       21
       -
                 ];

     

       7
       7
       +
         nodes = {

     

       8
       8
       +
           router =

     

       9
       9
       +
             {

     

       10
       10
       +
               pkgs,

     

       11
       11
       +
               config,

     

       12
       12
       +
               ...

     

       13
       13
       +
             }:

     

       14
       14
       +
             {

     

       15
       15
       +
               networking.firewall.allowedTCPPorts = [

     

       16
       16
       +
                 7447 # zenohd default port

     

       17
       17
       +
                 config.services.zenohd.settings.plugins.mqtt.port

     

       18
       18
       +
                 config.services.zenohd.settings.plugins.webserver.http_port

     

       19
       19
       +
               ];

     

       22
       20
        
       

     

       23
       23
       -
                 services.zenohd = {

     

       24
       24
       -
                   enable = true;

     

       21
       21
       +
               services.zenohd = {

     

       22
       22
       +
                 enable = true;

     

       25
       23
        
       

     

       26
       26
       -
                   plugins = with pkgs; [

     

       27
       27
       -
                     zenoh-plugin-mqtt

     

       28
       28
       -
                     zenoh-plugin-webserver

     

       29
       29
       -
                   ];

     

       24
       24
       +
                 plugins = with pkgs; [

     

       25
       25
       +
                   zenoh-plugin-mqtt

     

       26
       26
       +
                   zenoh-plugin-webserver

     

       27
       27
       +
                 ];

     

       30
       28
        
       

     

       31
       31
       -
                   backends = with pkgs; [

     

       32
       32
       -
                     zenoh-backend-filesystem

     

       33
       33
       -
                     zenoh-backend-rocksdb

     

       34
       34
       -
                   ];

     

       29
       29
       +
                 backends = with pkgs; [

     

       30
       30
       +
                   zenoh-backend-filesystem

     

       31
       31
       +
                   zenoh-backend-rocksdb

     

       32
       32
       +
                 ];

     

       35
       33
        
       

     

       36
       36
       -
                   settings = {

     

       37
       37
       -
                     plugins = {

     

       38
       38
       -
                       mqtt = {

     

       39
       39
       -
                         port = 1883;

     

       40
       40
       -
                         allow = ".*";

     

       34
       34
       +
                 settings = {

     

       35
       35
       +
                   plugins = {

     

       36
       36
       +
                     mqtt = {

     

       37
       37
       +
                       port = 1883;

     

       38
       38
       +
                       allow = ".*";

     

       39
       39
       +
                     };

     

       40
       40
       +
                     webserver.http_port = 8000;

     

       41
       41
       +
                     storage_manager = {

     

       42
       42
       +
                       volumes = {

     

       43
       43
       +
                         fs = { };

     

       44
       44
       +
                         rocksdb = { };

     

       41
       45
        
                       };

     

       42
       42
       -
                       webserver.http_port = 8000;

     

       43
       43
       -
                       storage_manager = {

     

       44
       44
       -
                         volumes = {

     

       45
       45
       -
                           fs = { };

     

       46
       46
       -
                           rocksdb = { };

     

       46
       46
       +
                       storages = {

     

       47
       47
       +
                         mem = {

     

       48
       48
       +
                           key_expr = "mem/**";

     

       49
       49
       +
                           volume = "memory";

     

       47
       50
        
                         };

     

       48
       48
       -
                         storages = {

     

       49
       49
       -
                           mem = {

     

       50
       50
       -
                             key_expr = "mem/**";

     

       51
       51
       -
                             volume = "memory";

     

       51
       51
       +
                         fs = {

     

       52
       52
       +
                           key_expr = "fs/**";

     

       53
       53
       +
                           volume = {

     

       54
       54
       +
                             id = "fs";

     

       55
       55
       +
                             dir = "zenoh-fs";

     

       56
       56
       +
                             strip_prefix = "fs";

     

       52
       57
        
                           };

     

       53
       53
       -
                           fs = {

     

       54
       54
       -
                             key_expr = "fs/**";

     

       55
       55
       -
                             volume = {

     

       56
       56
       -
                               id = "fs";

     

       57
       57
       -
                               dir = "zenoh-fs";

     

       58
       58
       -
                               strip_prefix = "fs";

     

       59
       59
       -
                             };

     

       60
       60
       -
                           };

     

       61
       61
       -
                           rocksdb = {

     

       62
       62
       -
                             key_expr = "rocksdb/**";

     

       63
       63
       -
                             volume = {

     

       64
       64
       -
                               id = "rocksdb";

     

       65
       65
       -
                               dir = "zenoh-rocksdb";

     

       66
       66
       -
                               strip_prefix = "rocksdb";

     

       67
       67
       -
                               create_db = true;

     

       68
       68
       -
                             };

     

       58
       58
       +
                         };

     

       59
       59
       +
                         rocksdb = {

     

       60
       60
       +
                           key_expr = "rocksdb/**";

     

       61
       61
       +
                           volume = {

     

       62
       62
       +
                             id = "rocksdb";

     

       63
       63
       +
                             dir = "zenoh-rocksdb";

     

       64
       64
       +
                             strip_prefix = "rocksdb";

     

       65
       65
       +
                             create_db = true;

     

       69
       66
        
                           };

     

       70
       67
        
                         };

     

       71
       68
        
                       };

     
···

       73
       70
        
                   };

     

       74
       71
        
                 };

     

       75
       72
        
               };

     

       76
       76
       -
       

     

       77
       77
       -
             client = {

     

       78
       78
       -
               environment.systemPackages = [

     

       79
       79
       -
                 pkgs.mosquitto

     

       80
       80
       -
               ];

     

       81
       73
        
             };

     

       74
       74
       +
       

     

       75
       75
       +
           client = {

     

       76
       76
       +
             environment.systemPackages = [

     

       77
       77
       +
               pkgs.mosquitto

     

       78
       78
       +
             ];

     

       82
       79
        
           };

     

       80
       80
       +
         };

     

       83
       81
        
       

     

       84
       84
       -
           testScript = ''

     

       85
       85
       -
             router.wait_for_unit("zenohd.service")

     

       86
       86
       -
             client.wait_for_unit("multi-user.target")

     

       82
       82
       +
         testScript = ''

     

       83
       83
       +
           router.wait_for_unit("zenohd.service")

     

       84
       84
       +
           client.wait_for_unit("multi-user.target")

     

       87
       85
        
       

     

       88
       88
       -
             for be in ["fs", "rocksdb", "mem" ]:

     

       89
       89
       -
               client.succeed(f"mosquitto_pub -h router -t {be}/test -m hello")

     

       90
       90
       -
               client.succeed(f"curl router:8000/{be}/test | grep hello")

     

       91
       91
       -
           '';

     

       92
       92
       -
         }

     

       93
       93
       -
       )

     

       86
       86
       +
           for be in ["fs", "rocksdb", "mem" ]:

     

       87
       87
       +
             client.succeed(f"mosquitto_pub -h router -t {be}/test -m hello")

     

       88
       88
       +
             client.succeed(f"curl router:8000/{be}/test | grep hello")

     

       89
       89
       +
         '';

     

       90
       90
       +
       }