address requested changes

Signed-off-by: sakshi-1505 <[email protected]>
kubernetes · Oct 16, 2023 · 6b64ce3 · 6b64ce3
1 parent 911e7eb
commit 6b64ce3
Showing 1 changed file with 30 additions and 18 deletions.
diff --git a/pkg/openstack/loadbalancer_test.go b/pkg/openstack/loadbalancer_test.go
@@ -536,9 +536,6 @@ func Test_getListenerProtocol(t *testing.T) {
 }
 
 func TestLbaasV2_checkListenerPorts(t *testing.T) {
-	type fields struct {
-		LoadBalancer LoadBalancer
-	}
 	type args struct {
 		service            *corev1.Service
 		curListenerMapping map[listenerKey]*listeners.Listener
@@ -547,7 +544,6 @@ func TestLbaasV2_checkListenerPorts(t *testing.T) {
 	}
 	tests := []struct {
 		name    string
-		fields  fields
 		args    args
 		wantErr bool
 	}{
@@ -571,16 +567,13 @@ func TestLbaasV2_checkListenerPorts(t *testing.T) {
 						Port:     9090,
 					}: {
 						ID:   "listenerid",
-						Tags: []string{"test-lb", "test-lb2"},
+						Tags: []string{"test-lb"},
 					},
 				},
 				isLBOwner: false,
 				lbName:    "test-lb",
 			},
 			wantErr: false,
-			fields: fields{
-				LoadBalancer: LoadBalancer{},
-			},
 		},
 		{
 			name: "error is thrown if loadbalancer doesn't matches & if port is already in use by a service",
@@ -609,9 +602,6 @@ func TestLbaasV2_checkListenerPorts(t *testing.T) {
 				lbName:    "test-lb2",
 			},
 			wantErr: true,
-			fields: fields{
-				LoadBalancer: LoadBalancer{},
-			},
 		},
 		{
 			name: "error is not thrown if lbOwner is present & no tags on service",
@@ -639,9 +629,34 @@ func TestLbaasV2_checkListenerPorts(t *testing.T) {
 				lbName:    "test-lb",
 			},
 			wantErr: false,
-			fields: fields{
-				LoadBalancer: LoadBalancer{},
+		},
+		{
+			name: "error is not thrown if lbOwner is true & there are tags on service",
+			args: args{
+				service: &corev1.Service{
+					Spec: corev1.ServiceSpec{
+						Ports: []corev1.ServicePort{
+							{
+								Name:     "service",
+								Protocol: "http",
+								Port:     9091,
+							},
+						},
+					},
+				},
+				curListenerMapping: map[listenerKey]*listeners.Listener{
+					{
+						Protocol: "https",
+						Port:     9090,
+					}: {
+						ID:   "listenerid",
+						Tags: []string{"test-lb"},
+					},
+				},
+				isLBOwner: true,
+				lbName:    "test-lb",
 			},
+			wantErr: false,
 		},
 		{
 			name: "error is not thrown if listener key doesn't match port & protocol",
@@ -663,22 +678,19 @@ func TestLbaasV2_checkListenerPorts(t *testing.T) {
 						Port:     9090,
 					}: {
 						ID:   "listenerid",
-						Tags: []string{"test-lb", "test-lb-1"},
+						Tags: []string{"test-lb"},
 					},
 				},
 				isLBOwner: false,
 				lbName:    "test-lb",
 			},
 			wantErr: false,
-			fields: fields{
-				LoadBalancer: LoadBalancer{},
-			},
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			lbaas := &LbaasV2{
-				LoadBalancer: tt.fields.LoadBalancer,
+				LoadBalancer: LoadBalancer{},
 			}
 			err := lbaas.checkListenerPorts(tt.args.service, tt.args.curListenerMapping, tt.args.isLBOwner, tt.args.lbName)
 			if tt.wantErr == true {