Skip to content

Commit

Permalink
No system mode networking for Windows libhvee (remove test)
Browse files Browse the repository at this point in the history
  • Loading branch information
gbraad committed Sep 13, 2023
1 parent b34b1f0 commit d1658c1
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions pkg/crc/machine/driver_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/crc/machine/libhvee/driver_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/crc/preflight/preflight_checks_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions pkg/crc/preflight/preflight_windows_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/libhvee/libhvee_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/libmachine/load_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit d1658c1

Please sign in to comment.