Test updates due to PodInfo rename

shmuelk · shmuelk · commit bebed8d191e1 · 2025-12-01T18:01:21.000+02:00
Signed-off-by: Shmuel Kallner &lt;kallner@il.ibm.com&gt;
diff --git a/pkg/epp/backend/metrics/fake.go b/pkg/epp/backend/metrics/fake.go
@@ -38,18 +38,18 @@ type FakePodMetrics struct {
 }
 
 func (fpm *FakePodMetrics) String() string {
-	return fmt.Sprintf("Pod: %v; Metrics: %v", fpm.GetPod(), fpm.GetMetrics())
+	return fmt.Sprintf("Pod: %v; Metrics: %v", fpm.GetMetadata(), fpm.GetMetrics())
 }
 
-func (fpm *FakePodMetrics) GetPod() *backend.Pod {
+func (fpm *FakePodMetrics) GetMetadata() *backend.Pod {
 	return fpm.Pod
 }
 
 func (fpm *FakePodMetrics) GetMetrics() *MetricsState {
 	return fpm.Metrics
 }
 
-func (fpm *FakePodMetrics) UpdatePod(pod *datalayer.PodInfo) {
+func (fpm *FakePodMetrics) UpdateMetadata(pod *datalayer.EndpointMetadata) {
 	fpm.Pod = pod
 }
 func (fpm *FakePodMetrics) GetAttributes() *datalayer.Attributes {
diff --git a/pkg/epp/backend/metrics/pod_metrics_test.go b/pkg/epp/backend/metrics/pod_metrics_test.go
@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	pod1Info = &datalayer.PodInfo{
+	pod1Info = &datalayer.EndpointMetadata{
 		NamespacedName: types.NamespacedName{
 			Name:      "pod1-rank-0",
 			Namespace: "default",
diff --git a/pkg/epp/controller/inferencepool_reconciler_test.go b/pkg/epp/controller/inferencepool_reconciler_test.go
@@ -123,7 +123,7 @@ func TestInferencePoolReconciler(t *testing.T) {
 		t.Errorf("Unexpected InferencePool reconcile error: %v", err)
 	}
 	endpointPool1 := pool.InferencePoolToEndpointPool(pool1)
-	if diff := diffStore(ds, diffStoreParams{wantPool: endpointPool1, wantPods: []string{"pod1-rank-0", "pod2-rank-0"}}); diff != "" {
+	if diff := diffStore(ds, diffStoreParams{wantPool: endpointPool1, wantEndpoints: []string{"pod1-rank-0", "pod2-rank-0"}}); diff != "" {
 		t.Errorf("Unexpected diff (+got/-want): %s", diff)
 	}
 
@@ -141,7 +141,7 @@ func TestInferencePoolReconciler(t *testing.T) {
 		t.Errorf("Unexpected InferencePool reconcile error: %v", err)
 	}
 	newEndpointPool1 := pool.InferencePoolToEndpointPool(newPool1)
-	if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantPods: []string{"pod5-rank-0"}}); diff != "" {
+	if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantEndpoints: []string{"pod5-rank-0"}}); diff != "" {
 		t.Errorf("Unexpected diff (+got/-want): %s", diff)
 	}
 
@@ -157,7 +157,7 @@ func TestInferencePoolReconciler(t *testing.T) {
 		t.Errorf("Unexpected InferencePool reconcile error: %v", err)
 	}
 	newEndpointPool1 = pool.InferencePoolToEndpointPool(newPool1)
-	if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantPods: []string{"pod5-rank-0"}}); diff != "" {
+	if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantEndpoints: []string{"pod5-rank-0"}}); diff != "" {
 		t.Errorf("Unexpected diff (+got/-want): %s", diff)
 	}
 
@@ -171,14 +171,14 @@ func TestInferencePoolReconciler(t *testing.T) {
 	if _, err := inferencePoolReconciler.Reconcile(ctx, req); err != nil {
 		t.Errorf("Unexpected InferencePool reconcile error: %v", err)
 	}
-	if diff := diffStore(ds, diffStoreParams{wantPods: []string{}}); diff != "" {
+	if diff := diffStore(ds, diffStoreParams{wantEndpoints: []string{}}); diff != "" {
 		t.Errorf("Unexpected diff (+got/-want): %s", diff)
 	}
 }
 
 type diffStoreParams struct {
 	wantPool       *datalayer.EndpointPool
-	wantPods       []string
+	wantEndpoints  []string
 	wantObjectives []*v1alpha2.InferenceObjective
 }
 
@@ -189,15 +189,15 @@ func diffStore(datastore datastore.Datastore, params diffStoreParams) string {
 	}
 
 	// Default wantPods if not set because PodGetAll returns an empty slice when empty.
-	if params.wantPods == nil {
-		params.wantPods = []string{}
+	if params.wantEndpoints == nil {
+		params.wantEndpoints = []string{}
 	}
-	gotPods := []string{}
-	for _, pm := range datastore.PodList(backendmetrics.AllPodsPredicate) {
-		gotPods = append(gotPods, pm.GetPod().NamespacedName.Name)
+	gotEndpoints := []string{}
+	for _, em := range datastore.PodList(backendmetrics.AllPodsPredicate) {
+		gotEndpoints = append(gotEndpoints, em.GetMetadata().NamespacedName.Name)
 	}
-	if diff := cmp.Diff(params.wantPods, gotPods, cmpopts.SortSlices(func(a, b string) bool { return a < b })); diff != "" {
-		return "pods:" + diff
+	if diff := cmp.Diff(params.wantEndpoints, gotEndpoints, cmpopts.SortSlices(func(a, b string) bool { return a < b })); diff != "" {
+		return "endpoints:" + diff
 	}
 
 	// Default wantModels if not set because ModelGetAll returns an empty slice when empty.
@@ -343,8 +343,8 @@ func xDiffStore(datastore datastore.Datastore, params xDiffStoreParams) string {
 		params.wantPods = []string{}
 	}
 	gotPods := []string{}
-	for _, pm := range datastore.PodList(backendmetrics.AllPodsPredicate) {
-		gotPods = append(gotPods, pm.GetPod().NamespacedName.Name)
+	for _, em := range datastore.PodList(backendmetrics.AllPodsPredicate) {
+		gotPods = append(gotPods, em.GetMetadata().NamespacedName.Name)
 	}
 	if diff := cmp.Diff(params.wantPods, gotPods, cmpopts.SortSlices(func(a, b string) bool { return a < b })); diff != "" {
 		return "pods:" + diff
diff --git a/pkg/epp/controller/pod_reconciler_test.go b/pkg/epp/controller/pod_reconciler_test.go
@@ -213,8 +213,8 @@ func TestPodReconciler(t *testing.T) {
 			}
 
 			var gotPods []*corev1.Pod
-			for _, pm := range store.PodList(backendmetrics.AllPodsPredicate) {
-				pod := &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: pm.GetPod().PodName, Namespace: pm.GetPod().NamespacedName.Namespace}, Status: corev1.PodStatus{PodIP: pm.GetPod().GetIPAddress()}}
+			for _, em := range store.PodList(backendmetrics.AllPodsPredicate) {
+				pod := &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: em.GetMetadata().PodName, Namespace: em.GetMetadata().NamespacedName.Namespace}, Status: corev1.PodStatus{PodIP: em.GetMetadata().GetIPAddress()}}
 				gotPods = append(gotPods, pod)
 			}
 			if !cmp.Equal(gotPods, test.wantPods, cmpopts.SortSlices(func(a, b *corev1.Pod) bool { return a.Name < b.Name })) {
diff --git a/pkg/epp/datalayer/collector_test.go b/pkg/epp/datalayer/collector_test.go
@@ -54,14 +54,14 @@ func (d *DummySource) Collect(ctx context.Context, ep Endpoint) error {
 }
 
 func defaultEndpoint() Endpoint {
-	pod := &PodInfo{
+	meta := &EndpointMetadata{
 		NamespacedName: types.NamespacedName{
 			Name:      "pod-name",
 			Namespace: "default",
 		},
 		Address: "1.2.3.4:5678",
 	}
-	ms := NewEndpoint(pod, nil)
+	ms := NewEndpoint(meta, nil)
 	return ms
 }
 
diff --git a/pkg/epp/datastore/datastore_test.go b/pkg/epp/datastore/datastore_test.go
@@ -408,7 +408,7 @@ func TestPods(t *testing.T) {
 			test.op(ctx, ds)
 			var gotPods []*corev1.Pod
 			for _, pm := range ds.PodList(backendmetrics.AllPodsPredicate) {
-				pod := &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: pm.GetPod().PodName, Namespace: pm.GetPod().NamespacedName.Namespace}, Status: corev1.PodStatus{PodIP: pm.GetPod().GetIPAddress()}}
+				pod := &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: pm.GetMetadata().PodName, Namespace: pm.GetMetadata().NamespacedName.Namespace}, Status: corev1.PodStatus{PodIP: pm.GetMetadata().GetIPAddress()}}
 				gotPods = append(gotPods, pod)
 			}
 			if !cmp.Equal(gotPods, test.wantPods, cmpopts.SortSlices(func(a, b *corev1.Pod) bool { return a.Name < b.Name })) {
@@ -420,16 +420,16 @@ func TestPods(t *testing.T) {
 
 func TestPodInfo(t *testing.T) {
 	tests := []struct {
-		name         string
-		op           func(ctx context.Context, ds Datastore)
-		pool         *v1.InferencePool
-		existingPods []*corev1.Pod
-		wantPodInfos []*datalayer.PodInfo
+		name              string
+		op                func(ctx context.Context, ds Datastore)
+		pool              *v1.InferencePool
+		existingPods      []*corev1.Pod
+		wantEndpointMetas []*datalayer.EndpointMetadata
 	}{
 		{
 			name:         "Add new pod, no existing pods, should add",
 			existingPods: []*corev1.Pod{},
-			wantPodInfos: []*datalayer.PodInfo{
+			wantEndpointMetas: []*datalayer.EndpointMetadata{
 				{
 					NamespacedName: types.NamespacedName{
 						Name:      pod1.Name + "-rank-0",
@@ -451,7 +451,7 @@ func TestPodInfo(t *testing.T) {
 		{
 			name:         "Add new pod, no existing pods, should add, multiple target ports",
 			existingPods: []*corev1.Pod{},
-			wantPodInfos: []*datalayer.PodInfo{
+			wantEndpointMetas: []*datalayer.EndpointMetadata{
 				{
 					NamespacedName: types.NamespacedName{
 						Name:      pod1.Name + "-rank-0",
@@ -485,7 +485,7 @@ func TestPodInfo(t *testing.T) {
 		{
 			name:         "Add new pod, with existing pods, should add, multiple target ports",
 			existingPods: []*corev1.Pod{pod1},
-			wantPodInfos: []*datalayer.PodInfo{
+			wantEndpointMetas: []*datalayer.EndpointMetadata{
 				{
 					NamespacedName: types.NamespacedName{
 						Name:      pod1.Name + "-rank-0",
@@ -543,7 +543,7 @@ func TestPodInfo(t *testing.T) {
 		{
 			name:         "Delete the pod, multiple target ports",
 			existingPods: []*corev1.Pod{pod1, pod2},
-			wantPodInfos: []*datalayer.PodInfo{
+			wantEndpointMetas: []*datalayer.EndpointMetadata{
 				{
 					NamespacedName: types.NamespacedName{
 						Name:      pod1.Name + "-rank-0",
@@ -590,11 +590,11 @@ func TestPodInfo(t *testing.T) {
 			}
 
 			test.op(ctx, ds)
-			var gotPodInfos []*datalayer.PodInfo
+			var gotEndpointMetas []*datalayer.EndpointMetadata
 			for _, pm := range ds.PodList(backendmetrics.AllPodsPredicate) {
-				gotPodInfos = append(gotPodInfos, pm.GetPod())
+				gotEndpointMetas = append(gotEndpointMetas, pm.GetMetadata())
 			}
-			if diff := cmp.Diff(test.wantPodInfos, gotPodInfos, cmpopts.SortSlices(func(a, b *datalayer.PodInfo) bool { return a.NamespacedName.Name < b.NamespacedName.Name })); diff != "" {
+			if diff := cmp.Diff(test.wantEndpointMetas, gotEndpointMetas, cmpopts.SortSlices(func(a, b *datalayer.EndpointMetadata) bool { return a.NamespacedName.Name < b.NamespacedName.Name })); diff != "" {
 				t.Errorf("ConvertTo() mismatch (-want +got):\n%s", diff)
 			}
 		})
diff --git a/pkg/epp/requestcontrol/director_test.go b/pkg/epp/requestcontrol/director_test.go
@@ -784,7 +784,7 @@ func TestGetCandidatePodsForScheduling(t *testing.T) {
 			got := director.getCandidatePodsForScheduling(context.Background(), test.metadata)
 
 			diff := cmp.Diff(test.output, got, cmpopts.SortSlices(func(a, b backendmetrics.PodMetrics) bool {
-				return a.GetPod().NamespacedName.String() < b.GetPod().NamespacedName.String()
+				return a.GetMetadata().NamespacedName.String() < b.GetMetadata().NamespacedName.String()
 			}))
 			if diff != "" {
 				t.Errorf("Unexpected output (-want +got): %v", diff)

Original file line number	Diff line number	Diff line change
`@@ -38,18 +38,18 @@ type FakePodMetrics struct {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`func (fpm *FakePodMetrics) String() string {`
`41`		`- return fmt.Sprintf("Pod: %v; Metrics: %v", fpm.GetPod(), fpm.GetMetrics())`
	`41`	`+ return fmt.Sprintf("Pod: %v; Metrics: %v", fpm.GetMetadata(), fpm.GetMetrics())`
`42`	`42`	`}`
`43`	`43`
`44`		`-func (fpm FakePodMetrics) GetPod() backend.Pod {`
	`44`	`+func (fpm FakePodMetrics) GetMetadata() backend.Pod {`
`45`	`45`	`return fpm.Pod`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func (fpm FakePodMetrics) GetMetrics() MetricsState {`
`49`	`49`	`return fpm.Metrics`
`50`	`50`	`}`
`51`	`51`
`52`		`-func (fpm FakePodMetrics) UpdatePod(pod datalayer.PodInfo) {`
	`52`	`+func (fpm FakePodMetrics) UpdateMetadata(pod datalayer.EndpointMetadata) {`
`53`	`53`	`fpm.Pod = pod`
`54`	`54`	`}`
`55`	`55`	`func (fpm FakePodMetrics) GetAttributes() datalayer.Attributes {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`var (`
`32`		`- pod1Info = &datalayer.PodInfo{`
	`32`	`+ pod1Info = &datalayer.EndpointMetadata{`
`33`	`33`	`NamespacedName: types.NamespacedName{`
`34`	`34`	`Name: "pod1-rank-0",`
`35`	`35`	`Namespace: "default",`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ func TestInferencePoolReconciler(t *testing.T) {`
`123`	`123`	`t.Errorf("Unexpected InferencePool reconcile error: %v", err)`
`124`	`124`	`}`
`125`	`125`	`endpointPool1 := pool.InferencePoolToEndpointPool(pool1)`
`126`		`- if diff := diffStore(ds, diffStoreParams{wantPool: endpointPool1, wantPods: []string{"pod1-rank-0", "pod2-rank-0"}}); diff != "" {`
	`126`	`+ if diff := diffStore(ds, diffStoreParams{wantPool: endpointPool1, wantEndpoints: []string{"pod1-rank-0", "pod2-rank-0"}}); diff != "" {`
`127`	`127`	`t.Errorf("Unexpected diff (+got/-want): %s", diff)`
`128`	`128`	`}`
`129`	`129`
`@@ -141,7 +141,7 @@ func TestInferencePoolReconciler(t *testing.T) {`
`141`	`141`	`t.Errorf("Unexpected InferencePool reconcile error: %v", err)`
`142`	`142`	`}`
`143`	`143`	`newEndpointPool1 := pool.InferencePoolToEndpointPool(newPool1)`
`144`		`- if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantPods: []string{"pod5-rank-0"}}); diff != "" {`
	`144`	`+ if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantEndpoints: []string{"pod5-rank-0"}}); diff != "" {`
`145`	`145`	`t.Errorf("Unexpected diff (+got/-want): %s", diff)`
`146`	`146`	`}`
`147`	`147`
`@@ -157,7 +157,7 @@ func TestInferencePoolReconciler(t *testing.T) {`
`157`	`157`	`t.Errorf("Unexpected InferencePool reconcile error: %v", err)`
`158`	`158`	`}`
`159`	`159`	`newEndpointPool1 = pool.InferencePoolToEndpointPool(newPool1)`
`160`		`- if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantPods: []string{"pod5-rank-0"}}); diff != "" {`
	`160`	`+ if diff := diffStore(ds, diffStoreParams{wantPool: newEndpointPool1, wantEndpoints: []string{"pod5-rank-0"}}); diff != "" {`
`161`	`161`	`t.Errorf("Unexpected diff (+got/-want): %s", diff)`
`162`	`162`	`}`
`163`	`163`
`@@ -171,14 +171,14 @@ func TestInferencePoolReconciler(t *testing.T) {`
`171`	`171`	`if _, err := inferencePoolReconciler.Reconcile(ctx, req); err != nil {`
`172`	`172`	`t.Errorf("Unexpected InferencePool reconcile error: %v", err)`
`173`	`173`	`}`
`174`		`- if diff := diffStore(ds, diffStoreParams{wantPods: []string{}}); diff != "" {`
	`174`	`+ if diff := diffStore(ds, diffStoreParams{wantEndpoints: []string{}}); diff != "" {`
`175`	`175`	`t.Errorf("Unexpected diff (+got/-want): %s", diff)`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`type diffStoreParams struct {`
`180`	`180`	`wantPool *datalayer.EndpointPool`
`181`		`- wantPods []string`
	`181`	`+ wantEndpoints []string`
`182`	`182`	`wantObjectives []*v1alpha2.InferenceObjective`
`183`	`183`	`}`
`184`	`184`
`@@ -189,15 +189,15 @@ func diffStore(datastore datastore.Datastore, params diffStoreParams) string {`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`// Default wantPods if not set because PodGetAll returns an empty slice when empty.`
`192`		`- if params.wantPods == nil {`
`193`		`- params.wantPods = []string{}`
	`192`	`+ if params.wantEndpoints == nil {`
	`193`	`+ params.wantEndpoints = []string{}`
`194`	`194`	`}`
`195`		`- gotPods := []string{}`
`196`		`- for _, pm := range datastore.PodList(backendmetrics.AllPodsPredicate) {`
`197`		`- gotPods = append(gotPods, pm.GetPod().NamespacedName.Name)`
	`195`	`+ gotEndpoints := []string{}`
	`196`	`+ for _, em := range datastore.PodList(backendmetrics.AllPodsPredicate) {`
	`197`	`+ gotEndpoints = append(gotEndpoints, em.GetMetadata().NamespacedName.Name)`
`198`	`198`	`}`
`199`		`- if diff := cmp.Diff(params.wantPods, gotPods, cmpopts.SortSlices(func(a, b string) bool { return a < b })); diff != "" {`
`200`		`- return "pods:" + diff`
	`199`	`+ if diff := cmp.Diff(params.wantEndpoints, gotEndpoints, cmpopts.SortSlices(func(a, b string) bool { return a < b })); diff != "" {`
	`200`	`+ return "endpoints:" + diff`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// Default wantModels if not set because ModelGetAll returns an empty slice when empty.`
`@@ -343,8 +343,8 @@ func xDiffStore(datastore datastore.Datastore, params xDiffStoreParams) string {`
`343`	`343`	`params.wantPods = []string{}`
`344`	`344`	`}`
`345`	`345`	`gotPods := []string{}`
`346`		`- for _, pm := range datastore.PodList(backendmetrics.AllPodsPredicate) {`
`347`		`- gotPods = append(gotPods, pm.GetPod().NamespacedName.Name)`
	`346`	`+ for _, em := range datastore.PodList(backendmetrics.AllPodsPredicate) {`
	`347`	`+ gotPods = append(gotPods, em.GetMetadata().NamespacedName.Name)`
`348`	`348`	`}`
`349`	`349`	`if diff := cmp.Diff(params.wantPods, gotPods, cmpopts.SortSlices(func(a, b string) bool { return a < b })); diff != "" {`
`350`	`350`	`return "pods:" + diff`
Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,8 @@ func TestPodReconciler(t *testing.T) {`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`var gotPods []*corev1.Pod`
`216`		`- for _, pm := range store.PodList(backendmetrics.AllPodsPredicate) {`
`217`		`- pod := &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: pm.GetPod().PodName, Namespace: pm.GetPod().NamespacedName.Namespace}, Status: corev1.PodStatus{PodIP: pm.GetPod().GetIPAddress()}}`
	`216`	`+ for _, em := range store.PodList(backendmetrics.AllPodsPredicate) {`
	`217`	`+ pod := &corev1.Pod{ObjectMeta: metav1.ObjectMeta{Name: em.GetMetadata().PodName, Namespace: em.GetMetadata().NamespacedName.Namespace}, Status: corev1.PodStatus{PodIP: em.GetMetadata().GetIPAddress()}}`
`218`	`218`	`gotPods = append(gotPods, pod)`
`219`	`219`	`}`
`220`	`220`	`if !cmp.Equal(gotPods, test.wantPods, cmpopts.SortSlices(func(a, b *corev1.Pod) bool { return a.Name < b.Name })) {`
Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,14 @@ func (d *DummySource) Collect(ctx context.Context, ep Endpoint) error {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func defaultEndpoint() Endpoint {`
`57`		`- pod := &PodInfo{`
	`57`	`+ meta := &EndpointMetadata{`
`58`	`58`	`NamespacedName: types.NamespacedName{`
`59`	`59`	`Name: "pod-name",`
`60`	`60`	`Namespace: "default",`
`61`	`61`	`},`
`62`	`62`	`Address: "1.2.3.4:5678",`
`63`	`63`	`}`
`64`		`- ms := NewEndpoint(pod, nil)`
	`64`	`+ ms := NewEndpoint(meta, nil)`
`65`	`65`	`return ms`
`66`	`66`	`}`
`67`	`67`