test/system: Remove slirp

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

test/system/005-info.bats

@@ -52,7 +52,6 @@ store.configFile          | $expr_path
 store.graphDriverName     | [a-z0-9]\\\+\\\$
 store.graphRoot           | $expr_path
 store.imageStore.number   | 1
-host.slirp4netns.executable | $expr_path
 "
 
     defer-assertion-failures

test/system/500-networking.bats

@@ -122,13 +122,8 @@ load helpers.network
             # force bridge networking also for rootless
             # this ensures that rootless + bridge + userns + ports works
             network_arg="--network bridge"
-        elif has_slirp4netns; then
-            # Issue #9828 make sure a custom slirp4netns cidr also works
-            network_arg="--network slirp4netns:cidr=$cidr"
-            # slirp4netns interface ip is always .100
-            match="${cidr%.*}.100"
         else
-            echo "# [skipping subtest of $cidr - slirp4netns unavailable]" >&3
+            echo "# [skipping subtest of $cidr]" >&3
             continue
         fi
 
@@ -208,57 +203,6 @@ load helpers.network
     is "$output" "$pid" "Only ID in output (no extra errors)"
 }
 
-# FIXME: random_rfc1918_subnet is not parallel-safe
-@test "podman run with slirp4ns assigns correct addresses to /etc/hosts" {
-    has_slirp4netns || skip "slirp4netns unavailable"
-
-    CIDR="$(random_rfc1918_subnet)"
-    IP=$(hostname -I | cut -f 1 -d " ")
-    local conname=con-$(safename)
-    run_podman run --rm --network slirp4netns:cidr="${CIDR}.0/24" \
-                --name $conname --hostname $conname $IMAGE cat /etc/hosts
-    is "$output"   ".*${IP}	host.containers.internal"   "host.containers.internal should be host address"
-    is "$output"   ".*${CIDR}.100	$conname $conname"   "$conname should be the cidr+100 address"
-
-    if is_rootless; then
-    # check the slirp ip also works correct with userns
-        run_podman run --rm --userns keep-id --network slirp4netns:cidr="${CIDR}.0/24" \
-                --name $conname --hostname $conname $IMAGE cat /etc/hosts
-        is "$output"   ".*${IP}	host.containers.internal"   "host.containers.internal should be host address"
-        is "$output"   ".*${CIDR}.100	$conname $conname"   "$conname should be the cidr+100 address"
-    fi
-}
-
-# FIXME: random_rfc1918_subnet is not parallel-safe
-@test "podman run with slirp4ns adds correct dns address to resolv.conf" {
-    has_slirp4netns || skip "slirp4netns unavailable"
-
-    CIDR="$(random_rfc1918_subnet)"
-    run_podman run --rm --network slirp4netns:cidr="${CIDR}.0/24" \
-                $IMAGE cat /etc/resolv.conf
-    assert "$output" =~ "nameserver ${CIDR}.3" "resolv.conf should have slirp4netns cidr+3 as first nameserver"
-    no_userns_out="$output"
-
-    if is_rootless; then
-    # check the slirp ip also works correct with userns
-        run_podman run --rm --userns keep-id --network slirp4netns:cidr="${CIDR}.0/24" \
-                $IMAGE cat /etc/resolv.conf
-        assert "$output" =~ "nameserver ${CIDR}.3" "resolv.conf should have slirp4netns cidr+3 as first nameserver with userns"
-        assert "$output" == "$no_userns_out" "resolv.conf should look the same for userns"
-    fi
-
-}
-
-# FIXME: random_rfc1918_subnet is not parallel-safe
-@test "podman run with slirp4ns assigns correct ip address container" {
-    has_slirp4netns || skip "slirp4netns unavailable"
-
-    CIDR="$(random_rfc1918_subnet)"
-    run_podman run --rm --network slirp4netns:cidr="${CIDR}.0/24" \
-                $IMAGE sh -c "ip address | grep ${CIDR}"
-    is "$output"   ".*inet ${CIDR}.100/24 \+"   "container should have slirp4netns cidr+100 assigned to interface"
-}
-
 # "network create" now works rootless, with the help of a special container
 # FIXME: random_rfc1918_subnet is not parallel-safe
 @test "podman network create" {
@@ -466,16 +410,6 @@ load helpers.network
         skip "This test needs an ipv6 nameserver in $resolve_file"
     fi
 
-    if has_slirp4netns; then
-        # ipv4 slirp
-        run_podman run --rm --network slirp4netns:enable_ipv6=false $IMAGE cat /etc/resolv.conf
-        assert "$output" !~ "$ipv6_regex" "resolv.conf should not contain ipv6 nameserver"
-
-        # ipv6 slirp
-        run_podman run --rm --network slirp4netns:enable_ipv6=true $IMAGE cat /etc/resolv.conf
-        assert "$output" =~ "$ipv6_regex" "resolv.conf should contain ipv6 nameserver"
-    fi
-
     # ipv4 cni
     local mysubnet=$(random_rfc1918_subnet)
     local netname=testnet1-$(safename)
@@ -641,9 +575,6 @@ load helpers.network
     is "$output" "$netname" "output of 'network create'"
 
     local -a networks=("$netname")
-    if has_slirp4netns; then
-        networks+=("slirp4netns")
-    fi
     for network in "${networks[@]}"; do
         # Start container with the restart always policy
         local cname=c-$(safename)
@@ -782,10 +713,6 @@ nameserver 8.8.8.8" "nameserver order is correct"
     defer-assertion-failures
 
     local -a netmodes=("bridge")
-    # As of podman 5.0, slirp4netns is optional
-    if has_slirp4netns; then
-        netmodes+=("slirp4netns:port_handler=slirp4netns" "slirp4netns:port_handler=rootlesskit")
-    fi
     # pasta only works rootless
     if is_rootless; then
         netmodes+=("pasta")
@@ -1012,16 +939,9 @@ EOF
     # Now make sure we can still run a container with free ips.
     run_podman run --rm --network $net1 $IMAGE true
 
-    # And now because of all the fun we have to check the same with slirp4netns and pasta because
+    # And now because of all the fun we have to check the same with pasta because
     # that uses slightly different code paths. Note this would deadlock before the fix.
     # https://github.com/containers/podman/issues/21477
-    if has_slirp4netns; then
-        cname2=con2-$(safename)
-        run_podman 1 run --name $cname2 --network slirp4netns --restart on-failure:2 --userns keep-id $IMAGE false
-        wait_for_restart_count $cname2 2 "slirp4netns"
-        run_podman wait $cname2
-    fi
-
     if is_rootless; then
         # pasta can only run rootless
         cname3=con3-$(safename)

test/system/700-play.bats

@@ -226,14 +226,6 @@ RELABEL="system_u:object_r:container_file_t:s0"
     is "$output" "true" ".InfraConfig.HostNetwork"
     run_podman pod rm -t 0 -f $PODNAME
 
-    if has_slirp4netns; then
-        run_podman kube play --network slirp4netns:port_handler=slirp4netns $TESTYAML
-        run_podman pod inspect --format {{.InfraContainerID}} "${lines[1]}"
-        infraID="$output"
-        run_podman container inspect --format "{{.HostConfig.NetworkMode}}" $infraID
-        is "$output" "slirp4netns" "network mode slirp4netns is set for the container"
-    fi
-
     run_podman pod rm -t 0 -f $PODNAME
 
     run_podman kube play --network none $TESTYAML

test/system/helpers.network.bash

@@ -1,7 +1,5 @@
 # -*- bash -*-
 
-_cached_has_slirp4netns=
-
 ### Feature Checks #############################################################
 
 # has_ipv4() - Check if one default route is available for IPv4
@@ -32,18 +30,6 @@ function skip_if_no_ipv6() {
     fi
 }
 
-# has_slirp4netns - Check if the slirp4netns(1) command is available
-function has_slirp4netns() {
-    if [[ -z "$_cached_has_slirp4netns" ]]; then
-        _cached_has_slirp4netns=n
-        run_podman info --format '{{.Host.Slirp4NetNS.Executable}}'
-        if [[ -n "$output" ]]; then
-            _cached_has_slirp4netns=y
-        fi
-    fi
-    test "$_cached_has_slirp4netns" = "y"
-}
-
 ### procfs access ##############################################################
 
 # ipv6_to_procfs() - RFC 5952 IPv6 address text representation to procfs format