-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
set rangeStart for hostLocal cni plugin
Change-Id: I29ed4218f0a4d8f7dc20421f0034d2d844595014
- Loading branch information
Showing
2 changed files
with
165 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| Copyright 2019 The Kubernetes Authors. | ||
| 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 main | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/json" | ||
| "testing" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| ) | ||
|
|
||
| func Test_writeCNIConfig(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| node *v1.Node | ||
| mtu int | ||
| wantW string | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| name: "ipv4 only and ptp plugin and start range", | ||
| mtu: 1500, | ||
| node: &v1.Node{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "node0", | ||
| }, | ||
| Spec: v1.NodeSpec{ | ||
| PodCIDRs: []string{"192.168.0.0/24"}, | ||
| }, | ||
| Status: v1.NodeStatus{ | ||
| Capacity: v1.ResourceList{ | ||
| v1.ResourcePods: resource.MustParse("110"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "dual stack only and ptp plugin and start range", | ||
| node: &v1.Node{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "node0", | ||
| }, | ||
| Spec: v1.NodeSpec{ | ||
| PodCIDRs: []string{"192.168.0.0/24", "fd00:1:2:3::/96"}, | ||
| }, | ||
| Status: v1.NodeStatus{ | ||
| Capacity: v1.ResourceList{ | ||
| v1.ResourcePods: resource.MustParse("110"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "ipv4 only and ptp plugin and no start range", | ||
| mtu: 1500, | ||
| node: &v1.Node{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "node0", | ||
| }, | ||
| Spec: v1.NodeSpec{ | ||
| PodCIDRs: []string{"192.168.0.0/24"}, | ||
| }, | ||
| Status: v1.NodeStatus{ | ||
| Capacity: v1.ResourceList{ | ||
| v1.ResourcePods: resource.MustParse("255"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "dual stack only and ptp plugin and no start range", | ||
| node: &v1.Node{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "node0", | ||
| }, | ||
| Spec: v1.NodeSpec{ | ||
| PodCIDRs: []string{"192.168.0.0/24", "fd00:1:2:3::/96"}, | ||
| }, | ||
| Status: v1.NodeStatus{ | ||
| Capacity: v1.ResourceList{ | ||
| v1.ResourcePods: resource.MustParse("255"), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| for _, cniTemplate := range []string{cniConfigTemplate, cniConfigTemplateBridge} { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| w := &bytes.Buffer{} | ||
| data := ComputeCNIConfigInputs(tt.node) | ||
| data.Mtu = tt.mtu | ||
| if err := writeCNIConfig(w, cniTemplate, data); (err != nil) != tt.wantErr { | ||
| t.Errorf("writeCNIConfig() error = %v, wantErr %v", err, tt.wantErr) | ||
| return | ||
| } | ||
| t.Logf("CNI input:\n%#v", data) | ||
| t.Logf("CNI config:\n%s", w.String()) | ||
| // is valid json | ||
| if !json.Valid([]byte(w.String())) { | ||
| t.Errorf("Invalid Json: %s", w.String()) | ||
| } | ||
| if gotW := w.String(); gotW != tt.wantW { | ||
| // TODO validate the content | ||
| // t.Errorf("writeCNIConfig() = %v, want %v", gotW, tt.wantW) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
| } |