Refactor availability zone label handling in ResourceRouter and update tests

Author: SoWieMarkus

pkg/multicluster/routers.go

@@ -30,15 +30,15 @@ func (h HypervisorResourceRouter) Match(obj any, labels map[string]string) (bool
 	default:
 		return false, errors.New("object is not a Hypervisor")
 	}
-	az, ok := labels["az"]
+	availabilityZone, ok := labels["availability_zone"]
 	if !ok {
 		return false, errors.New("cluster does not have availability zone label")
 	}
-	hvAZ, ok := hv.Labels[corev1.LabelTopologyZone]
+	hvAvailabilityZone, ok := hv.Labels[corev1.LabelTopologyZone]
 	if !ok {
 		return false, errors.New("hypervisor does not have availability zone label")
 	}
-	return hvAZ == az, nil
+	return hvAvailabilityZone == availabilityZone, nil
 }
 
 // ReservationsResourceRouter routes reservations to clusters based on availability zone.
@@ -54,15 +54,15 @@ func (r ReservationsResourceRouter) Match(obj any, labels map[string]string) (bo
 	default:
 		return false, errors.New("object is not a Reservation")
 	}
-	az, ok := labels["az"]
+	availabilityZone, ok := labels["availability_zone"]
 	if !ok {
-		return false, errors.New("cluster does not have availability zone label")
+		return false, errors.New("cluster does not have availability zone in spec")
 	}
-	resAZ := res.Spec.AvailabilityZone
-	if resAZ == "" {
-		return false, errors.New("reservation does not have availability zone label")
+	reservationAvailabilityZone := res.Spec.AvailabilityZone
+	if reservationAvailabilityZone == "" {
+		return false, errors.New("reservation does not have availability zone in spec")
 	}
-	return resAZ == az, nil
+	return reservationAvailabilityZone == availabilityZone, nil
 }
 
 // TODO: Add router for Decision CRD and reservations after their refactoring is done.

pkg/multicluster/routers_test.go

@@ -28,7 +28,7 @@ func TestHypervisorResourceRouter_Match(t *testing.T) {
 					Labels: map[string]string{"topology.kubernetes.io/zone": "qa-de-1a"},
 				},
 			},
-			labels:    map[string]string{"az": "qa-de-1a"},
+			labels:    map[string]string{"availability_zone": "qa-de-1a"},
 			wantMatch: true,
 		},
 		{
@@ -38,7 +38,7 @@ func TestHypervisorResourceRouter_Match(t *testing.T) {
 					Labels: map[string]string{"topology.kubernetes.io/zone": "qa-de-1a"},
 				},
 			},
-			labels:    map[string]string{"az": "qa-de-1a"},
+			labels:    map[string]string{"availability_zone": "qa-de-1a"},
 			wantMatch: true,
 		},
 		{
@@ -48,17 +48,17 @@ func TestHypervisorResourceRouter_Match(t *testing.T) {
 					Labels: map[string]string{"topology.kubernetes.io/zone": "qa-de-1a"},
 				},
 			},
-			labels:    map[string]string{"az": "qa-de-1b"},
+			labels:    map[string]string{"availability_zone": "qa-de-1b"},
 			wantMatch: false,
 		},
 		{
 			name:    "not a Hypervisor",
 			obj:     "not-a-hypervisor",
-			labels:  map[string]string{"az": "qa-de-1a"},
+			labels:  map[string]string{"availability_zone": "qa-de-1a"},
 			wantErr: true,
 		},
 		{
-			name: "cluster missing az label",
+			name: "cluster missing availability_zone label",
 			obj: hv1.Hypervisor{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{"topology.kubernetes.io/zone": "qa-de-1a"},
@@ -74,7 +74,13 @@ func TestHypervisorResourceRouter_Match(t *testing.T) {
 					Labels: map[string]string{},
 				},
 			},
-			labels:  map[string]string{"az": "qa-de-1a"},
+			labels:  map[string]string{"availability_zone": "qa-de-1a"},
+			wantErr: true,
+		},
+		{
+			name:    "nil pointer doesn't dereference",
+			obj:     nil,
+			labels:  map[string]string{"availability_zone": "qa-de-1a"},
 			wantErr: true,
 		},
 	}
@@ -112,7 +118,7 @@ func TestReservationsResourceRouter_Match(t *testing.T) {
 					AvailabilityZone: "qa-de-1a",
 				},
 			},
-			labels:    map[string]string{"az": "qa-de-1a"},
+			labels:    map[string]string{"availability_zone": "qa-de-1a"},
 			wantMatch: true,
 		},
 		{
@@ -122,7 +128,7 @@ func TestReservationsResourceRouter_Match(t *testing.T) {
 					AvailabilityZone: "qa-de-1a",
 				},
 			},
-			labels:    map[string]string{"az": "qa-de-1a"},
+			labels:    map[string]string{"availability_zone": "qa-de-1a"},
 			wantMatch: true,
 		},
 		{
@@ -132,17 +138,17 @@ func TestReservationsResourceRouter_Match(t *testing.T) {
 					AvailabilityZone: "qa-de-1a",
 				},
 			},
-			labels:    map[string]string{"az": "qa-de-1b"},
+			labels:    map[string]string{"availability_zone": "qa-de-1b"},
 			wantMatch: false,
 		},
 		{
 			name:    "not a Reservation",
 			obj:     "not-a-reservation",
-			labels:  map[string]string{"az": "qa-de-1a"},
+			labels:  map[string]string{"availability_zone": "qa-de-1a"},
 			wantErr: true,
 		},
 		{
-			name: "cluster missing az label",
+			name: "cluster missing availability_zone label",
 			obj: v1alpha1.Reservation{
 				Spec: v1alpha1.ReservationSpec{
 					AvailabilityZone: "qa-de-1a",
@@ -158,7 +164,13 @@ func TestReservationsResourceRouter_Match(t *testing.T) {
 					AvailabilityZone: "",
 				},
 			},
-			labels:  map[string]string{"az": "qa-de-1a"},
+			labels:  map[string]string{"availability_zone": "qa-de-1a"},
+			wantErr: true,
+		},
+		{
+			name:    "nil pointer doesn't dereference",
+			obj:     nil,
+			labels:  map[string]string{"availability_zone": "qa-de-1a"},
 			wantErr: true,
 		},
 	}