Skip to content

Commit 4b41863

Browse files
committed
fix(tests): .ovn at end of expected IP CRs
Signed-off-by: SkalaNetworks <contact@skala.network>
1 parent da38113 commit 4b41863

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

pkg/plugin/vm_backup_item_action_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func TestExecute(t *testing.T) {
189189
existingIPs: []*v1.IP{
190190
{
191191
ObjectMeta: metav1.ObjectMeta{
192-
Name: "test-vm.test-ns.nad1.test-ns",
192+
Name: "test-vm.test-ns.nad1.test-ns.ovn",
193193
},
194194
Spec: v1.IPSpec{
195195
V4IPAddress: "10.0.0.11",
@@ -198,7 +198,7 @@ func TestExecute(t *testing.T) {
198198
},
199199
{
200200
ObjectMeta: metav1.ObjectMeta{
201-
Name: "test-vm.test-ns.nad2.test-ns",
201+
Name: "test-vm.test-ns.nad2.test-ns.ovn",
202202
},
203203
Spec: v1.IPSpec{
204204
V4IPAddress: "10.0.0.22",
@@ -258,7 +258,7 @@ func TestExecute(t *testing.T) {
258258
existingIPs: []*v1.IP{
259259
{
260260
ObjectMeta: metav1.ObjectMeta{
261-
Name: "test-vm.test-ns.nad-primary.test-ns",
261+
Name: "test-vm.test-ns.nad-primary.test-ns.ovn",
262262
},
263263
Spec: v1.IPSpec{
264264
V4IPAddress: "10.0.0.33",
@@ -313,7 +313,7 @@ func TestExecute(t *testing.T) {
313313
},
314314
{
315315
ObjectMeta: metav1.ObjectMeta{
316-
Name: "test-vm.test-ns.nad-secondary.test-ns",
316+
Name: "test-vm.test-ns.nad-secondary.test-ns.ovn",
317317
},
318318
Spec: v1.IPSpec{
319319
V4IPAddress: "10.0.0.44",

pkg/util/kubevirt_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ func TestGetIPsForVM(t *testing.T) {
114114
},
115115
{
116116
ObjectMeta: metav1.ObjectMeta{
117-
Name: "test-vm.test-ns.test-nad.test-ns",
117+
Name: "test-vm.test-ns.test-nad.test-ns.ovn",
118118
},
119119
},
120120
},
121-
wantIPNames: []string{"test-vm.test-ns.test-nad.test-ns", "test-vm.test-ns"},
121+
wantIPNames: []string{"test-vm.test-ns.test-nad.test-ns.ovn", "test-vm.test-ns"},
122122
wantNads: []string{"test-nad.test-ns.ovn.kubernetes.io", defaultNetworkAnnotation},
123123
wantErr: false,
124124
},
@@ -150,11 +150,11 @@ func TestGetIPsForVM(t *testing.T) {
150150
existingIPs: []*kubeovnv1.IP{
151151
{
152152
ObjectMeta: metav1.ObjectMeta{
153-
Name: "test-vm.test-ns.test-nad.test-ns",
153+
Name: "test-vm.test-ns.test-nad.test-ns.ovn",
154154
},
155155
},
156156
},
157-
wantIPNames: []string{"test-vm.test-ns.test-nad.test-ns"},
157+
wantIPNames: []string{"test-vm.test-ns.test-nad.test-ns.ovn"},
158158
wantNads: []string{"test-nad.test-ns.ovn.kubernetes.io"},
159159
wantErr: false,
160160
},
@@ -193,12 +193,12 @@ func TestGetIPsForVM(t *testing.T) {
193193
existingIPs: []*kubeovnv1.IP{
194194
{
195195
ObjectMeta: metav1.ObjectMeta{
196-
Name: "test-vm.test-ns.nad1.test-ns",
196+
Name: "test-vm.test-ns.nad1.test-ns.ovn",
197197
},
198198
},
199199
{
200200
ObjectMeta: metav1.ObjectMeta{
201-
Name: "test-vm.test-ns.nad2.test-ns",
201+
Name: "test-vm.test-ns.nad2.test-ns.ovn",
202202
},
203203
},
204204
{
@@ -207,7 +207,7 @@ func TestGetIPsForVM(t *testing.T) {
207207
},
208208
},
209209
},
210-
wantIPNames: []string{"test-vm.test-ns.nad1.test-ns", "test-vm.test-ns.nad2.test-ns", "test-vm.test-ns"},
210+
wantIPNames: []string{"test-vm.test-ns.nad1.test-ns.ovn", "test-vm.test-ns.nad2.test-ns.ovn", "test-vm.test-ns"},
211211
wantNads: []string{
212212
"nad1.test-ns.ovn.kubernetes.io",
213213
"nad2.test-ns.ovn.kubernetes.io",
@@ -243,11 +243,11 @@ func TestGetIPsForVM(t *testing.T) {
243243
existingIPs: []*kubeovnv1.IP{
244244
{
245245
ObjectMeta: metav1.ObjectMeta{
246-
Name: "test-vm.test-ns.nad-primary.test-ns",
246+
Name: "test-vm.test-ns.nad-primary.test-ns.ovn",
247247
},
248248
},
249249
},
250-
wantIPNames: []string{"test-vm.test-ns.nad-primary.test-ns"},
250+
wantIPNames: []string{"test-vm.test-ns.nad-primary.test-ns.ovn"},
251251
wantNads: []string{"nad-primary.test-ns.ovn.kubernetes.io"},
252252
wantErr: false,
253253
},
@@ -283,11 +283,11 @@ func TestGetIPsForVM(t *testing.T) {
283283
},
284284
{
285285
ObjectMeta: metav1.ObjectMeta{
286-
Name: "test-vm.test-ns.nad-secondary.test-ns",
286+
Name: "test-vm.test-ns.nad-secondary.test-ns.ovn",
287287
},
288288
},
289289
},
290-
wantIPNames: []string{"test-vm.test-ns.nad-secondary.test-ns", "test-vm.test-ns"},
290+
wantIPNames: []string{"test-vm.test-ns.nad-secondary.test-ns.ovn", "test-vm.test-ns"},
291291
wantNads: []string{"nad-secondary.test-ns.ovn.kubernetes.io", defaultNetworkAnnotation},
292292
wantErr: false,
293293
},
@@ -450,7 +450,7 @@ func TestGetNetInfoForVm(t *testing.T) {
450450
existingIPs: []*kubeovnv1.IP{
451451
{
452452
ObjectMeta: metav1.ObjectMeta{
453-
Name: "test-vm.test-ns.test-nad.test-ns",
453+
Name: "test-vm.test-ns.test-nad.test-ns.ovn",
454454
},
455455
Spec: kubeovnv1.IPSpec{
456456
V4IPAddress: "192.168.1.1",
@@ -620,7 +620,7 @@ func TestGetKubeovnAnnotationsForVM(t *testing.T) {
620620
},
621621
{
622622
ObjectMeta: metav1.ObjectMeta{
623-
Name: "test-vm.test-ns.test-nad.test-ns",
623+
Name: "test-vm.test-ns.test-nad.test-ns.ovn",
624624
},
625625
Spec: kubeovnv1.IPSpec{
626626
V4IPAddress: "10.0.0.2",

0 commit comments

Comments
 (0)