bgpwtf: edge01: fix tests
Change-Id: I66852cc75f3d5a6ce3cc67790c09e248874b0a9b
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1338
Reviewed-by: implr <implr@hackerspace.pl>
diff --git a/bgpwtf/machines/modules/gretap.nix b/bgpwtf/machines/modules/gretap.nix
index 7d3d847..f4e1a7b 100644
--- a/bgpwtf/machines/modules/gretap.nix
+++ b/bgpwtf/machines/modules/gretap.nix
@@ -56,7 +56,7 @@
];
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;
}
diff --git a/bgpwtf/machines/tests/edge01-waw.nix b/bgpwtf/machines/tests/edge01-waw.nix
index 6b641b5..0a1e260 100644
--- a/bgpwtf/machines/tests/edge01-waw.nix
+++ b/bgpwtf/machines/tests/edge01-waw.nix
@@ -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 @@
# 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.