Merge pull request #4074 from qcheng-redhat/vsock_test_tool

Set default value for vsock_test_tool
autotest · Jun 28, 2024 · c68c2f5 · c68c2f5
2 parents 0677f7a + 9ef2dea
commit c68c2f5
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 25 deletions.
diff --git a/qemu/tests/cfg/nested_vsock_con_sockets.cfg b/qemu/tests/cfg/nested_vsock_con_sockets.cfg
@@ -10,8 +10,7 @@
     vsocks = vhost_vsock0
     vsock_port = 2345
     no RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2
+    vsock_test_tool = ncat
     RHEL.8:
-      vsock_test_tool = nc_vsock
-    RHEL.9:
-      vsock_test_tool = ncat
+        vsock_test_tool = nc_vsock
     disable_firewall = "systemctl stop firewalld.service"
diff --git a/qemu/tests/cfg/nested_vsock_con_sockets_l1.cfg b/qemu/tests/cfg/nested_vsock_con_sockets_l1.cfg
@@ -6,10 +6,9 @@
     wait_response_timeout = 1800
     #mq_port = 2000
     vsocks = vhost_vsock0
+    vsock_test_tool = ncat
     RHEL.8:
-      vsock_test_tool = nc_vsock
-    RHEL.9:
-      vsock_test_tool = ncat
+        vsock_test_tool = nc_vsock
     host_cid = 2
     socat_cmd = "socat vsock-listen:%s,reuseaddr,fork vsock-connect:2:%s &"
     disable_firewall = "systemctl stop firewalld.service"
diff --git a/qemu/tests/cfg/vsock_test.cfg b/qemu/tests/cfg/vsock_test.cfg
@@ -2,10 +2,9 @@
     no Windows
     type = vsock_test
     vsocks = vhost_vsock0
+    vsock_test_tool = ncat
     RHEL.7, RHEL.8:
-      vsock_test_tool = nc_vsock
-    RHEL.9:
-      vsock_test_tool = ncat
+        vsock_test_tool = nc_vsock
     # TODO: Work out a python version nc-vsock and use the APIs directly
     variants:
         - @basic_test:
@@ -17,15 +16,15 @@
             addr_pattern = '\d\d:\d\d\.\d'
             device_pattern = 'Communication controller: Red Hat.* Device'
             q35:
-              device_pattern = 'Communication controller: Red Hat.* Virtio socket'
-              RHEL.7, RHEL.8.1, RHEL.8.2:
-                device_pattern = 'Communication controller: Red Hat.* Device'
+                device_pattern = 'Communication controller: Red Hat.* Virtio socket'
+                RHEL.7, RHEL.8.1, RHEL.8.2:
+                    device_pattern = 'Communication controller: Red Hat.* Device'
             s390x:
-              check_vsock_cmd = 'lscss'
-              addr_pattern = '0.1.2345'
-              device_pattern = '\d\.\d\.\d\d\d\d'
-              dmesg_check = 'no'
-              devno = 'fe.1.2345'
+                check_vsock_cmd = 'lscss'
+                addr_pattern = '0.1.2345'
+                device_pattern = '\d\.\d\.\d\d\d\d'
+                dmesg_check = 'no'
+                devno = 'fe.1.2345'
         - migration_with_vsock:
             type = migration_with_vsock
         - iommu_enabled:
@@ -44,11 +43,11 @@
                 virtio_dev_disable_legacy = on
                 virtio_dev_disable_modern = off
         - vsock_test_suite:
-             no RHEL.6 RHEL.7 RHEL.8
-             no Host_RHEL.m6 Host_RHEL.m7 Host_RHEL.m8
-             type = vsock_test_suite
-             only q35, aarch64
-             host_cid = 2
-             disable_firewall = "systemctl stop firewalld.service"
-             server_cmd = "%s --mode=server --control-port=%s --peer-cid=%s"
-             client_cmd = "%s --mode=client --control-host=%s --control-port=%s --peer-cid=%s"
+            no RHEL.6 RHEL.7 RHEL.8
+            no Host_RHEL.m6 Host_RHEL.m7 Host_RHEL.m8
+            type = vsock_test_suite
+            only q35, aarch64
+            host_cid = 2
+            disable_firewall = "systemctl stop firewalld.service"
+            server_cmd = "%s --mode=server --control-port=%s --peer-cid=%s"
+            client_cmd = "%s --mode=client --control-host=%s --control-port=%s --peer-cid=%s"