cheshire
/
hscloud
forked from hswaw/hscloud
1
0
Fork 0
Code Pull Requests Activity

bgpwtf: edge01: fix tests 

Change-Id: I66852cc75f3d5a6ce3cc67790c09e248874b0a9b
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1338
Reviewed-by: implr <implr@hackerspace.pl>
master
q3k 2022-06-11 21:54:04 +02:00 committed by q3k
parent 18c1a263cf
commit d635dc85ce
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bgpwtf/machines/modules/gretap.nix
View File

@ -56,7 +56,7 @@ in {
];
serviceConfig = {
Type = "oneshot";
ExecStart = "${pkgs.iproute2}/bin/ip link add name ${name} type gretap remote ${value.remoteV4} local ${value.localV4} key ${toString value.id}";
ExecStart = "${pkgs.iproute}/bin/ip link add name ${name} type gretap remote ${value.remoteV4} local ${value.localV4} key ${toString value.id}";
};
}) cfg.interfaces;
}

13
bgpwtf/machines/tests/edge01-waw.nix
View File

@ -19,9 +19,16 @@
# nix-build -A bgpwtf.machines.tests.edge01-waw.driver && result/bin/nixos-test-driver
# >>> start_all()
{ hscloud, pkgsSrc, pkgs, lib, ... }:
{ hscloud, ... }:
with lib;
# Use pkgs that edge01 is using. Perhaps we shouldn't use them for
# _everything_, but this will have to do.
let
pkgs = hscloud.ops.machines."edge01.waw.bgp.wtf".pkgs;
pkgsSrc = pkgs.path;
lib = pkgs.lib;
in with lib;
let
@ -262,7 +269,7 @@ test = import "${pkgsSrc}/nixos/tests/make-test-python.nix" ({ pkgs, libs, ... }
# edge01 must announce exactly one v4 prefix.
bgpspeaker.succeed("birdc show route protocol bgp_globalmix_v4 | grep unicast")
bgpspeaker.fail(
"birdc show route protocol bgp_globalmix_v4 | grep unicast | grep -v 185.236.240.0/24"
"birdc show route protocol bgp_globalmix_v4 | grep unicast | grep -v 185.236.240.0/23"
)
# edge01 must announce exactly one v6 prefix.