vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tests: Install CNI configuration files by default

Browse source 
Since we no longer fall back to the noop plugin when
CNI configuration files are missing, and since the default
sandbox_config.json test file is running without host
networking, we must install the bridge and loopback
configuration files by default for tests to pass.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2017-04-06 23:57:27 +02:00
parent 63c7a7c99b
commit 07ccda3395
3 changed files with 19 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/README.md
View file

@ -37,6 +37,18 @@ $ cd bats
$ ./install.sh /usr/local $ ./install.sh /usr/local
``` ```
You will also need to install the [CNI](https://github.com/containernetworking/cni) plugins as
the the default pod test template runs without host networking:
```
$ go get github.com/containernetworking/cni
$ cd "$GOPATH/src/github.com/containernetworking/cni"
$ git checkout -q d4bbce1865270cd2d2be558d6a23e63d314fe769
$ ./build.sh \
$ mkdir -p /opt/cni/bin \
$ cp bin/* /opt/cni/bin/
```
Then you can run the tests on your host: Then you can run the tests on your host:
``` ```
$ sudo make localintegration $ sudo make localintegration

9
test/helpers.bash
View file

@ -63,8 +63,6 @@ POD_CIDR_MASK="10.88.*.*"
cp "$CONMON_BINARY" "$TESTDIR/conmon" cp "$CONMON_BINARY" "$TESTDIR/conmon"
mkdir -p $OCID_CNI_CONFIG
PATH=$PATH:$TESTDIR PATH=$PATH:$TESTDIR
# Make sure we have a copy of the redis:latest image. # Make sure we have a copy of the redis:latest image.
@ -149,6 +147,10 @@ function start_ocid() {
fi fi
"$COPYIMG_BINARY" --root "$TESTDIR/ocid" --runroot "$TESTDIR/ocid-run" --image-name=redis --import-from=dir:"$ARTIFACTS_PATH"/redis-image --add-name=docker://docker.io/library/redis:latest --signature-policy="$INTEGRATION_ROOT"/policy.json "$COPYIMG_BINARY" --root "$TESTDIR/ocid" --runroot "$TESTDIR/ocid-run" --image-name=redis --import-from=dir:"$ARTIFACTS_PATH"/redis-image --add-name=docker://docker.io/library/redis:latest --signature-policy="$INTEGRATION_ROOT"/policy.json
"$OCID_BINARY" --conmon "$CONMON_BINARY" --listen "$OCID_SOCKET" --runtime "$RUNTIME_BINARY" --root "$TESTDIR/ocid" --runroot "$TESTDIR/ocid-run" --seccomp-profile "$seccomp" --apparmor-profile "$apparmor" --cni-config-dir "$OCID_CNI_CONFIG" --signature-policy "$INTEGRATION_ROOT"/policy.json --config /dev/null config >$OCID_CONFIG "$OCID_BINARY" --conmon "$CONMON_BINARY" --listen "$OCID_SOCKET" --runtime "$RUNTIME_BINARY" --root "$TESTDIR/ocid" --runroot "$TESTDIR/ocid-run" --seccomp-profile "$seccomp" --apparmor-profile "$apparmor" --cni-config-dir "$OCID_CNI_CONFIG" --signature-policy "$INTEGRATION_ROOT"/policy.json --config /dev/null config >$OCID_CONFIG
# Prepare the CNI configuration files, we're running with non host networking by default
prepare_network_conf $POD_CIDR
"$OCID_BINARY" --debug --config "$OCID_CONFIG" & OCID_PID=$! "$OCID_BINARY" --debug --config "$OCID_CONFIG" & OCID_PID=$!
wait_until_reachable wait_until_reachable
@ -209,6 +211,8 @@ function stop_ocid() {
wait "$OCID_PID" wait "$OCID_PID"
rm -f "$OCID_CONFIG" rm -f "$OCID_CONFIG"
fi fi
cleanup_network_conf
} }
function restart_ocid() { function restart_ocid() {
@ -255,6 +259,7 @@ function is_apparmor_enabled() {
} }
function prepare_network_conf() { function prepare_network_conf() {
mkdir -p $OCID_CNI_CONFIG
cat >$OCID_CNI_CONFIG/10-ocid.conf <<-EOF cat >$OCID_CNI_CONFIG/10-ocid.conf <<-EOF
{ {
"cniVersion": "0.2.0", "cniVersion": "0.2.0",

33
test/network.bats
View file

@ -3,16 +3,6 @@
load helpers load helpers
@test "Check for valid pod netns CIDR" { @test "Check for valid pod netns CIDR" {
if [ ! -f "$OCID_CNI_PLUGIN/bridge" ]; then
skip "missing CNI bridge plugin, please install it"
fi
if [ ! -f "$OCID_CNI_PLUGIN/host-local" ]; then
skip "missing CNI host-local IPAM, please install it"
fi
prepare_network_conf $POD_CIDR
start_ocid start_ocid
run ocic pod run --config "$TESTDATA"/sandbox_config.json run ocic pod run --config "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
@ -22,21 +12,10 @@ load helpers
check_pod_cidr $pod_id check_pod_cidr $pod_id
cleanup_pods cleanup_pods
cleanup_network_conf
stop_ocid stop_ocid
} }
@test "Ping pod from the host" { @test "Ping pod from the host" {
if [ ! -f "$OCID_CNI_PLUGIN/bridge" ]; then
skip "missing CNI bridge plugin, please install it"
fi
if [ ! -f "$OCID_CNI_PLUGIN/host-local" ]; then
skip "missing CNI host-local IPAM, please install it"
fi
prepare_network_conf $POD_CIDR
start_ocid start_ocid
run ocic pod run --config "$TESTDATA"/sandbox_config.json run ocic pod run --config "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
@ -46,21 +25,10 @@ load helpers
ping_pod $pod_id ping_pod $pod_id
cleanup_pods cleanup_pods
cleanup_network_conf
stop_ocid stop_ocid
} }
@test "Ping pod from another pod" { @test "Ping pod from another pod" {
if [ ! -f "$OCID_CNI_PLUGIN/bridge" ]; then
skip "missing CNI bridge plugin, please install it"
fi
if [ ! -f "$OCID_CNI_PLUGIN/host-local" ]; then
skip "missing CNI host-local IPAM, please install it"
fi
prepare_network_conf $POD_CIDR
start_ocid start_ocid
run ocic pod run --config "$TESTDATA"/sandbox_config.json run ocic pod run --config "$TESTDATA"/sandbox_config.json
echo "$output" echo "$output"
@ -81,6 +49,5 @@ load helpers
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
cleanup_pods cleanup_pods
cleanup_network_conf
stop_ocid stop_ocid
} }