From d1658c1e8a5651d94926d69804888393c6747d3a Mon Sep 17 00:00:00 2001
From: Gerard Braad <me@gbraad.nl>
Date: Mon, 11 Sep 2023 09:27:19 +0000
Subject: [PATCH] No system mode networking for Windows libhvee (remove test)

---
 pkg/crc/machine/driver_windows.go             | 10 +++++-----
 pkg/crc/machine/libhvee/driver_windows.go     |  6 +++---
 pkg/crc/preflight/preflight_checks_windows.go |  2 +-
 pkg/crc/preflight/preflight_windows_test.go   |  4 ++--
 pkg/drivers/libhvee/libhvee_windows.go        |  4 ++--
 pkg/libmachine/load_windows.go                |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg/crc/machine/driver_windows.go b/pkg/crc/machine/driver_windows.go
index c0125a58f1..f8388aac5d 100644
--- a/pkg/crc/machine/driver_windows.go
+++ b/pkg/crc/machine/driver_windows.go
@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/crc-org/crc/pkg/crc/machine/config"
-	"github.com/crc-org/crc/pkg/crc/machine/libhvee"
-	machineLibhvee "github.com/crc-org/crc/pkg/drivers/libhvee"
-	"github.com/crc-org/crc/pkg/libmachine"
-	"github.com/crc-org/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/config"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/libhvee"
+	machineLibhvee "github.com/crc-org/crc/v2/pkg/drivers/libhvee"
+	"github.com/crc-org/crc/v2/pkg/libmachine"
+	"github.com/crc-org/crc/v2/pkg/libmachine/host"
 )
 
 func newHost(api libmachine.API, machineConfig config.MachineConfig) (*host.Host, error) {
diff --git a/pkg/crc/machine/libhvee/driver_windows.go b/pkg/crc/machine/libhvee/driver_windows.go
index ebf92e336b..9464b7ac6b 100644
--- a/pkg/crc/machine/libhvee/driver_windows.go
+++ b/pkg/crc/machine/libhvee/driver_windows.go
@@ -4,9 +4,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
-	"github.com/crc-org/crc/pkg/crc/machine/config"
-	"github.com/crc-org/crc/pkg/drivers/libhvee"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/machine/config"
+	"github.com/crc-org/crc/v2/pkg/drivers/libhvee"
 	"github.com/crc-org/machine/libmachine/drivers"
 )
 
diff --git a/pkg/crc/preflight/preflight_checks_windows.go b/pkg/crc/preflight/preflight_checks_windows.go
index 0408f5e451..cbc0a5f5eb 100644
--- a/pkg/crc/preflight/preflight_checks_windows.go
+++ b/pkg/crc/preflight/preflight_checks_windows.go
@@ -11,7 +11,7 @@ import (
 	winnet "github.com/crc-org/crc/v2/pkg/os/windows/network"
 	"github.com/crc-org/crc/v2/pkg/os/windows/powershell"
 
-	"github.com/crc-org/crc/pkg/crc/constants"
+	"github.com/crc-org/crc/v2/pkg/crc/constants"
 )
 
 const (
diff --git a/pkg/crc/preflight/preflight_windows_test.go b/pkg/crc/preflight/preflight_windows_test.go
index 18deee5879..449bdb6276 100644
--- a/pkg/crc/preflight/preflight_windows_test.go
+++ b/pkg/crc/preflight/preflight_windows_test.go
@@ -17,8 +17,8 @@ func TestCountConfigurationOptions(t *testing.T) {
 }
 
 func TestCountPreflights(t *testing.T) {
-	assert.Len(t, getPreflightChecks(false, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 22)
-	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 22)
+	assert.Len(t, getPreflightChecks(false, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 21)
+	assert.Len(t, getPreflightChecks(true, network.SystemNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 21)
 
 	assert.Len(t, getPreflightChecks(false, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 21)
 	assert.Len(t, getPreflightChecks(true, network.UserNetworkingMode, constants.GetDefaultBundlePath(preset.OpenShift), preset.OpenShift), 21)
diff --git a/pkg/drivers/libhvee/libhvee_windows.go b/pkg/drivers/libhvee/libhvee_windows.go
index 39a66b9175..dbe63a037c 100644
--- a/pkg/drivers/libhvee/libhvee_windows.go
+++ b/pkg/drivers/libhvee/libhvee_windows.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/containers/libhvee/pkg/hypervctl"
-	log "github.com/crc-org/crc/pkg/crc/logging"
-	crcos "github.com/crc-org/crc/pkg/os"
+	log "github.com/crc-org/crc/v2/pkg/crc/logging"
+	crcos "github.com/crc-org/crc/v2/pkg/os"
 	"github.com/crc-org/machine/libmachine/drivers"
 	"github.com/crc-org/machine/libmachine/state"
 )
diff --git a/pkg/libmachine/load_windows.go b/pkg/libmachine/load_windows.go
index 5066e2dd9b..062379e5d8 100644
--- a/pkg/libmachine/load_windows.go
+++ b/pkg/libmachine/load_windows.go
@@ -3,8 +3,8 @@ package libmachine
 import (
 	"encoding/json"
 
-	"github.com/crc-org/crc/pkg/drivers/libhvee"
-	"github.com/crc-org/crc/pkg/libmachine/host"
+	"github.com/crc-org/crc/v2/pkg/drivers/libhvee"
+	"github.com/crc-org/crc/v2/pkg/libmachine/host"
 )
 
 func (api *Client) NewHost(_ string, driverPath string, rawDriver []byte) (*host.Host, error) {