diff --git a/rbd/features.go b/rbd/features.go index 990e84925..6bfb10dd5 100644 --- a/rbd/features.go +++ b/rbd/features.go @@ -43,6 +43,10 @@ const ( // from librbd FeatureOperations = uint64(C.RBD_FEATURE_OPERATIONS) + // FeatureMigrating is the representation of RBD_FEATURE_MIGRATING from + // librbd + FeatureMigrating = uint64(C.RBD_FEATURE_MIGRATING) + // RBD features, strings // FeatureNameLayering is the representation of @@ -81,6 +85,10 @@ const ( // RBD_FEATURE_NAME_OPERATIONS from librbd FeatureNameOperations = C.RBD_FEATURE_NAME_OPERATIONS + // FeatureNameMigrating is the representation of + // RBD_FEATURE_NAME_MIGRATING from librbd + FeatureNameMigrating = C.RBD_FEATURE_NAME_MIGRATING + // old names for backwards compatibility (unused?) // RbdFeatureLayering deprecated alias for FeatureLayering @@ -124,6 +132,7 @@ var ( FeatureNameJournaling: FeatureJournaling, FeatureNameDataPool: FeatureDataPool, FeatureNameOperations: FeatureOperations, + FeatureNameMigrating: FeatureMigrating, } ) diff --git a/rbd/features_nautilus.go b/rbd/features_nautilus.go deleted file mode 100644 index be12e497c..000000000 --- a/rbd/features_nautilus.go +++ /dev/null @@ -1,18 +0,0 @@ -package rbd - -// #include -import "C" - -const ( - // FeatureMigrating is the representation of RBD_FEATURE_MIGRATING from - // librbd - FeatureMigrating = uint64(C.RBD_FEATURE_MIGRATING) - - // FeatureNameMigrating is the representation of - // RBD_FEATURE_NAME_MIGRATING from librbd - FeatureNameMigrating = C.RBD_FEATURE_NAME_MIGRATING -) - -func init() { - featureNameToBit[FeatureNameMigrating] = FeatureMigrating -} diff --git a/rbd/features_nautilus_test.go b/rbd/features_nautilus_test.go deleted file mode 100644 index 2d2513471..000000000 --- a/rbd/features_nautilus_test.go +++ /dev/null @@ -1,13 +0,0 @@ -package rbd - -import ( - "testing" - - "github.com/stretchr/testify/assert" -) - -func TestGetFeaturesInNautilus(t *testing.T) { - f, ok := featureNameToBit[FeatureNameMigrating] - assert.True(t, ok) - assert.Equal(t, f, FeatureMigrating) -} diff --git a/rbd/features_test.go b/rbd/features_test.go index 12ed49bfe..1c6d0fdae 100644 --- a/rbd/features_test.go +++ b/rbd/features_test.go @@ -64,6 +64,12 @@ func TestGetFeaturesInMimic(t *testing.T) { assert.Equal(t, f, FeatureOperations) } +func TestGetFeaturesInNautilus(t *testing.T) { + f, ok := featureNameToBit[FeatureNameMigrating] + assert.True(t, ok) + assert.Equal(t, f, FeatureMigrating) +} + func TestFeatureSet(t *testing.T) { fsBits := FeatureSet(FeatureExclusiveLock | FeatureDeepFlatten) fsNames := FeatureSetFromNames([]string{FeatureNameExclusiveLock, FeatureNameDeepFlatten})