public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85252 from flokli/nixos-flannel-fix

Browse Source 
nixosTests.flannel: port to python, unbreak
This commit is contained in:
Florian Klink 2020-04-15 20:01:13 +02:00 committed by GitHub
commit 7835641e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
nixos/tests/flannel.nix
View File

@ -1,20 +1,24 @@
import ./make-test.nix ({ pkgs, ...} : { import ./make-test-python.nix ({ lib, ...} : {
name = "flannel"; name = "flannel";
meta = with pkgs.stdenv.lib.maintainers; { meta = with lib.maintainers; {
maintainers = [ offline ]; maintainers = [ offline ];
}; };
nodes = let nodes = let
flannelConfig = { flannelConfig = { pkgs, ... } : {
services.flannel = { services.flannel = {
enable = true; enable = true;
backend = {
Type = "udp";
Port = 8285;
};
network = "10.1.0.0/16"; network = "10.1.0.0/16";
iface = "eth1"; iface = "eth1";
etcd.endpoints = ["http://etcd:2379"]; etcd.endpoints = ["http://etcd:2379"];
}; };
networking.firewall.allowedUDPPorts = [ 8472 ]; networking.firewall.allowedUDPPorts = [ 8285 ];
}; };
in { in {
etcd = { ... }: { etcd = { ... }: {
@ -32,25 +36,22 @@ import ./make-test.nix ({ pkgs, ...} : {
networking.firewall.allowedTCPPorts = [ 2379 ]; networking.firewall.allowedTCPPorts = [ 2379 ];
}; };
node1 = { ... }: { node1 = flannelConfig;
require = [flannelConfig]; node2 = flannelConfig;
};
node2 = { ... }: {
require = [flannelConfig];
};
}; };
testScript = '' testScript = ''
startAll; start_all()
$node1->waitForUnit("flannel.service"); node1.wait_for_unit("flannel.service")
$node2->waitForUnit("flannel.service"); node2.wait_for_unit("flannel.service")
my $ip1 = $node1->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'"); node1.wait_until_succeeds("ip l show dev flannel0")
my $ip2 = $node2->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'"); ip1 = node1.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")
node2.wait_until_succeeds("ip l show dev flannel0")
ip2 = node2.succeed("ip -4 addr show flannel0 | grep -oP '(?<=inet).*(?=/)'")
$node1->waitUntilSucceeds("ping -c 1 $ip2"); node1.wait_until_succeeds(f"ping -c 1 {ip2}")
$node2->waitUntilSucceeds("ping -c 1 $ip1"); node2.wait_until_succeeds(f"ping -c 1 {ip1}")
''; '';
}) })