Skip to content
This repository was archived by the owner on Oct 20, 2022. It is now read-only.

Commit b99557d

Browse files
cscetboncscetbon
committed
metrics - Fix unit test
1 parent 8d44a10 commit b99557d

File tree

4 files changed

+72
-72
lines changed

4 files changed

+72
-72
lines changed

‎multi-casskop/pkg/controller/multi-casskop/cmc_utils.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package multicasskop
22

33
import (
44
"context"
5+
56
"github.com/Orange-OpenSource/casskop/multi-casskop/pkg/controller/multi-casskop/models"
67

78
ccv1 "github.com/Orange-OpenSource/casskop/pkg/apis/db/v1alpha1"
@@ -14,7 +15,7 @@ import (
1415
// ReadyCassandraCluster
1516
// return true if CassandraCluster it Done and Running
1617
func (r *reconciler) ReadyCassandraCluster(cc *ccv1.CassandraCluster) bool {
17-
if cc.Status.Phase != ccv1.ClusterPhaseRunning || cc.Status.LastClusterActionStatus != ccv1.StatusDone {
18+
if cc.Status.Phase != ccv1.ClusterPhaseRunning.Name || cc.Status.LastClusterActionStatus != ccv1.StatusDone {
1819
return false
1920
}
2021
return true

‎pkg/apis/db/v1alpha1/cassandracluster_types_test.go

+36-36
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func TestInitCassandraRackList_NoTopo(t *testing.T) {
185185

186186
cc.InitCassandraRackList()
187187

188-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["dc1-rack1"].CassandraLastAction.Name)
188+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["dc1-rack1"].CassandraLastAction.Name)
189189
assert.Equal(1, len(cc.Status.CassandraRackStatus))
190190

191191
assert.Equal(1, cc.GetDCSize())
@@ -200,7 +200,7 @@ func TestInitCassandraRackList_TopoDCNoRack(t *testing.T) {
200200

201201
cc.InitCassandraRackList()
202202

203-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
203+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
204204
assert.Equal(1, len(cc.Status.CassandraRackStatus))
205205

206206
assert.Equal(1, cc.GetDCSize())
@@ -215,10 +215,10 @@ func TestInitCassandraRackList_2DC(t *testing.T) {
215215

216216
cc.InitCassandraRackList()
217217

218-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
219-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
220-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
221-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
218+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
219+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
220+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
221+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
222222
assert.Equal(4, len(cc.Status.CassandraRackStatus))
223223

224224
}
@@ -230,15 +230,15 @@ func TestInitCassandraRackinStatus(t *testing.T) {
230230

231231
cc.InitCassandraRackList()
232232

233-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
234-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
235-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
236-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
233+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
234+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
235+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
236+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
237237
assert.Equal(4, len(cc.Status.CassandraRackStatus))
238238
//Add new DC from existing RackStatus
239239
cc.InitCassandraRackinStatus(&cc.Status, "foo", "bar")
240240

241-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["foo-bar"].CassandraLastAction.Name)
241+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["foo-bar"].CassandraLastAction.Name)
242242
assert.Equal(5, len(cc.Status.CassandraRackStatus))
243243
}
244244

@@ -249,7 +249,7 @@ func TestGetStatusDCRackSize(t *testing.T) {
249249

250250
cc.InitCassandraRackList()
251251

252-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
252+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
253253

254254
assert.Equal(2, cc.GetDCSize())
255255
assert.Equal(2, cc.GetRackSize(0))
@@ -287,8 +287,8 @@ func TestGetStatusDCRackSize_KeepChanges(t *testing.T) {
287287
assert.Equal(nb, cc.GetDCRackSize())
288288

289289
//add info in status
290-
cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name = ActionUpdateSeedList
291-
assert.Equal(cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name, ActionUpdateSeedList)
290+
cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name = ActionUpdateSeedList.Name
291+
assert.Equal(cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name, ActionUpdateSeedList.Name)
292292

293293
//Remove 1 dc
294294
cc.Spec.Topology.DC.Remove(1)
@@ -302,7 +302,7 @@ func TestGetStatusDCRackSize_KeepChanges(t *testing.T) {
302302
nb = len(status.CassandraRackStatus)
303303
assert.Equal(2, nb)
304304
assert.Equal(nb, cc.GetDCRackSize())
305-
assert.Equal(cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name, ActionUpdateSeedList)
305+
assert.Equal(cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name, ActionUpdateSeedList.Name)
306306
assert.Equal(2, len(status.CassandraRackStatus))
307307
}
308308

@@ -313,10 +313,10 @@ func TestInitSeedList_2DC(t *testing.T) {
313313

314314
//cc.InitCassandraRackList()
315315

316-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
317-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
318-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
319-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
316+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
317+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
318+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
319+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
320320

321321
cc.Status.SeedList = cc.InitSeedList()
322322

@@ -336,7 +336,7 @@ func TestInitSeedList_NoTopo(t *testing.T) {
336336

337337
//cc.InitCassandraRackList()
338338

339-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["dc1-rack1"].CassandraLastAction.Name)
339+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["dc1-rack1"].CassandraLastAction.Name)
340340
assert.Equal(1, len(cc.Status.CassandraRackStatus))
341341

342342
cc.Status.SeedList = cc.InitSeedList()
@@ -355,8 +355,8 @@ func TestInitSeedList_1DC(t *testing.T) {
355355

356356
//cc.InitCassandraRackList()
357357

358-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
359-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
358+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
359+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
360360
assert.Equal(2, len(cc.Status.CassandraRackStatus))
361361

362362
cc.Status.SeedList = cc.InitSeedList()
@@ -377,15 +377,15 @@ func TestInitSeedList_2DC5R(t *testing.T) {
377377

378378
//cc.InitCassandraRackList()
379379

380-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
381-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
382-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack3"].CassandraLastAction.Name)
383-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack4"].CassandraLastAction.Name)
384-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack5"].CassandraLastAction.Name)
385-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
386-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
387-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack3"].CassandraLastAction.Name)
388-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["stats-rack4"].CassandraLastAction.Name)
380+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
381+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
382+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack3"].CassandraLastAction.Name)
383+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack4"].CassandraLastAction.Name)
384+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack5"].CassandraLastAction.Name)
385+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack1"].CassandraLastAction.Name)
386+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack2"].CassandraLastAction.Name)
387+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack3"].CassandraLastAction.Name)
388+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["stats-rack4"].CassandraLastAction.Name)
389389
assert.Equal(9, len(cc.Status.CassandraRackStatus))
390390

391391
cc.Status.SeedList = cc.InitSeedList()
@@ -408,8 +408,8 @@ func TestInitSeedList_1DC1R1P(t *testing.T) {
408408

409409
//cc.InitCassandraRackList()
410410

411-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
412-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
411+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
412+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
413413
assert.Equal(2, len(cc.Status.CassandraRackStatus))
414414

415415
cc.Status.SeedList = cc.InitSeedList()
@@ -426,8 +426,8 @@ func TestIsPodInSeedList(t *testing.T) {
426426

427427
cc := helperInitCluster(t, "cassandracluster-1DC1R1P.yaml")
428428

429-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
430-
assert.Equal(ClusterPhaseInitial, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
429+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack1"].CassandraLastAction.Name)
430+
assert.Equal(ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["online-rack2"].CassandraLastAction.Name)
431431
assert.Equal(2, len(cc.Status.CassandraRackStatus))
432432

433433
cc.Status.SeedList = cc.InitSeedList()
@@ -494,7 +494,7 @@ func TestSetDefaults(t *testing.T) {
494494
assert.Equal(CPUAndMem{CPU: "500m", Memory: "1Gi"}, cluster.Spec.Resources.Limits)
495495

496496
assert.Equal(DefaultUserID, *cluster.Spec.RunAsUser)
497-
assert.Equal(ClusterPhaseInitial, cluster.Status.Phase)
497+
assert.Equal(ClusterPhaseInitial.Name, cluster.Status.Phase)
498498
assert.Equal(int32(defaultMaxPodUnavailable), cluster.Spec.MaxPodUnavailable)
499499
assert.Equal([]string{"defaults-test-dc1-rack1-0.defaults-test.default"}, cluster.Status.SeedList)
500500

‎pkg/controller/cassandracluster/cassandra_status_test.go

+10-11
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ import (
1818
"context"
1919
"fmt"
2020

21-
"k8s.io/api/core/v1"
22-
//"k8s.io/apimachinery/pkg/runtime"
2321
"reflect"
2422

23+
v1 "k8s.io/api/core/v1"
24+
2525
appsv1 "k8s.io/api/apps/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/types"
28-
//"k8s.io/client-go/kubernetes/scheme"
29-
//"sigs.k8s.io/controller-runtime/pkg/client/fake"
28+
3029
"strconv"
3130
"testing"
3231

@@ -97,9 +96,9 @@ func TestUpdateStatusIfSeedListHasChanged(t *testing.T) {
9796
}
9897
cc.InitCassandraRackList()
9998

100-
assert.Equal(api.ClusterPhaseInitial, cc.Status.CassandraRackStatus["dc1-rack1"].CassandraLastAction.Name)
101-
assert.Equal(api.ClusterPhaseInitial, cc.Status.CassandraRackStatus["dc1-rack2"].CassandraLastAction.Name)
102-
assert.Equal(api.ClusterPhaseInitial, cc.Status.CassandraRackStatus["dc2-rack1"].CassandraLastAction.Name)
99+
assert.Equal(api.ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["dc1-rack1"].CassandraLastAction.Name)
100+
assert.Equal(api.ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["dc1-rack2"].CassandraLastAction.Name)
101+
assert.Equal(api.ClusterPhaseInitial.Name, cc.Status.CassandraRackStatus["dc2-rack1"].CassandraLastAction.Name)
103102
assert.Equal(3, len(cc.Status.CassandraRackStatus))
104103

105104
cc.Status.SeedList = cc.InitSeedList()
@@ -223,17 +222,17 @@ func helperCreateCassandraCluster(t *testing.T, cassandraClusterFileName string)
223222
if err = rcc.client.Get(context.TODO(), req.NamespacedName, cc); err != nil {
224223
t.Fatalf("can't get cassandracluster: (%v)", err)
225224
}
226-
assert.Equal(cc.Status.Phase, api.ClusterPhaseRunning)
225+
assert.Equal(cc.Status.Phase, api.ClusterPhaseRunning.Name)
227226

228227
for _, dcRackName := range cc.GetDCRackNames() {
229-
assert.Equal(cc.Status.CassandraRackStatus[dcRackName].Phase, api.ClusterPhaseRunning,
228+
assert.Equal(cc.Status.CassandraRackStatus[dcRackName].Phase, api.ClusterPhaseRunning.Name,
230229
"dc-rack: %s", dcRackName)
231-
assert.Equal(cc.Status.CassandraRackStatus[dcRackName].CassandraLastAction.Name, api.ClusterPhaseInitial,
230+
assert.Equal(cc.Status.CassandraRackStatus[dcRackName].CassandraLastAction.Name, api.ClusterPhaseInitial.Name,
232231
"dc-rack: %s", dcRackName)
233232
assert.Equal(cc.Status.CassandraRackStatus[dcRackName].CassandraLastAction.Status, api.StatusDone,
234233
"dc-rack %s", dcRackName)
235234
}
236-
assert.Equal(cc.Status.LastClusterAction, api.ClusterPhaseInitial)
235+
assert.Equal(cc.Status.LastClusterAction, api.ClusterPhaseInitial.Name)
237236
assert.Equal(cc.Status.LastClusterActionStatus, api.StatusDone)
238237

239238
return rcc, &req

0 commit comments

Comments
 (0)