Fix ids-vm

- change 'cloud-hypervisor' to qemu - fix gateway settings Signed-off-by: Manuel Bluhm <[email protected]>
brianmcgillion · Aug 25, 2024 · 17f418a · 17f418a
1 parent 1d6f269
commit 17f418a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/modules/microvm/virtualization/microvm/common/vm-networking.nix b/modules/microvm/virtualization/microvm/common/vm-networking.nix
@@ -6,11 +6,17 @@
   vmName,
   macAddress,
   internalIP,
-  gateway ? [ "192.168.100.1" ],
+  isGateway ? false,
   ...
 }:
 let
   networkName = "ethint0";
+  netVmEntry = builtins.filter (x: x.name == "net-vm") config.ghaf.networking.hosts.entries;
+  netVmAddress = builtins.map (x: x.ip) netVmEntry;
+  isIdsvmEnabled = config.ghaf.virtualization.microvm.idsvm.enable;
+  idsVmEntry = builtins.filter (x: x.name == "ids-vm") config.ghaf.networking.hosts.entries;
+  idsVmAddress = lib.optionals isIdsvmEnabled (builtins.map (x: x.ip) idsVmEntry);
+  gateway = if isIdsvmEnabled && (vmName != "ids-vm") then idsVmAddress else netVmAddress;
 in
 {
   networking = {
@@ -53,7 +59,7 @@ in
         ];
       linkConfig.RequiredForOnline = "routable";
       linkConfig.ActivationPolicy = "always-up";
-    } // lib.optionalAttrs (gateway != [ ]) { inherit gateway; };
+    } // lib.optionalAttrs (!isGateway) { inherit gateway; };
   };
 
   # systemd-resolved does not support local names resolution

diff --git a/modules/microvm/virtualization/microvm/idsvm/idsvm.nix b/modules/microvm/virtualization/microvm/idsvm/idsvm.nix
@@ -45,7 +45,7 @@ let
           nixpkgs.buildPlatform.system = configHost.nixpkgs.buildPlatform.system;
           nixpkgs.hostPlatform.system = configHost.nixpkgs.hostPlatform.system;
 
-          microvm.hypervisor = "cloud-hypervisor";
+          microvm.hypervisor = "qemu";
 
           environment.systemPackages = [
             pkgs.snort # TODO: put into separate module

diff --git a/modules/microvm/virtualization/microvm/netvm.nix b/modules/microvm/virtualization/microvm/netvm.nix
@@ -27,7 +27,7 @@ let
           macAddress
           ;
         internalIP = 1;
-        gateway = [ ];
+        isGateway = true;
       })
       # To push logs to central location
       ../../../common/logging/client.nix