Skip to content

Commit feb3620

Browse files
boyang9527boyang9527
authored
Merge pull request #35 from cloudfoundry-incubator/develop
hide the instance change when the scaling action is failed (#34)
2 parents bdd7afd + 785cdcb commit feb3620

3 files changed

Lines changed: 29 additions & 9 deletions

File tree

‎src/cli/api/apihelper.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,10 @@ func (helper *APIHelper) GetHistory(startTime, endTime int64, desc bool, page ui
422422
scalingType = "scheduled"
423423
}
424424
status := "succeeded"
425+
instanceChange := strconv.Itoa(entry.OldInstances) + "->" + strconv.Itoa(entry.NewInstances)
425426
if entry.Status == 1 {
426427
status = "failed"
428+
instanceChange = ""
427429
}
428430

429431
var adjustment = entry.NewInstances - entry.OldInstances
@@ -434,8 +436,7 @@ func (helper *APIHelper) GetHistory(startTime, endTime int64, desc bool, page ui
434436
entry.Reason = fmt.Sprintf("%d instance(s) because %s", adjustment, entry.Message)
435437
}
436438
}
437-
data = append(data, []string{scalingType, status,
438-
strconv.Itoa(entry.OldInstances) + "->" + strconv.Itoa(entry.NewInstances),
439+
data = append(data, []string{scalingType, status, instanceChange,
439440
time.Unix(0, entry.Timestamp).Format(time.RFC3339),
440441
entry.Reason, entry.Error,
441442
})

‎src/cli/api/apihelper_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ var _ = Describe("API Helper Test", func() {
952952
for i, row := range data {
953953
Expect(row[0]).To(Equal("scheduled"))
954954
Expect(row[1]).To(Equal("failed"))
955-
Expect(row[2]).To(Equal(strconv.Itoa(i+20+1) + "->" + strconv.Itoa(i+20+2)))
955+
Expect(row[2]).To(Equal(""))
956956
Expect(row[3]).To(Equal(time.Unix(0, now+int64((i+20)*120*1E9)).Format(time.RFC3339)))
957957
Expect(row[4]).To(Equal("fakeReason"))
958958
Expect(row[5]).To(Equal("fakeError"))
@@ -1013,7 +1013,7 @@ var _ = Describe("API Helper Test", func() {
10131013
for i, row := range data {
10141014
Expect(row[0]).To(Equal("scheduled"))
10151015
Expect(row[1]).To(Equal("failed"))
1016-
Expect(row[2]).To(Equal(strconv.Itoa(29-i+1) + "->" + strconv.Itoa(29-i+2)))
1016+
Expect(row[2]).To(Equal(""))
10171017
Expect(row[3]).To(Equal(time.Unix(0, now+int64((29-i)*120*1E9)).Format(time.RFC3339)))
10181018
Expect(row[4]).To(Equal("fakeReason"))
10191019
Expect(row[5]).To(Equal("fakeError"))

‎src/cli/main_test.go‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2583,20 +2583,22 @@ var _ = Describe("App-AutoScaler Commands", func() {
25832583
//header line
25842584
} else {
25852585
//use (i-1) to skip header
2586-
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
25872586
Expect(strings.Trim(colomns[3], " ")).To(Equal(time.Unix(0, now.UnixNano()+int64((i-1)*120*1E9)).Format(time.RFC3339)))
25882587
Expect(strings.Trim(colomns[4], " ")).To(Equal("fakeReason"))
25892588
Expect(strings.Trim(colomns[5], " ")).To(Equal("fakeError"))
25902589

25912590
if i < 11 {
25922591
Expect(strings.Trim(colomns[0], " ")).To(Equal("dynamic"))
25932592
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2593+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
25942594
} else if i < 21 {
25952595
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
25962596
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2597+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
25972598
} else {
25982599
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
25992600
Expect(strings.Trim(colomns[1], " ")).To(Equal("failed"))
2601+
Expect(strings.Trim(colomns[2], " ")).To(Equal(""))
26002602
}
26012603
}
26022604
}
@@ -2681,19 +2683,21 @@ var _ = Describe("App-AutoScaler Commands", func() {
26812683
Expect(strings.Trim(colomns[5], " ")).To(Equal("Error"))
26822684
} else {
26832685
//use "29-(i-1)" to simulate the expected output in desc order
2684-
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(29-(i-1)+1) + "->" + strconv.Itoa(29-(i-1)+2)))
26852686
Expect(strings.Trim(colomns[3], " ")).To(Equal(time.Unix(0, now.UnixNano()+int64((29-(i-1))*120*1E9)).Format(time.RFC3339)))
26862687
Expect(strings.Trim(colomns[4], " ")).To(Equal("fakeReason"))
26872688
Expect(strings.Trim(colomns[5], " ")).To(Equal("fakeError"))
26882689
if i < 11 {
26892690
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
26902691
Expect(strings.Trim(colomns[1], " ")).To(Equal("failed"))
2692+
Expect(strings.Trim(colomns[2], " ")).To(Equal(""))
26912693
} else if i < 21 {
26922694
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
26932695
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2696+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(29-(i-1)+1) + "->" + strconv.Itoa(29-(i-1)+2)))
26942697
} else {
26952698
Expect(strings.Trim(colomns[0], " ")).To(Equal("dynamic"))
26962699
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2700+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(29-(i-1)+1) + "->" + strconv.Itoa(29-(i-1)+2)))
26972701
}
26982702
}
26992703
}
@@ -2769,20 +2773,25 @@ var _ = Describe("App-AutoScaler Commands", func() {
27692773
//header line
27702774
} else {
27712775
//use (i-1) to skip header
2772-
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
27732776
Expect(strings.Trim(colomns[3], " ")).To(Equal(time.Unix(0, now.UnixNano()+int64((i-1)*120*1E9)).Format(time.RFC3339)))
27742777
Expect(strings.Trim(colomns[4], " ")).To(Equal("fakeReason"))
27752778
Expect(strings.Trim(colomns[5], " ")).To(Equal("fakeError"))
27762779

27772780
if i < 11 {
27782781
Expect(strings.Trim(colomns[0], " ")).To(Equal("dynamic"))
27792782
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2783+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
2784+
27802785
} else if i < 21 {
27812786
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
27822787
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2788+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
2789+
27832790
} else {
27842791
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
27852792
Expect(strings.Trim(colomns[1], " ")).To(Equal("failed"))
2793+
Expect(strings.Trim(colomns[2], " ")).To(Equal(""))
2794+
27862795
}
27872796
}
27882797
}
@@ -2866,20 +2875,25 @@ var _ = Describe("App-AutoScaler Commands", func() {
28662875
//header line
28672876
} else {
28682877
//use (i-1) to skip header
2869-
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
28702878
Expect(strings.Trim(colomns[3], " ")).To(Equal(time.Unix(0, now.UnixNano()+int64((i-1)*120*1E9)).Format(time.RFC3339)))
28712879
Expect(strings.Trim(colomns[4], " ")).To(Equal("fakeReason"))
28722880
Expect(strings.Trim(colomns[5], " ")).To(Equal("fakeError"))
28732881

28742882
if i < 11 {
28752883
Expect(strings.Trim(colomns[0], " ")).To(Equal("dynamic"))
28762884
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2885+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
2886+
28772887
} else if i < 21 {
28782888
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
28792889
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2890+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
2891+
28802892
} else {
28812893
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
28822894
Expect(strings.Trim(colomns[1], " ")).To(Equal("failed"))
2895+
Expect(strings.Trim(colomns[2], " ")).To(Equal(""))
2896+
28832897
}
28842898
}
28852899
}
@@ -2963,20 +2977,25 @@ var _ = Describe("App-AutoScaler Commands", func() {
29632977
//header line
29642978
} else {
29652979
//use (i-1) to skip header
2966-
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
29672980
Expect(strings.Trim(colomns[3], " ")).To(Equal(time.Unix(0, now.UnixNano()+int64((i-1)*120*1E9)).Format(time.RFC3339)))
29682981
Expect(strings.Trim(colomns[4], " ")).To(Equal("fakeReason"))
29692982
Expect(strings.Trim(colomns[5], " ")).To(Equal("fakeError"))
29702983

29712984
if i < 11 {
29722985
Expect(strings.Trim(colomns[0], " ")).To(Equal("dynamic"))
29732986
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2987+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
2988+
29742989
} else if i < 21 {
29752990
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
29762991
Expect(strings.Trim(colomns[1], " ")).To(Equal("succeeded"))
2992+
Expect(strings.Trim(colomns[2], " ")).To(Equal(strconv.Itoa(i-1+1) + "->" + strconv.Itoa(i-1+2)))
2993+
29772994
} else {
29782995
Expect(strings.Trim(colomns[0], " ")).To(Equal("scheduled"))
29792996
Expect(strings.Trim(colomns[1], " ")).To(Equal("failed"))
2997+
Expect(strings.Trim(colomns[2], " ")).To(Equal(""))
2998+
29802999
}
29813000
}
29823001
}

0 commit comments

Comments
 (0)