RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rbd: rename uses of RbdImageOptions to ImageOptions 

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2020-02-25 14:13:45 -05:00 committed by John Mulligan
parent a29025a893
commit eee19d642f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rbd/options_test.go
View File

@ -216,13 +216,13 @@ func TestRbdOptionsClear(t *testing.T) {
func TestInvalidRbdOption(t *testing.T) {
options := NewRbdImageOptions()
err := options.SetUint64(RbdImageOption(-1), 1)
err := options.SetUint64(ImageOption(-1), 1)
assert.Error(t, err)
_, err = options.IsSet(RbdImageOption(-1))
_, err = options.IsSet(ImageOption(-1))
assert.Error(t, err)
err = options.Unset(RbdImageOption(-1))
err = options.Unset(ImageOption(-1))
assert.Error(t, err)
options.Destroy()

6
rbd/rbd.go
View File

@ -1209,7 +1209,7 @@ func OpenImageByIdReadOnly(ioctx *rados.IOContext, id, snapName string) (*Image,
// Implements:
// int rbd_create4(rados_ioctx_t io, const char *name, uint64_t size,
// rbd_image_options_t opts);
func CreateImage(ioctx *rados.IOContext, name string, size uint64, rio *RbdImageOptions) error {
func CreateImage(ioctx *rados.IOContext, name string, size uint64, rio *ImageOptions) error {
if rio == nil {
return RBDError(C.EINVAL)
@ -1241,7 +1241,7 @@ func RemoveImage(ioctx *rados.IOContext, name string) error {
// const char *p_snapname, rados_ioctx_t c_ioctx,
// const char *c_name, rbd_image_options_t c_opts);
func CloneImage(ioctx *rados.IOContext, parentName, snapName string,
destctx *rados.IOContext, name string, rio *RbdImageOptions) error {
destctx *rados.IOContext, name string, rio *ImageOptions) error {
if rio == nil {
return RBDError(C.EINVAL)
@ -1269,7 +1269,7 @@ func CloneImage(ioctx *rados.IOContext, parentName, snapName string,
// This function is a convenience wrapper around CloneImage to support cloning
// from an existing Image.
func CloneFromImage(parent *Image, snapName string,
destctx *rados.IOContext, name string, rio *RbdImageOptions) error {
destctx *rados.IOContext, name string, rio *ImageOptions) error {
if err := parent.validate(imageNeedsIOContext); err != nil {
return err