[QE]test case update for linux default network change to user

crc-org · Jan 13, 2025 · e10b8d9 · e10b8d9
1 parent d9caf9b
commit e10b8d9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 33 deletions.
diff --git a/test/e2e/features/config.feature b/test/e2e/features/config.feature
@@ -79,18 +79,20 @@ Feature: Test configuration settings
         Examples:
             | property                             | value1 | value2 |
             | skip-check-bundle-extracted          | true   | false  |
-            | skip-check-crc-network               | true   | false  |
-            | skip-check-crc-network-active        | true   | false  |
             | skip-check-kvm-enabled               | true   | false  |
             | skip-check-libvirt-driver            | true   | false  |
             | skip-check-libvirt-installed         | true   | false  |
             | skip-check-libvirt-running           | true   | false  |
             | skip-check-libvirt-version           | true   | false  |
-            | skip-check-network-manager-installed | true   | false  |
-            | skip-check-network-manager-running   | true   | false  |
             | skip-check-root-user                 | true   | false  |
             | skip-check-user-in-libvirt-group     | true   | false  |
             | skip-check-virt-enabled              | true   | false  |
+
+    # the following properties not suit for user notwork
+    #| skip-check-crc-network               | true   | false  | 
+    #| skip-check-crc-network-active        | true   | false  | 
+    #| skip-check-network-manager-installed | true   | false  | 
+    #| skip-check-network-manager-running   | true   | false  | 
 
         @windows
         Examples:
@@ -118,20 +120,17 @@ Feature: Test configuration settings
         When removing file "crc.json" from CRC home folder succeeds
         And executing single crc setup command succeeds
         And executing "sudo virsh net-list --name" succeeds
-        Then stdout contains "crc"
-        When executing "sudo virsh net-undefine crc && sudo virsh net-destroy crc" succeeds
-        And executing "sudo virsh net-list --name" succeeds
-        Then stdout should not contain "crc"
+        Then stdout contains "default"
 
-    @linux
+    @linux @system_network
     Scenario: Running `crc setup` with checks enabled restores destroyed network
         When setting config property "skip-check-crc-network" to value "false" succeeds
         And setting config property "skip-check-crc-network-active" to value "false" succeeds
         Then executing single crc setup command succeeds
         And executing "sudo virsh net-list --name" succeeds
         And stdout contains "crc"
 
-    @linux
+    @linux @system_network
     Scenario: Running `crc start` without `crc setup` and with checks disabled fails when network destroyed
         # Destroy network again
         When executing "sudo virsh net-undefine crc && sudo virsh net-destroy crc" succeeds

diff --git a/test/e2e/testsuite/testsuite.go b/test/e2e/testsuite/testsuite.go
@@ -213,21 +213,20 @@ func InitializeScenario(s *godog.ScenarioContext) {
 			}
 
 			if tag.Name == "@proxy" {
-
 				// start container with squid proxy
 				err := util.ExecuteCommand("podman run --name squid -d -p 3128:3128 quay.io/crcont/squid")
 				if err != nil {
 					fmt.Println(err)
 					os.Exit(1)
 				}
 
-				err = util.ExecuteCommand("crc config set http-proxy http://192.168.130.1:3128")
+				err = util.ExecuteCommand("crc config set http-proxy http://host.crc.testing:3128")
 				if err != nil {
 					fmt.Println(err)
 					os.Exit(1)
 				}
 
-				err = util.ExecuteCommand("crc config set https-proxy http://192.168.130.1:3128")
+				err = util.ExecuteCommand("crc config set https-proxy http://host.crc.testing:3128")
 				if err != nil {
 					fmt.Println(err)
 					os.Exit(1)
@@ -239,6 +238,20 @@ func InitializeScenario(s *godog.ScenarioContext) {
 					os.Exit(1)
 				}
 
+				err = util.ExecuteCommand("crc config set host-network-access true")
+				if err != nil {
+					fmt.Println(err)
+					os.Exit(1)
+				}
+
+			}
+
+			if tag.Name == "@system_network" {
+				err = util.ExecuteCommand("crc config set network-mode system")
+				if err != nil {
+					fmt.Println(err)
+					os.Exit(1)
+				}
 			}
 		}
 
@@ -358,6 +371,14 @@ func InitializeScenario(s *godog.ScenarioContext) {
 				}
 			}
 
+			if tag.Name == "@system_network" {
+				err := util.ExecuteCommand("crc config unset network-mode")
+				if err != nil {
+					fmt.Println(err)
+					os.Exit(1)
+				}
+			}
+
 		}
 
 		return ctx, nil
@@ -961,9 +982,6 @@ func PodmanCommandIsAvailable() error {
 		csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ed25519")
 		dh = "npipe:////./pipe/crc-podman"
 	}
-	if runtime.GOOS == "linux" {
-		ch = "ssh://[email protected]:22/run/user/1000/podman/podman.sock"
-	}
 
 	os.Setenv("PATH", path)
 	os.Setenv("CONTAINER_SSHKEY", csshk)

diff --git a/test/extended/util/proxy.go b/test/extended/util/proxy.go
@@ -9,7 +9,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
 
 	"github.com/elazarl/goproxy"
 	log "github.com/sirupsen/logrus"
@@ -65,10 +64,7 @@ func RunProxy() {
 
 	log.SetOutput(f)
 
-	ipaddr := "127.0.0.1"        // user mode is default on windows and darwin
-	if runtime.GOOS == "linux" { // system mode is default on linux
-		ipaddr = "192.168.130.1"
-	}
+	ipaddr := "127.0.0.1" // user mode is default on windows, darwin and linux
 
 	addr := fmt.Sprintf("%s:8888", ipaddr)
 	proxy.Verbose = true

diff --git a/test/integration/podman_test.go b/test/integration/podman_test.go
@@ -57,9 +57,6 @@ var _ = Describe("podman-remote", Serial, Ordered, Label("microshift-preset"), f
 				csshk = filepath.Join(userHomeDir, ".crc/machines/crc/id_ed25519")
 				dh = "npipe:////./pipe/crc-podman"
 			}
-			if runtime.GOOS == "linux" {
-				ch = "ssh://[email protected]:22/run/user/1000/podman/podman.sock"
-			}
 
 			os.Setenv("PATH", path)
 			os.Setenv("CONTAINER_SSHKEY", csshk)

diff --git a/test/integration/proxy_test.go b/test/integration/proxy_test.go
@@ -3,7 +3,6 @@ package test_test
 import (
 	"os"
 	"os/exec"
-	"runtime"
 
 	crc "github.com/crc-org/crc/v2/test/extended/crc/cmd"
 	"github.com/crc-org/crc/v2/test/extended/util"
@@ -41,21 +40,14 @@ var _ = Describe("", Serial, Ordered, Label("openshift-preset", "goproxy"), func
 		httpsProxy := "http://127.0.0.1:8888"
 		noProxy := ".testing"
 
-		if runtime.GOOS == "linux" {
-			httpProxy = "http://192.168.130.1:8888"
-			httpsProxy = "http://192.168.130.1:8888"
-		}
-
 		// Start goproxy
 
 		It("configure CRC", func() {
 			Expect(RunCRCExpectSuccess("config", "set", "http-proxy", httpProxy)).To(ContainSubstring("Successfully configured http-proxy"))
 			Expect(RunCRCExpectSuccess("config", "set", "https-proxy", httpsProxy)).To(ContainSubstring("Successfully configured https-proxy"))
 			Expect(RunCRCExpectSuccess("config", "set", "no-proxy", noProxy)).To(ContainSubstring("Successfully configured no-proxy"))
 			Expect(RunCRCExpectSuccess("config", "set", "proxy-ca-file", util.CACertTempLocation)).To(ContainSubstring("Successfully configured proxy-ca-file"))
-			if runtime.GOOS != "linux" {
-				Expect(RunCRCExpectSuccess("config", "set", "host-network-access", "true")).To(ContainSubstring("Changes to configuration property 'host-network-access' are only applied during 'crc setup'"))
-			}
+			Expect(RunCRCExpectSuccess("config", "set", "host-network-access", "true")).To(ContainSubstring("Changes to configuration property 'host-network-access' are only applied during 'crc setup'"))
 		})
 
 		It("setup CRC", func() {