github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-06 11:24:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix defaultnetworkfile in unit test

Browse Source 
rename conf param, 'defaultnetworkfile' to 'readinessindicatorfile'
This commit is contained in:
Tomofumi Hayashi
2024-05-02 01:34:43 +09:00
parent 89188023ef
commit 541a8032c3
5 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/server/thick_cni_test.go
View File

@@ -96,6 +96,7 @@ var _ = Describe(suiteName, func() {
containerID = "123456789"
ifaceName = "eth0"
podName = "my-little-pod"
configPath = "/tmp/foo.multus.conf"
)
var (
@@ -109,6 +110,8 @@ var _ = Describe(suiteName, func() {
BeforeEach(func() {
var err error
K8sClient = fakeK8sClient()
// Touch the default network file.
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
Expect(FilesystemPreRequirements(thickPluginRunDir)).To(Succeed())
@@ -126,6 +129,11 @@ var _ = Describe(suiteName, func() {
AfterEach(func() {
cancel()
// Cleanup default network file.
if _, errStat := os.Stat(configPath); errStat == nil {
errRemove := os.Remove(configPath)
Expect(errRemove).NotTo(HaveOccurred())
}
unregisterMetrics(cniServer)
Expect(cniServer.Close()).To(Succeed())
Expect(teardownCNIEnv()).To(Succeed())
@@ -150,6 +158,7 @@ var _ = Describe(suiteName, func() {
containerID = "123456789"
ifaceName = "eth0"
podName = "my-little-pod"
configPath = "/tmp/foo.multus.conf"
)
var (
@@ -169,6 +178,8 @@ var _ = Describe(suiteName, func() {
"dummy_key2": "dummy_val2"
}`
// Touch the default network file.
os.OpenFile(configPath, os.O_RDONLY|os.O_CREATE, 0755)
Expect(FilesystemPreRequirements(thickPluginRunDir)).To(Succeed())
ctx, cancel = context.WithCancel(context.TODO())
@@ -185,6 +196,11 @@ var _ = Describe(suiteName, func() {
AfterEach(func() {
cancel()
// Cleanup default network file.
if _, errStat := os.Stat(configPath); errStat == nil {
errRemove := os.Remove(configPath)
Expect(errRemove).NotTo(HaveOccurred())
}
unregisterMetrics(cniServer)
Expect(cniServer.Close()).To(Succeed())
Expect(teardownCNIEnv()).To(Succeed())
@@ -286,7 +302,7 @@ func referenceConfig(thickPluginSocketDir string) string {
"name": "node-cni-network",
"type": "multus",
"daemonSocketDir": "%s",
"defaultnetworkfile": "/tmp/foo.multus.conf",
"readinessindicatorfile": "/tmp/foo.multus.conf",
"defaultnetworkwaitseconds": 3,
"delegates": [{
"name": "weave1",