9865ac325c
Use the generic runtime method to get the netns path. Also move reading the container IP address into cni (based off kubenet) instead of having it in the Docker manager code. Both old and new methods use nsenter and /sbin/ip and should be functionally equivalent.
75 lines
2.2 KiB
Go
75 lines
2.2 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package container_test
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
"time"
|
|
|
|
. "k8s.io/kubernetes/pkg/kubelet/container"
|
|
ctest "k8s.io/kubernetes/pkg/kubelet/container/testing"
|
|
)
|
|
|
|
func comparePods(t *testing.T, expected []*ctest.FakePod, actual []*Pod) {
|
|
if len(expected) != len(actual) {
|
|
t.Errorf("expected %d pods, got %d instead", len(expected), len(actual))
|
|
}
|
|
for i := range expected {
|
|
if !reflect.DeepEqual(expected[i].Pod, actual[i]) {
|
|
t.Errorf("expected %#v, got %#v", expected[i].Pod, actual[i])
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestGetPods(t *testing.T) {
|
|
runtime := &ctest.FakeRuntime{}
|
|
expected := []*ctest.FakePod{{Pod: &Pod{ID: "1111"}}, {Pod: &Pod{ID: "2222"}}, {Pod: &Pod{ID: "3333"}}}
|
|
runtime.PodList = expected
|
|
cache := NewTestRuntimeCache(runtime)
|
|
actual, err := cache.GetPods()
|
|
if err != nil {
|
|
t.Errorf("unexpected error %v", err)
|
|
}
|
|
|
|
comparePods(t, expected, actual)
|
|
}
|
|
|
|
func TestForceUpdateIfOlder(t *testing.T) {
|
|
runtime := &ctest.FakeRuntime{}
|
|
cache := NewTestRuntimeCache(runtime)
|
|
|
|
// Cache old pods.
|
|
oldpods := []*ctest.FakePod{{Pod: &Pod{ID: "1111"}}}
|
|
runtime.PodList = oldpods
|
|
cache.UpdateCacheWithLock()
|
|
|
|
// Update the runtime to new pods.
|
|
newpods := []*ctest.FakePod{{Pod: &Pod{ID: "1111"}}, {Pod: &Pod{ID: "2222"}}, {Pod: &Pod{ID: "3333"}}}
|
|
runtime.PodList = newpods
|
|
|
|
// An older timestamp should not force an update.
|
|
cache.ForceUpdateIfOlder(time.Now().Add(-20 * time.Minute))
|
|
actual := cache.GetCachedPods()
|
|
comparePods(t, oldpods, actual)
|
|
|
|
// A newer timestamp should force an update.
|
|
cache.ForceUpdateIfOlder(time.Now().Add(20 * time.Second))
|
|
actual = cache.GetCachedPods()
|
|
comparePods(t, newpods, actual)
|
|
}
|