Skip to content

Commit f7f57c2

Browse files
committed
fix linter errors
Signed-off-by: Daniil Loktev <lokt.daniil@gmail.com>
1 parent 5bfc466 commit f7f57c2

1 file changed

Lines changed: 24 additions & 24 deletions

File tree

images/virtualization-artifact/pkg/controller/vm/internal/validators/pv_node_affinity_validator_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,18 @@ var _ = Describe("PVNodeAffinityValidator", func() {
7878
}
7979
}
8080

81-
makeVM := func(name, nodeName string, refs ...v1alpha2.BlockDeviceSpecRef) *v1alpha2.VirtualMachine {
81+
makeVM := func(nodeName string, refs ...v1alpha2.BlockDeviceSpecRef) *v1alpha2.VirtualMachine {
8282
return &v1alpha2.VirtualMachine{
83-
ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: ns},
83+
ObjectMeta: metav1.ObjectMeta{Name: "vm", Namespace: ns},
8484
Spec: v1alpha2.VirtualMachineSpec{BlockDeviceRefs: refs},
8585
Status: v1alpha2.VirtualMachineStatus{Node: nodeName},
8686
}
8787
}
8888

89-
makeKVVMI := func(nodeName string) *virtv1.VirtualMachineInstance {
89+
makeKVVMI := func() *virtv1.VirtualMachineInstance {
9090
return &virtv1.VirtualMachineInstance{
9191
ObjectMeta: metav1.ObjectMeta{Name: "vm", Namespace: ns},
92-
Status: virtv1.VirtualMachineInstanceStatus{NodeName: nodeName},
92+
Status: virtv1.VirtualMachineInstanceStatus{NodeName: node1},
9393
}
9494
}
9595

@@ -100,8 +100,8 @@ var _ = Describe("PVNodeAffinityValidator", func() {
100100
}
101101

102102
It("should allow when VM is not running (no node)", func() {
103-
oldVM := makeVM("vm", "", v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
104-
newVM := makeVM("vm", "",
103+
oldVM := makeVM("", v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
104+
newVM := makeVM("",
105105
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"},
106106
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk2"},
107107
)
@@ -112,21 +112,21 @@ var _ = Describe("PVNodeAffinityValidator", func() {
112112

113113
It("should allow when blockDeviceRefs unchanged", func() {
114114
refs := []v1alpha2.BlockDeviceSpecRef{{Kind: v1alpha2.DiskDevice, Name: "disk1"}}
115-
oldVM := makeVM("vm", node1, refs...)
116-
newVM := makeVM("vm", node1, refs...)
115+
oldVM := makeVM(node1, refs...)
116+
newVM := makeVM(node1, refs...)
117117
v := makeValidator(oldVM, makeNode())
118118
_, err := v.ValidateUpdate(testutil.ContextBackgroundWithNoOpLogger(), oldVM, newVM)
119119
Expect(err).ShouldNot(HaveOccurred())
120120
})
121121

122122
It("should allow adding a network disk (PV without nodeAffinity)", func() {
123-
oldVM := makeVM("vm", node1, v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
124-
newVM := makeVM("vm", node1,
123+
oldVM := makeVM(node1, v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
124+
newVM := makeVM(node1,
125125
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"},
126126
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "net-disk"},
127127
)
128128
v := makeValidator(
129-
oldVM, makeNode(), makeKVVMI(node1),
129+
oldVM, makeNode(), makeKVVMI(),
130130
makeVD("net-disk", "pvc-net"),
131131
makePVC("pvc-net", "pv-net"),
132132
makePV("pv-net"),
@@ -136,13 +136,13 @@ var _ = Describe("PVNodeAffinityValidator", func() {
136136
})
137137

138138
It("should allow adding a local disk available on VM node", func() {
139-
oldVM := makeVM("vm", node1, v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
140-
newVM := makeVM("vm", node1,
139+
oldVM := makeVM(node1, v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
140+
newVM := makeVM(node1,
141141
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"},
142142
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "local-disk"},
143143
)
144144
v := makeValidator(
145-
oldVM, makeNode(), makeKVVMI(node1),
145+
oldVM, makeNode(), makeKVVMI(),
146146
makeVD("local-disk", "pvc-local"),
147147
makePVC("pvc-local", "pv-local"),
148148
makePV("pv-local", node1),
@@ -152,13 +152,13 @@ var _ = Describe("PVNodeAffinityValidator", func() {
152152
})
153153

154154
It("should reject adding a local disk NOT available on VM node", func() {
155-
oldVM := makeVM("vm", node1, v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
156-
newVM := makeVM("vm", node1,
155+
oldVM := makeVM(node1, v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
156+
newVM := makeVM(node1,
157157
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"},
158158
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "local-disk"},
159159
)
160160
v := makeValidator(
161-
oldVM, makeNode(), makeKVVMI(node1),
161+
oldVM, makeNode(), makeKVVMI(),
162162
makeVD("local-disk", "pvc-local"),
163163
makePVC("pvc-local", "pv-local"),
164164
makePV("pv-local", node2),
@@ -170,16 +170,16 @@ var _ = Describe("PVNodeAffinityValidator", func() {
170170
})
171171

172172
It("should allow adding a disk with pending PVC (WFFC, no PV yet)", func() {
173-
oldVM := makeVM("vm", node1)
174-
newVM := makeVM("vm", node1,
173+
oldVM := makeVM(node1)
174+
newVM := makeVM(node1,
175175
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "new-disk"},
176176
)
177177
pvcPending := &corev1.PersistentVolumeClaim{
178178
ObjectMeta: metav1.ObjectMeta{Name: "pvc-pending", Namespace: ns},
179179
Spec: corev1.PersistentVolumeClaimSpec{},
180180
}
181181
v := makeValidator(
182-
oldVM, makeNode(), makeKVVMI(node1),
182+
oldVM, makeNode(), makeKVVMI(),
183183
makeVD("new-disk", "pvc-pending"),
184184
pvcPending,
185185
)
@@ -188,13 +188,13 @@ var _ = Describe("PVNodeAffinityValidator", func() {
188188
})
189189

190190
It("should reject when any of multiple new disks is incompatible", func() {
191-
oldVM := makeVM("vm", node1)
192-
newVM := makeVM("vm", node1,
191+
oldVM := makeVM(node1)
192+
newVM := makeVM(node1,
193193
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "good-disk"},
194194
v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "bad-disk"},
195195
)
196196
v := makeValidator(
197-
oldVM, makeNode(), makeKVVMI(node1),
197+
oldVM, makeNode(), makeKVVMI(),
198198
makeVD("good-disk", "pvc-good"),
199199
makePVC("pvc-good", "pv-good"),
200200
makePV("pv-good", node1),
@@ -208,7 +208,7 @@ var _ = Describe("PVNodeAffinityValidator", func() {
208208
})
209209

210210
It("should allow on create (VM not running yet)", func() {
211-
vm := makeVM("vm", "", v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
211+
vm := makeVM("", v1alpha2.BlockDeviceSpecRef{Kind: v1alpha2.DiskDevice, Name: "disk1"})
212212
v := makeValidator(vm)
213213
_, err := v.ValidateCreate(testutil.ContextBackgroundWithNoOpLogger(), vm)
214214
Expect(err).ShouldNot(HaveOccurred())

0 commit comments

Comments
 (0)