Skip to content

Commit 8d09807

Browse files
author
Dev Agent
committed
refactor: use clusterRes instead of clusterResp
1 parent 34e72db commit 8d09807

File tree

15 files changed

+348
-90
lines changed

15 files changed

+348
-90
lines changed

.mockery.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ packages:
289289
ImagebuilderComponent:
290290
WorkFlowComponent:
291291
ServiceComponent:
292+
ClusterComponent:
292293
opencsg.com/csghub-server/logcollector/component:
293294
config:
294295
all: true

.tool-versions

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
golang 1.24.6
2-
mockery 2.53.0
1+
golang 1.25.5
2+
mockery 2.53.5
3+
minikube 1.34.0
4+
kubectl 1.28.3
5+
argo 3.6.10

_mocks/opencsg.com/csghub-server/builder/deploy/imagerunner/mock_Runner.go

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_mocks/opencsg.com/csghub-server/runner/component/mock_ClusterComponent.go

Lines changed: 162 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

builder/deploy/deploy_ce_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,12 @@ func TestDeployer_CheckResourceAvailable(t *testing.T) {
101101
tester := newTestDeployer(t)
102102
ctx := context.TODO()
103103

104-
tester.mocks.runner.EXPECT().ListCluster(ctx).Return([]types.ClusterResponse{
104+
tester.mocks.runner.EXPECT().ListCluster(ctx).Return([]types.ClusterRes{
105105
{ClusterID: "c1"},
106106
}, nil)
107-
tester.mocks.runner.EXPECT().GetClusterById(ctx, "c1").Return(&types.ClusterResponse{
108-
Nodes: map[string]types.NodeResourceInfo{
109-
"n1": {AvailableMem: 100},
107+
tester.mocks.runner.EXPECT().GetClusterById(ctx, "c1").Return(&types.ClusterRes{
108+
Resources: []types.NodeResourceInfo{
109+
{AvailableMem: 100},
110110
},
111111
}, nil)
112112

@@ -209,17 +209,17 @@ func TestDeployer_GetClusterById(t *testing.T) {
209209
tester := newTestDeployer(t)
210210
t.Run("success", func(t *testing.T) {
211211
ctx := context.TODO()
212-
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterResponse{
212+
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterRes{
213213
ClusterID: "1",
214214
Region: "test-region",
215215
Zone: "test-zone",
216216
Enable: true,
217-
Nodes: map[string]types.NodeResourceInfo{
218-
"1": {
217+
Resources: []types.NodeResourceInfo{
218+
{
219219
AvailableCPU: 1,
220220
AvailableMem: 3,
221221
},
222-
"2": {
222+
{
223223
AvailableCPU: 2,
224224
AvailableMem: 5,
225225
AvailableXPU: 4,
@@ -234,9 +234,9 @@ func TestDeployer_GetClusterById(t *testing.T) {
234234
})
235235
t.Run("empty nodes", func(t *testing.T) {
236236
ctx := context.TODO()
237-
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterResponse{
237+
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterRes{
238238
ClusterID: "1",
239-
Nodes: nil,
239+
Resources: nil,
240240
}, nil)
241241
clusterRes, err := tester.GetClusterById(ctx, "1")
242242
require.Nil(t, err)

0 commit comments

Comments
 (0)