feedc0de/my-rook-config
1
0
Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #4398 from leseb/ceph-version-output

Browse Source 
ceph: fix ceph version output
This commit is contained in:
Sébastien Han
2019-12-04 08:20:57 +01:00
committed by GitHub
parent e76859b937 09ac5823f6
commit 0a01a60de9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/operator/ceph/version/version.go
+4 -4
View File
@@ -65,14 +65,14 @@ var (
)
func (v *CephVersion) String() string {
return fmt.Sprintf("%d.%d.%d %s",
v.Major, v.Minor, v.Extra, v.ReleaseName())
return fmt.Sprintf("%d.%d.%d-%d %s",
v.Major, v.Minor, v.Extra, v.Build, v.ReleaseName())
}
// CephVersionFormatted returns the Ceph version in a human readable format
func (v *CephVersion) CephVersionFormatted() string {
return fmt.Sprintf("ceph version %d.%d.%d %s",
v.Major, v.Minor, v.Extra, v.ReleaseName())
return fmt.Sprintf("ceph version %d.%d.%d-%d %s",
v.Major, v.Minor, v.Extra, v.Build, v.ReleaseName())
}
// ReleaseName is the name of the Ceph release
pkg/operator/ceph/version/version_test.go
+5 -5
View File
@@ -24,16 +24,16 @@ import (
)
func TestToString(t *testing.T) {
assert.Equal(t, "14.0.0 nautilus", fmt.Sprintf("%s", &Nautilus))
assert.Equal(t, "13.0.0 mimic", fmt.Sprintf("%s", &Mimic))
assert.Equal(t, "14.0.0-0 nautilus", fmt.Sprintf("%s", &Nautilus))
assert.Equal(t, "13.0.0-0 mimic", fmt.Sprintf("%s", &Mimic))
expected := fmt.Sprintf("-1.0.0 %s", unknownVersionString)
expected := fmt.Sprintf("-1.0.0-0 %s", unknownVersionString)
assert.Equal(t, expected, fmt.Sprintf("%s", &CephVersion{-1, 0, 0, 0}))
}
func TestCephVersionFormatted(t *testing.T) {
assert.Equal(t, "ceph version 14.0.0 nautilus", Nautilus.CephVersionFormatted())
assert.Equal(t, "ceph version 13.0.0 mimic", Mimic.CephVersionFormatted())
assert.Equal(t, "ceph version 14.0.0-0 nautilus", Nautilus.CephVersionFormatted())
assert.Equal(t, "ceph version 13.0.0-0 mimic", Mimic.CephVersionFormatted())
}
func TestReleaseName(t *testing.T) {