chore: add vsock_type field to python integration tests

add changelog entry for the modified field

Signed-off-by: aerosouund <aerosound161@gmail.com>

Author: aerosouund

tests/framework/utils_vsock.py

@@ -31,14 +31,17 @@ class HostEchoWorker(Thread):
     contents of `blob_path`.
     """
 
-    def __init__(self, uds_path, blob_path):
+    def __init__(self, uds_path, blob_path, vsock_type=SOCK_STREAM):
         """."""
         super().__init__()
         self.uds_path = uds_path
         self.blob_path = blob_path
         self.hash = None
+        self.vsock_type = vsock_type
         self.error = None
-        self.sock = _vsock_connect_to_guest(self.uds_path, ECHO_SERVER_PORT)
+        self.sock = _vsock_connect_to_guest(
+            self.uds_path, ECHO_SERVER_PORT, self.vsock_type
+        )
 
     def run(self):
         """Thread code payload.
@@ -285,9 +288,9 @@ def make_host_port_path(uds_path, port):
     return "{}_{}".format(uds_path, port)
 
 
-def _vsock_connect_to_guest(uds_path, port):
+def _vsock_connect_to_guest(uds_path, port, vsock_type):
     """Return a Unix socket, connected to the guest vsock port `port`."""
-    sock = socket(AF_UNIX, SOCK_STREAM)
+    sock = socket(AF_UNIX, vsock_type)
     sock.connect(uds_path)
 
     buf = bytearray("CONNECT {}\n".format(port).encode("utf-8"))

tests/integration_tests/functional/test_api.py

@@ -965,26 +965,30 @@ def test_api_vsock(uvm_nano):
     """
     vm = uvm_nano
     # Create a vsock device.
-    vm.api.vsock.put(guest_cid=15, uds_path="vsock.sock")
+    vm.api.vsock.put(guest_cid=15, uds_path="vsock.sock", vsock_type="stream")
 
     # Updating an existing vsock is currently fine.
-    vm.api.vsock.put(guest_cid=166, uds_path="vsock.sock")
+    vm.api.vsock.put(guest_cid=166, uds_path="vsock.sock", vsock_type="stream")
 
     # Check PUT request. Although vsock_id is deprecated, it must still work.
-    response = vm.api.vsock.put(vsock_id="vsock1", guest_cid=15, uds_path="vsock.sock")
+    response = vm.api.vsock.put(
+        vsock_id="vsock1", guest_cid=15, uds_path="vsock.sock", vsock_type="stream"
+    )
     assert response.headers["deprecation"]
 
     # Updating an existing vsock is currently fine even with deprecated
     # `vsock_id`.
-    response = vm.api.vsock.put(vsock_id="vsock1", guest_cid=166, uds_path="vsock.sock")
+    response = vm.api.vsock.put(
+        vsock_id="vsock1", guest_cid=166, uds_path="vsock.sock", vsock_type="stream"
+    )
     assert response.headers["deprecation"]
 
     # No other vsock action is allowed after booting the VM.
     vm.start()
 
     # Updating an existing vsock should not be fine at this point.
     with pytest.raises(RuntimeError):
-        vm.api.vsock.put(guest_cid=17, uds_path="vsock.sock")
+        vm.api.vsock.put(guest_cid=17, uds_path="vsock.sock", vsock_type="stream")
 
 
 def test_api_entropy(uvm_plain):
@@ -1342,8 +1346,12 @@ def test_get_full_config_after_restoring_snapshot(microvm_factory, uvm_nano):
     }
 
     # Add a vsock device.
-    uvm_nano.api.vsock.put(guest_cid=15, uds_path="vsock.sock")
-    setup_cfg["vsock"] = {"guest_cid": 15, "uds_path": "vsock.sock"}
+    uvm_nano.api.vsock.put(guest_cid=15, uds_path="vsock.sock", vsock_type="stream")
+    setup_cfg["vsock"] = {
+        "guest_cid": 15,
+        "uds_path": "vsock.sock",
+        "vsock_type": "stream",
+    }
 
     setup_cfg["memory-hotplug"] = {
         "total_size_mib": 1024,
@@ -1478,9 +1486,14 @@ def test_get_full_config(uvm_plain):
     }
 
     # Add a vsock device.
-    response = test_microvm.api.vsock.put(guest_cid=15, uds_path="vsock.sock")
-    expected_cfg["vsock"] = {"guest_cid": 15, "uds_path": "vsock.sock"}
-
+    response = test_microvm.api.vsock.put(
+        guest_cid=15, uds_path="vsock.sock", vsock_type="stream"
+    )
+    expected_cfg["vsock"] = {
+        "guest_cid": 15,
+        "uds_path": "vsock.sock",
+        "vsock_type": "stream",
+    }
     # Add hot-pluggable memory.
     expected_cfg["memory-hotplug"] = {
         "total_size_mib": 1024,
@@ -1619,7 +1632,7 @@ def test_negative_snapshot_load_api(microvm_factory):
         )
 
     # API request without `mem_backend` or `mem_file_path` should fail.
-    err_msg = "missing field: either `mem_backend` or " "`mem_file_path` is required"
+    err_msg = "missing field: either `mem_backend` or `mem_file_path` is required"
     with pytest.raises(RuntimeError, match=err_msg):
         vm.api.snapshot_load.put(snapshot_path="foo")
 

tests/integration_tests/functional/test_snapshot_basic.py

@@ -140,7 +140,9 @@ def test_cycled_snapshot_restore(
     )
     vm.set_cpu_template(cpu_template_any)
     vm.add_net_iface()
-    vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=VSOCK_UDS_PATH)
+    vm.api.vsock.put(
+        vsock_id="vsock0", guest_cid=3, uds_path=VSOCK_UDS_PATH, vsock_type="stream"
+    )
     vm.start()
 
     vm_blob_path = "/tmp/vsock/test.blob"

tests/integration_tests/functional/test_snapshot_phase1.py

@@ -49,7 +49,9 @@ def test_snapshot_phase1(
     for i in range(4):
         vm.add_net_iface()
     # Add a vsock device
-    vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path="/v.sock")
+    vm.api.vsock.put(
+        vsock_id="vsock0", guest_cid=3, uds_path="/v.sock", vsock_type="stream"
+    )
     # Add MMDS
     configure_mmds(vm, ["eth3"], version="V2")
     # Add a memory balloon.

tests/integration_tests/functional/test_vsock.py

@@ -57,15 +57,20 @@ def test_vsock(uvm_plain_any, bin_vsock_path, test_fc_session_root_path):
 
     vm.basic_config()
     vm.add_net_iface()
-    vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=f"/{VSOCK_UDS_PATH}")
+    vm.api.vsock.put(
+        vsock_id="vsock0",
+        guest_cid=3,
+        uds_path=f"/{VSOCK_UDS_PATH}",
+        vsock_type="stream",
+    )
     vm.start()
 
     check_vsock_device(vm, bin_vsock_path, test_fc_session_root_path, vm.ssh)
     metrics = vm.flush_metrics()
     validate_fc_metrics(metrics)
 
 
-def negative_test_host_connections(vm, blob_path, blob_hash):
+def negative_test_host_connections(vm, blob_path, blob_hash, vsock_type):
     """Negative test for host-initiated connections.
 
     This will start a daemonized echo server on the guest VM, and then spawn
@@ -77,7 +82,7 @@ def negative_test_host_connections(vm, blob_path, blob_hash):
 
     workers = []
     for _ in range(NEGATIVE_TEST_CONNECTION_COUNT):
-        worker = HostEchoWorker(uds_path, blob_path)
+        worker = HostEchoWorker(uds_path, blob_path, vsock_type)
         workers.append(worker)
         worker.start()
 
@@ -118,7 +123,12 @@ def test_vsock_epipe(uvm_plain_any, bin_vsock_path, test_fc_session_root_path):
     vm.spawn()
     vm.basic_config()
     vm.add_net_iface()
-    vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=f"/{VSOCK_UDS_PATH}")
+    vm.api.vsock.put(
+        vsock_id="vsock0",
+        guest_cid=3,
+        uds_path=f"/{VSOCK_UDS_PATH}",
+        vsock_type="stream",
+    )
     vm.start()
 
     # Generate the random data blob file, 20MB
@@ -131,7 +141,7 @@ def test_vsock_epipe(uvm_plain_any, bin_vsock_path, test_fc_session_root_path):
 
     # Negative test for host-initiated connections that
     # are closed with in flight data.
-    negative_test_host_connections(vm, blob_path, blob_hash)
+    negative_test_host_connections(vm, blob_path, blob_hash, SOCK_STREAM)
     metrics = vm.flush_metrics()
     validate_fc_metrics(metrics)
 
@@ -158,7 +168,12 @@ def test_vsock_transport_reset_h2g(
     test_vm.spawn()
     test_vm.basic_config(vcpu_count=2, mem_size_mib=256)
     test_vm.add_net_iface()
-    test_vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=f"/{VSOCK_UDS_PATH}")
+    test_vm.api.vsock.put(
+        vsock_id="vsock0",
+        guest_cid=3,
+        uds_path=f"/{VSOCK_UDS_PATH}",
+        vsock_type="stream",
+    )
     test_vm.start()
 
     # Generate the random data blob file.
@@ -200,6 +215,7 @@ def test_vsock_transport_reset_h2g(
             assert (
                 response == b""
             ), f"Connection not closed: response received '{response.decode('utf-8')}'"
+
         except (SocketTimeout, ConnectionResetError, BrokenPipeError):
             pass
 
@@ -231,7 +247,12 @@ def test_vsock_transport_reset_g2h(uvm_plain_any, microvm_factory):
     test_vm.spawn()
     test_vm.basic_config(vcpu_count=2, mem_size_mib=256)
     test_vm.add_net_iface()
-    test_vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path=f"/{VSOCK_UDS_PATH}")
+    test_vm.api.vsock.put(
+        vsock_id="vsock0",
+        guest_cid=3,
+        uds_path=f"/{VSOCK_UDS_PATH}",
+        vsock_type="stream",
+    )
     test_vm.start()
 
     # Create snapshot and terminate a VM.

tests/integration_tests/performance/test_snapshot.py

@@ -74,7 +74,9 @@ def boot_vm(self, microvm_factory, guest_kernel, rootfs, pci_enabled) -> Microvm
             vm.api.balloon.put(
                 amount_mib=0, deflate_on_oom=True, stats_polling_interval_s=1
             )
-            vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path="/v.sock")
+            vm.api.vsock.put(
+                vsock_id="vsock0", guest_cid=3, uds_path="/v.sock", vsock_type="stream"
+            )
 
         vm.start()
 

tests/integration_tests/performance/test_vsock.py

@@ -92,7 +92,12 @@ def test_vsock_throughput(
     vm.basic_config(vcpu_count=vcpus, mem_size_mib=mem_size_mib)
     vm.add_net_iface()
     # Create a vsock device
-    vm.api.vsock.put(vsock_id="vsock0", guest_cid=3, uds_path="/" + VSOCK_UDS_PATH)
+    vm.api.vsock.put(
+        vsock_id="vsock0",
+        guest_cid=3,
+        uds_path="/" + VSOCK_UDS_PATH,
+        vsock_type="stream",
+    )
     vm.start()
 
     metrics.set_dimensions(