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

Merge pull request #1159 from weiwei04/replace_crioctl_with_crictl_wip

Browse source 
Replace crioctl with crictl
This commit is contained in:
Antonio Murdaca 2017-11-20 15:27:30 +01:00 • committed by GitHub
commit b3f59f31ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 457 additions and 457 deletions
Download patch file Download diff file Expand all files Collapse all files

15
test/helpers.bash
View file

@ -171,13 +171,6 @@ function crio() {
"$CRIO_BINARY" --listen "$CRIO_SOCKET" "$@"
}
# DEPRECATED
OCIC_BINARY=${OCIC_BINARY:-${CRIO_ROOT}/cri-o/bin/crioctl}
# Run crioctl using the binary specified by $OCIC_BINARY.
function crioctl() {
"$OCIC_BINARY" --connect "$CRIO_SOCKET" "$@"
}
# Run crictl using the binary specified by $CRICTL_BINARY.
function crictl() {
"$CRICTL_BINARY" -r "$CRIO_SOCKET" -i "$CRIO_SOCKET" "$@"
@ -446,7 +439,7 @@ EOF
}
function check_pod_cidr() {
run crioctl ctr execsync --id $1 ip addr show dev eth0 scope global 2>&1
run crictl exec --sync $1 ip addr show dev eth0 scope global 2>&1
echo "$output"
[ "$status" -eq 0 ]
[[ "$output" =~ $POD_CIDR_MASK ]]
@ -470,7 +463,7 @@ function get_host_ip() {
}
function ping_pod() {
inet=`crioctl ctr execsync --id $1 ip addr show dev eth0 scope global 2>&1 | grep inet`
inet=`crictl exec --sync $1 ip addr show dev eth0 scope global 2>&1 | grep inet`
IFS=" "
ip=`parse_pod_ip $inet`
@ -481,12 +474,12 @@ function ping_pod() {
}
function ping_pod_from_pod() {
inet=`crioctl ctr execsync --id $1 ip addr show dev eth0 scope global 2>&1 | grep inet`
inet=`crictl exec --sync $1 ip addr show dev eth0 scope global 2>&1 | grep inet`
IFS=" "
ip=`parse_pod_ip $inet`
run crioctl ctr execsync --id $2 ping -W 1 -c 2 $ip
run crictl exec --sync $2 ping -W 1 -c 2 $ip
echo "$output"
[ "$status" -eq 0 ]
}