summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorjpathy <15735913+jpathy@users.noreply.github.com>2022-03-16 11:18:15 +0530
committerJiten Kumar Pathy <jiten@lazycons.xyz>2022-03-17 17:59:36 +0530
commit0a62de4cd5b82357b308231897f070706ffdfd4e (patch)
treedd3f82d4ccbf450cf901654a1fd026603ef80be4 /nixos/tests
parent350731a856a1d901b0d26f6c9892785a63f48e17 (diff)
downloadnixpkgs-0a62de4cd5b82357b308231897f070706ffdfd4e.tar
nixpkgs-0a62de4cd5b82357b308231897f070706ffdfd4e.tar.gz
nixpkgs-0a62de4cd5b82357b308231897f070706ffdfd4e.tar.bz2
nixpkgs-0a62de4cd5b82357b308231897f070706ffdfd4e.tar.lz
nixpkgs-0a62de4cd5b82357b308231897f070706ffdfd4e.tar.xz
nixpkgs-0a62de4cd5b82357b308231897f070706ffdfd4e.tar.zst
nixpkgs-0a62de4cd5b82357b308231897f070706ffdfd4e.zip
networking.greTunnels: support ip6gre*
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/networking.nix33
1 files changed, 31 insertions, 2 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 8c9df19f2d5..b763cbd4665 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -498,6 +498,7 @@ let
         networking = {
           useNetworkd = networkd;
           useDHCP = false;
+          firewall.extraCommands = "ip6tables -A nixos-fw -p gre -j nixos-fw-accept";
         };
       };
     in {
@@ -506,7 +507,7 @@ let
         mkMerge [
           (node args)
           {
-            virtualisation.vlans = [ 1 2 ];
+            virtualisation.vlans = [ 1 2 4 ];
             networking = {
               greTunnels = {
                 greTunnel = {
@@ -515,12 +516,24 @@ let
                   dev = "eth2";
                   type = "tap";
                 };
+                gre6Tunnel = {
+                  local = "fd00:1234:5678:4::1";
+                  remote = "fd00:1234:5678:4::2";
+                  dev = "eth3";
+                  type = "tun6";
+                };
               };
               bridges.bridge.interfaces = [ "greTunnel" "eth1" ];
               interfaces.eth1.ipv4.addresses = mkOverride 0 [];
               interfaces.bridge.ipv4.addresses = mkOverride 0 [
                 { address = "192.168.1.1"; prefixLength = 24; }
               ];
+              interfaces.eth3.ipv6.addresses = [
+                { address = "fd00:1234:5678:4::1"; prefixLength = 64; }
+              ];
+              interfaces.gre6Tunnel.ipv6.addresses = mkOverride 0 [
+                { address = "fc00::1"; prefixLength = 64; }
+              ];
             };
           }
         ];
@@ -528,7 +541,7 @@ let
         mkMerge [
           (node args)
           {
-            virtualisation.vlans = [ 2 3 ];
+            virtualisation.vlans = [ 2 3 4 ];
             networking = {
               greTunnels = {
                 greTunnel = {
@@ -537,12 +550,24 @@ let
                   dev = "eth1";
                   type = "tap";
                 };
+                gre6Tunnel = {
+                  local = "fd00:1234:5678:4::2";
+                  remote = "fd00:1234:5678:4::1";
+                  dev = "eth3";
+                  type = "tun6";
+                };
               };
               bridges.bridge.interfaces = [ "greTunnel" "eth2" ];
               interfaces.eth2.ipv4.addresses = mkOverride 0 [];
               interfaces.bridge.ipv4.addresses = mkOverride 0 [
                 { address = "192.168.1.2"; prefixLength = 24; }
               ];
+              interfaces.eth3.ipv6.addresses = [
+                { address = "fd00:1234:5678:4::2"; prefixLength = 64; }
+              ];
+              interfaces.gre6Tunnel.ipv6.addresses = mkOverride 0 [
+                { address = "fc00::2"; prefixLength = 64; }
+              ];
             };
           }
         ];
@@ -562,6 +587,10 @@ let
               client1.wait_until_succeeds("ping -c 1 192.168.1.2")
 
               client2.wait_until_succeeds("ping -c 1 192.168.1.1")
+
+              client1.wait_until_succeeds("ping -c 1 fc00::2")
+
+              client2.wait_until_succeeds("ping -c 1 fc00::1")
         '';
     };
     vlan = let