Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit a78694a

Browse files
johnoloughlinjohnoloughlin
authored
Run gofmt on repo (#374)
Signed-off-by: OLoughlin, John <[email protected]>
1 parent 32ddfaf commit a78694a

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

‎pkg/annotations/annotations_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,26 @@ func TestGetPodVolumeMountHostSharedDir(t *testing.T) {
6262
}{
6363
{
6464
name: "pod with SharedDir",
65-
volumes: []v1.Volume{v1.Volume{Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations"}}}},
65+
volumes: []v1.Volume{{Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations"}}}},
6666

6767
expDir: "/tmp/test-annotations",
6868
},
6969
{
7070
name: "pod with SharedDir 2",
71-
volumes: []v1.Volume{v1.Volume{Name: "some-dir"}, v1.Volume{Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations"}}}},
71+
volumes: []v1.Volume{{Name: "some-dir"}, {Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations"}}}},
7272

7373
expDir: "/tmp/test-annotations",
7474
},
7575
{
7676
name: "pod with SharedDir 3",
77-
volumes: []v1.Volume{v1.Volume{Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations/volumes"}}}},
78-
containers: []v1.Container{v1.Container{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: "/tmp/test-annotations/containers"}}}},
77+
volumes: []v1.Volume{{Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations/volumes"}}}},
78+
containers: []v1.Container{{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: "/tmp/test-annotations/containers"}}}},
7979

8080
expDir: "/tmp/test-annotations/volumes",
8181
},
8282
{
8383
name: "pod with EmptyDir",
84-
volumes: []v1.Volume{v1.Volume{Name: "shared-dir", VolumeSource: v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{}}}},
84+
volumes: []v1.Volume{{Name: "shared-dir", VolumeSource: v1.VolumeSource{EmptyDir: &v1.EmptyDirVolumeSource{}}}},
8585

8686
expDir: "/var/lib/kubelet/pods/#UUID#/volumes/kubernetes.io~empty-dir/shared-dir",
8787
},
@@ -96,12 +96,12 @@ func TestGetPodVolumeMountHostSharedDir(t *testing.T) {
9696
},
9797
{
9898
name: "fail with pod without shareddir volumes",
99-
volumes: []v1.Volume{v1.Volume{Name: "shared_dir"}, v1.Volume{Name: "shareddir"}},
99+
volumes: []v1.Volume{{Name: "shared_dir"}, {Name: "shareddir"}},
100100
expErr: errors.New("Error: No shared-dir. Need \"shared-dir\" in podSpec \"Volumes\""),
101101
},
102102
{
103103
name: "fail with pod without shareddir HostPath",
104-
volumes: []v1.Volume{v1.Volume{Name: "shared-dir", VolumeSource: v1.VolumeSource{}}},
104+
volumes: []v1.Volume{{Name: "shared-dir", VolumeSource: v1.VolumeSource{}}},
105105
expErr: errors.New("Error: Volume is invalid"),
106106
},
107107
}
@@ -141,26 +141,26 @@ func TestGetPodVolumeMountHostMappedSharedDir(t *testing.T) {
141141
}{
142142
{
143143
name: "pod with SharedDir",
144-
containers: []v1.Container{v1.Container{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: "/tmp/test-annotations"}}}},
144+
containers: []v1.Container{{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: "/tmp/test-annotations"}}}},
145145

146146
expDir: "/tmp/test-annotations",
147147
},
148148
{
149149
name: "pod with SharedDir 2",
150-
containers: []v1.Container{v1.Container{Name: "init-container"}, v1.Container{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "some-dir"}, {Name: "shared-dir", MountPath: "/tmp/test-annotations"}}}},
150+
containers: []v1.Container{{Name: "init-container"}, {Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "some-dir"}, {Name: "shared-dir", MountPath: "/tmp/test-annotations"}}}},
151151

152152
expDir: "/tmp/test-annotations",
153153
},
154154
{
155155
name: "pod with SharedDir 3",
156-
volumes: []v1.Volume{v1.Volume{Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations/volumes"}}}},
157-
containers: []v1.Container{v1.Container{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: "/tmp/test-annotations/containers"}}}},
156+
volumes: []v1.Volume{{Name: "shared-dir", VolumeSource: v1.VolumeSource{HostPath: &v1.HostPathVolumeSource{Path: "/tmp/test-annotations/volumes"}}}},
157+
containers: []v1.Container{{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: "/tmp/test-annotations/containers"}}}},
158158

159159
expDir: "/tmp/test-annotations/containers",
160160
},
161161
{
162162
name: "fail with empty SharedDir",
163-
containers: []v1.Container{v1.Container{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: ""}}}},
163+
containers: []v1.Container{{Name: "container", VolumeMounts: []v1.VolumeMount{{Name: "shared-dir", MountPath: ""}}}},
164164
expErr: errors.New("Error: No mapped shared-dir."),
165165
},
166166
{
@@ -174,7 +174,7 @@ func TestGetPodVolumeMountHostMappedSharedDir(t *testing.T) {
174174
},
175175
{
176176
name: "fail with pod without shareddir containers",
177-
containers: []v1.Container{v1.Container{Name: "container1", VolumeMounts: []v1.VolumeMount{{Name: "shareddir"}, {Name: "shared_dir"}}}, v1.Container{Name: "container2", VolumeMounts: []v1.VolumeMount{{Name: "some-dir"}, {Name: "empty-dir"}}}},
177+
containers: []v1.Container{{Name: "container1", VolumeMounts: []v1.VolumeMount{{Name: "shareddir"}, {Name: "shared_dir"}}}, {Name: "container2", VolumeMounts: []v1.VolumeMount{{Name: "some-dir"}, {Name: "empty-dir"}}}},
178178
expErr: errors.New("Error: No mapped shared-dir. Need \"shared-dir\" in podSpec \"Volumes\""),
179179
},
180180
}
@@ -641,7 +641,7 @@ func TestGetFileAnnotationConfigData(t *testing.T) {
641641
{
642642
name: "get configuration data from annotations",
643643
annot: `userspace/configuration-data="[{\"Name\":\"Container New Name\",\"ContainerId\":\"123-456-789-007\"}]"`,
644-
expResult: []*types.ConfigurationData{&types.ConfigurationData{Name: "Container New Name", ContainerId: "123-456-789-007"}},
644+
expResult: []*types.ConfigurationData{{Name: "Container New Name", ContainerId: "123-456-789-007"}},
645645
},
646646
{
647647
name: "fail to get configuration data",

‎pkg/configdata/configdata_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ func TestSaveRemoteConfig(t *testing.T) {
8686
{
8787
name: "save to pod with ipResult and without ContainerConf netType",
8888
netConf: &types.NetConf{HostConf: types.UserSpaceConf{Engine: "ovs-dpdk", IfType: "vhostuser", NetType: "bridge", VhostConf: types.VhostConf{Mode: "client"}}},
89-
ipResult: &current.Result{Interfaces: []*current.Interface{&current.Interface{Name: "vlan0", Mac: "fe:ed:de:ad:be:ef"}}},
89+
ipResult: &current.Result{Interfaces: []*current.Interface{{Name: "vlan0", Mac: "fe:ed:de:ad:be:ef"}}},
9090
expJson: `[{"containerId":"#UUID#","ifName":"#ifName#","name":"","config":{"iftype":"vhostuser","memif":{},"netType":"interface","vhost":{"mode":"server"},"bridge":{}},"ipResult":{"interfaces":[{"name":"vlan0","mac":"fe:ed:de:ad:be:ef"}],"dns":{}}}]`,
9191
},
9292
{
9393
name: "save to pod with ipResult and with ContainerConf netType set",
9494
netConf: &types.NetConf{HostConf: types.UserSpaceConf{Engine: "ovs-dpdk", IfType: "vhostuser", NetType: "bridge", VhostConf: types.VhostConf{Mode: "client"}}, ContainerConf: types.UserSpaceConf{NetType: "bridge"}},
95-
ipResult: &current.Result{Interfaces: []*current.Interface{&current.Interface{Name: "vlan0", Mac: "fe:ed:de:ad:be:ef"}}},
95+
ipResult: &current.Result{Interfaces: []*current.Interface{{Name: "vlan0", Mac: "fe:ed:de:ad:be:ef"}}},
9696
expJson: `[{"containerId":"#UUID#","ifName":"#ifName#","name":"","config":{"iftype":"vhostuser","memif":{},"netType":"bridge","vhost":{"mode":"server"},"bridge":{}},"ipResult":{"interfaces":[{"name":"vlan0","mac":"fe:ed:de:ad:be:ef"}],"dns":{}}}]`,
9797
},
9898
{
@@ -427,19 +427,19 @@ func TestGetRemoteConfig(t *testing.T) {
427427
name: "get config for one interface",
428428
annotations: `userspace/mapped-dir=#tempDir# userspace/configuration-data="[{\"Name\":\"Container New Name\",\"containerId\":\"123-456-789-007\",\"ifName\":\"eth7\",\"config\":{\"iftype\":\"memif\",\"memif\":{\"role\":\"master\"}}}]"`,
429429
expDir: "#tempDir#",
430-
expResult: []*InterfaceData{&InterfaceData{Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth7"}, NetConf: types.NetConf{Name: "Container New Name", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "master"}}}}},
430+
expResult: []*InterfaceData{{Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth7"}, NetConf: types.NetConf{Name: "Container New Name", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "master"}}}}},
431431
},
432432
{
433433
name: "get config for two interfaces",
434434
annotations: `userspace/mapped-dir=#tempDir# userspace/configuration-data="[{\"Name\":\"Container New Name\",\"containerId\":\"123-456-789-007\",\"ifName\":\"eth7\",\"config\":{\"iftype\":\"memif\",\"memif\":{\"role\":\"master\"}}},{\"Name\":\"Container New Name\",\"containerId\":\"123-456-789-007\",\"ifName\":\"eth9\",\"config\":{\"iftype\":\"memif\",\"memif\":{\"role\":\"slave\"}}}]"`,
435435
expDir: "#tempDir#",
436-
expResult: []*InterfaceData{&InterfaceData{Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth7"}, NetConf: types.NetConf{Name: "Container New Name", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "master"}}}}, &InterfaceData{Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth9"}, NetConf: types.NetConf{Name: "Container New Name", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "slave"}}}}},
436+
expResult: []*InterfaceData{{Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth7"}, NetConf: types.NetConf{Name: "Container New Name", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "master"}}}}, {Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth9"}, NetConf: types.NetConf{Name: "Container New Name", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "slave"}}}}},
437437
},
438438
{
439439
name: "get config for two containers",
440440
annotations: `userspace/mapped-dir=#tempDir# userspace/configuration-data="[{\"Name\":\"init-container\",\"containerId\":\"123-456-789-007\",\"ifName\":\"eth7\",\"config\":{\"iftype\":\"memif\",\"memif\":{\"role\":\"master\"}}},{\"Name\":\"worker container\",\"containerId\":\"123-456-789-042\",\"ifName\":\"vlan0\",\"config\":{\"iftype\":\"memif\",\"memif\":{\"role\":\"slave\"}}}]"`,
441441
expDir: "#tempDir#",
442-
expResult: []*InterfaceData{&InterfaceData{Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth7"}, NetConf: types.NetConf{Name: "init-container", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "master"}}}}, &InterfaceData{Args: skel.CmdArgs{ContainerID: "123-456-789-042", IfName: "vlan0"}, NetConf: types.NetConf{Name: "worker container", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "slave"}}}}},
442+
expResult: []*InterfaceData{{Args: skel.CmdArgs{ContainerID: "123-456-789-007", IfName: "eth7"}, NetConf: types.NetConf{Name: "init-container", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "master"}}}}, {Args: skel.CmdArgs{ContainerID: "123-456-789-042", IfName: "vlan0"}, NetConf: types.NetConf{Name: "worker container", HostConf: types.UserSpaceConf{IfType: "memif", MemifConf: types.MemifConf{Role: "slave"}}}}},
443443
},
444444
{
445445
name: "fail without annotation file",

‎userspace/testdata/testdata.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ import (
2323
"k8s.io/apimachinery/pkg/util/uuid"
2424
)
2525

26-
//
2726
// Unit test related functions
28-
//
2927
func GetTestPod(sharedDir string) *v1.Pod {
3028
id := uuid.NewUUID()
3129
pod := &v1.Pod{

0 commit comments

Comments
 (0)