Skip to content

refactor: use clusterRes instead of clusterResp #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
QinYuuuu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: use clusterRes instead of clusterResp #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .mockery.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ packages:
ImagebuilderComponent:
WorkFlowComponent:
ServiceComponent:
ClusterComponent:
opencsg.com/csghub-server/logcollector/component:
config:
all: true
7 changes: 5 additions & 2 deletions .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
golang 1.24.6
mockery 2.53.0
golang 1.25.5
mockery 2.53.5
minikube 1.34.0
kubectl 1.28.3
argo 3.6.10
28 changes: 14 additions & 14 deletions _mocks/opencsg.com/csghub-server/builder/deploy/imagerunner/mock_Runner.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

162 changes: 162 additions & 0 deletions _mocks/opencsg.com/csghub-server/runner/component/mock_ClusterComponent.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions builder/deploy/deploy_ce_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ func TestDeployer_CheckResourceAvailable(t *testing.T) {
tester := newTestDeployer(t)
ctx := context.TODO()

tester.mocks.runner.EXPECT().ListCluster(ctx).Return([]types.ClusterResponse{
tester.mocks.runner.EXPECT().ListCluster(ctx).Return([]types.ClusterRes{
{ClusterID: "c1"},
}, nil)
tester.mocks.runner.EXPECT().GetClusterById(ctx, "c1").Return(&types.ClusterResponse{
Nodes: map[string]types.NodeResourceInfo{
"n1": {AvailableMem: 100},
tester.mocks.runner.EXPECT().GetClusterById(ctx, "c1").Return(&types.ClusterRes{
Resources: []types.NodeResourceInfo{
{AvailableMem: 100},
},
}, nil)

Expand Down Expand Up @@ -209,17 +209,17 @@ func TestDeployer_GetClusterById(t *testing.T) {
tester := newTestDeployer(t)
t.Run("success", func(t *testing.T) {
ctx := context.TODO()
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterResponse{
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterRes{
ClusterID: "1",
Region: "test-region",
Zone: "test-zone",
Enable: true,
Nodes: map[string]types.NodeResourceInfo{
"1": {
Resources: []types.NodeResourceInfo{
{
AvailableCPU: 1,
AvailableMem: 3,
},
"2": {
{
AvailableCPU: 2,
AvailableMem: 5,
AvailableXPU: 4,
Expand All @@ -234,9 +234,9 @@ func TestDeployer_GetClusterById(t *testing.T) {
})
t.Run("empty nodes", func(t *testing.T) {
ctx := context.TODO()
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterResponse{
tester.mocks.runner.EXPECT().GetClusterById(ctx, "1").Once().Return(&types.ClusterRes{
ClusterID: "1",
Nodes: nil,
Resources: nil,
}, nil)
clusterRes, err := tester.GetClusterById(ctx, "1")
require.Nil(t, err)
Expand Down
Loading
Loading