From 55c6a498273647cfa32e3ed5568576dcc796ff23 Mon Sep 17 00:00:00 2001 From: Qyanger Date: Fri, 7 Mar 2025 12:04:51 +0800 Subject: [PATCH 1/2] Add Notation to TestTransformWorkers in pkg/ddc/alluxio/transform_test.go. Signed-off-by: Qyanger --- pkg/ddc/alluxio/transform_test.go | 124 ++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/pkg/ddc/alluxio/transform_test.go b/pkg/ddc/alluxio/transform_test.go index 4f27550d119..ebbe2241cd1 100755 --- a/pkg/ddc/alluxio/transform_test.go +++ b/pkg/ddc/alluxio/transform_test.go @@ -183,6 +183,130 @@ func TestTransformMaster(t *testing.T) { } } +// TestTransformWorkers verifies that the transformWorkers function correctly transforms +// the worker configuration of AlluxioRuntime into the expected Alluxio structure. +// It tests different network modes, node selectors, and image pull secrets to ensure +// correct transformation behavior. +func TestTransformWorkers(t *testing.T) { + testCases := map[string]struct { + runtime *datav1alpha1.AlluxioRuntime + wantValue *Alluxio + }{ + "test network mode case 1": { + runtime: &datav1alpha1.AlluxioRuntime{ + Spec: datav1alpha1.AlluxioRuntimeSpec{ + Worker: datav1alpha1.AlluxioCompTemplateSpec{ + NetworkMode: datav1alpha1.ContainerNetworkMode, + }, + }, + }, + wantValue: &Alluxio{ + Worker: Worker{ + HostNetwork: false, + }, + }, + }, + "test network mode case 2": { + runtime: &datav1alpha1.AlluxioRuntime{ + Spec: datav1alpha1.AlluxioRuntimeSpec{ + Worker: datav1alpha1.AlluxioCompTemplateSpec{ + NetworkMode: datav1alpha1.HostNetworkMode, + }, + }, + }, + wantValue: &Alluxio{ + Worker: Worker{ + HostNetwork: true, + }, + }, + }, + "test network mode case 3": { + runtime: &datav1alpha1.AlluxioRuntime{ + Spec: datav1alpha1.AlluxioRuntimeSpec{ + Worker: datav1alpha1.AlluxioCompTemplateSpec{ + NetworkMode: datav1alpha1.HostNetworkMode, + }, + TieredStore: datav1alpha1.TieredStore{}, + }, + }, + wantValue: &Alluxio{ + Worker: Worker{ + HostNetwork: true, + }, + }, + }, + "test network mode case 4": { + runtime: &datav1alpha1.AlluxioRuntime{ + Spec: datav1alpha1.AlluxioRuntimeSpec{ + Worker: datav1alpha1.AlluxioCompTemplateSpec{ + NetworkMode: datav1alpha1.HostNetworkMode, + NodeSelector: map[string]string{ + "workerSelector": "true", + }, + }, + TieredStore: datav1alpha1.TieredStore{}, + }, + }, + wantValue: &Alluxio{ + Worker: Worker{ + HostNetwork: true, + NodeSelector: map[string]string{ + "workerSelector": "true", + }, + }, + }, + }, + "test hierarchical imagePullSecrets case1": { + runtime: &datav1alpha1.AlluxioRuntime{ + Spec: datav1alpha1.AlluxioRuntimeSpec{ + Worker: datav1alpha1.AlluxioCompTemplateSpec{ + ImagePullSecrets: []corev1.LocalObjectReference{{Name: "secret-worker"}}, + }, + }, + }, + wantValue: &Alluxio{ + Worker: Worker{ + ImagePullSecrets: []corev1.LocalObjectReference{{Name: "secret-worker"}}, + HostNetwork: true, + }, + }, + }, + } + + engine := &AlluxioEngine{Log: fake.NullLogger()} + for k, v := range testCases { + gotValue := &Alluxio{} + engine.runtimeInfo, _ = base.BuildRuntimeInfo("test", "test", "alluxio", base.WithTieredStore(v.runtime.Spec.TieredStore)) + if err := engine.transformWorkers(v.runtime, gotValue); err == nil { + if gotValue.Worker.HostNetwork != v.wantValue.Worker.HostNetwork { + t.Errorf("check %s failure, got:%t,want:%t", + k, + gotValue.Worker.HostNetwork, + v.wantValue.Worker.HostNetwork, + ) + } + if len(v.wantValue.Worker.NodeSelector) > 0 { + if !reflect.DeepEqual(v.wantValue.Worker.NodeSelector, gotValue.Worker.NodeSelector) { + t.Errorf("check %s failure, got:%v,want:%v", + k, + gotValue.Worker.NodeSelector, + v.wantValue.Worker.NodeSelector, + ) + } + } + if len(v.wantValue.Worker.ImagePullSecrets) > 0 { + if !reflect.DeepEqual(v.wantValue.Worker.ImagePullSecrets, gotValue.Worker.ImagePullSecrets) { + t.Errorf("check %s failure, got:%s,want:%s", + k, + gotValue.Worker.ImagePullSecrets, + v.wantValue.Worker.ImagePullSecrets, + ) + } + } + } + } +} + func TestTransformWorkers(t *testing.T) { testCases := map[string]struct { runtime *datav1alpha1.AlluxioRuntime From 011cdab6087a14ee933caf3b2e634d9c330ecd4b Mon Sep 17 00:00:00 2001 From: Qyanger Date: Fri, 7 Mar 2025 12:37:51 +0800 Subject: [PATCH 2/2] Add Notation to TestTransformWorkers in pkg/ddc/alluxio/transform_test.go. Signed-off-by: Qyanger --- pkg/ddc/alluxio/transform_test.go | 120 ------------------------------ 1 file changed, 120 deletions(-) diff --git a/pkg/ddc/alluxio/transform_test.go b/pkg/ddc/alluxio/transform_test.go index ebbe2241cd1..46788fcd217 100755 --- a/pkg/ddc/alluxio/transform_test.go +++ b/pkg/ddc/alluxio/transform_test.go @@ -307,126 +307,6 @@ func TestTransformWorkers(t *testing.T) { } } -func TestTransformWorkers(t *testing.T) { - testCases := map[string]struct { - runtime *datav1alpha1.AlluxioRuntime - wantValue *Alluxio - }{ - "test network mode case 1": { - runtime: &datav1alpha1.AlluxioRuntime{ - Spec: datav1alpha1.AlluxioRuntimeSpec{ - Worker: datav1alpha1.AlluxioCompTemplateSpec{ - NetworkMode: datav1alpha1.ContainerNetworkMode, - }, - }, - }, - wantValue: &Alluxio{ - Worker: Worker{ - HostNetwork: false, - }, - }, - }, - "test network mode case 2": { - runtime: &datav1alpha1.AlluxioRuntime{ - Spec: datav1alpha1.AlluxioRuntimeSpec{ - Worker: datav1alpha1.AlluxioCompTemplateSpec{ - NetworkMode: datav1alpha1.HostNetworkMode, - }, - }, - }, - wantValue: &Alluxio{ - Worker: Worker{ - HostNetwork: true, - }, - }, - }, - "test network mode case 3": { - runtime: &datav1alpha1.AlluxioRuntime{ - Spec: datav1alpha1.AlluxioRuntimeSpec{ - Worker: datav1alpha1.AlluxioCompTemplateSpec{ - NetworkMode: datav1alpha1.HostNetworkMode, - }, - TieredStore: datav1alpha1.TieredStore{}, - }, - }, - wantValue: &Alluxio{ - Worker: Worker{ - HostNetwork: true, - }, - }, - }, - "test network mode case 4": { - runtime: &datav1alpha1.AlluxioRuntime{ - Spec: datav1alpha1.AlluxioRuntimeSpec{ - Worker: datav1alpha1.AlluxioCompTemplateSpec{ - NetworkMode: datav1alpha1.HostNetworkMode, - NodeSelector: map[string]string{ - "workerSelector": "true", - }, - }, - TieredStore: datav1alpha1.TieredStore{}, - }, - }, - wantValue: &Alluxio{ - Worker: Worker{ - HostNetwork: true, - NodeSelector: map[string]string{ - "workerSelector": "true", - }, - }, - }, - }, - "test hierarchical imagePullSecrets case1": { - runtime: &datav1alpha1.AlluxioRuntime{ - Spec: datav1alpha1.AlluxioRuntimeSpec{ - Worker: datav1alpha1.AlluxioCompTemplateSpec{ - ImagePullSecrets: []corev1.LocalObjectReference{{Name: "secret-worker"}}, - }, - }, - }, - wantValue: &Alluxio{ - Worker: Worker{ - ImagePullSecrets: []corev1.LocalObjectReference{{Name: "secret-worker"}}, - HostNetwork: true, - }, - }, - }, - } - - engine := &AlluxioEngine{Log: fake.NullLogger()} - for k, v := range testCases { - gotValue := &Alluxio{} - engine.runtimeInfo, _ = base.BuildRuntimeInfo("test", "test", "alluxio", base.WithTieredStore(v.runtime.Spec.TieredStore)) - if err := engine.transformWorkers(v.runtime, gotValue); err == nil { - if gotValue.Worker.HostNetwork != v.wantValue.Worker.HostNetwork { - t.Errorf("check %s failure, got:%t,want:%t", - k, - gotValue.Worker.HostNetwork, - v.wantValue.Worker.HostNetwork, - ) - } - if len(v.wantValue.Worker.NodeSelector) > 0 { - if !reflect.DeepEqual(v.wantValue.Worker.NodeSelector, gotValue.Worker.NodeSelector) { - t.Errorf("check %s failure, got:%v,want:%v", - k, - gotValue.Worker.NodeSelector, - v.wantValue.Worker.NodeSelector, - ) - } - } - if len(v.wantValue.Worker.ImagePullSecrets) > 0 { - if !reflect.DeepEqual(v.wantValue.Worker.ImagePullSecrets, gotValue.Worker.ImagePullSecrets) { - t.Errorf("check %s failure, got:%s,want:%s", - k, - gotValue.Worker.ImagePullSecrets, - v.wantValue.Worker.ImagePullSecrets, - ) - } - } - } - } -} - func TestGenerateStaticPorts(t *testing.T) { engine := &AlluxioEngine{Log: fake.NullLogger(), runtime: &datav1alpha1.AlluxioRuntime{