move replication package to project root (independent of cmd package)

replication/pdu/pdu.pb.go

@@ -0,0 +1,384 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: pdu.proto
+
+/*
+Package pdu is a generated protocol buffer package.
+
+It is generated from these files:
+	pdu.proto
+
+It has these top-level messages:
+	ListFilesystemReq
+	ListFilesystemRes
+	Filesystem
+	ListFilesystemVersionsReq
+	ListFilesystemVersionsRes
+	FilesystemVersion
+	SendReq
+	Property
+	SendRes
+	ReceiveReq
+	ReceiveRes
+*/
+package pdu
+
+import proto "github.com/golang/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+
+type FilesystemVersion_VersionType int32
+
+const (
+	FilesystemVersion_Snapshot FilesystemVersion_VersionType = 0
+	FilesystemVersion_Bookmark FilesystemVersion_VersionType = 1
+)
+
+var FilesystemVersion_VersionType_name = map[int32]string{
+	0: "Snapshot",
+	1: "Bookmark",
+}
+var FilesystemVersion_VersionType_value = map[string]int32{
+	"Snapshot": 0,
+	"Bookmark": 1,
+}
+
+func (x FilesystemVersion_VersionType) String() string {
+	return proto.EnumName(FilesystemVersion_VersionType_name, int32(x))
+}
+func (FilesystemVersion_VersionType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor0, []int{5, 0}
+}
+
+type ListFilesystemReq struct {
+}
+
+func (m *ListFilesystemReq) Reset()                    { *m = ListFilesystemReq{} }
+func (m *ListFilesystemReq) String() string            { return proto.CompactTextString(m) }
+func (*ListFilesystemReq) ProtoMessage()               {}
+func (*ListFilesystemReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
+
+type ListFilesystemRes struct {
+	Filesystems []*Filesystem `protobuf:"bytes,1,rep,name=Filesystems" json:"Filesystems,omitempty"`
+}
+
+func (m *ListFilesystemRes) Reset()                    { *m = ListFilesystemRes{} }
+func (m *ListFilesystemRes) String() string            { return proto.CompactTextString(m) }
+func (*ListFilesystemRes) ProtoMessage()               {}
+func (*ListFilesystemRes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
+
+func (m *ListFilesystemRes) GetFilesystems() []*Filesystem {
+	if m != nil {
+		return m.Filesystems
+	}
+	return nil
+}
+
+type Filesystem struct {
+	Path        string `protobuf:"bytes,1,opt,name=Path" json:"Path,omitempty"`
+	ResumeToken string `protobuf:"bytes,2,opt,name=ResumeToken" json:"ResumeToken,omitempty"`
+}
+
+func (m *Filesystem) Reset()                    { *m = Filesystem{} }
+func (m *Filesystem) String() string            { return proto.CompactTextString(m) }
+func (*Filesystem) ProtoMessage()               {}
+func (*Filesystem) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
+
+func (m *Filesystem) GetPath() string {
+	if m != nil {
+		return m.Path
+	}
+	return ""
+}
+
+func (m *Filesystem) GetResumeToken() string {
+	if m != nil {
+		return m.ResumeToken
+	}
+	return ""
+}
+
+type ListFilesystemVersionsReq struct {
+	Filesystem string `protobuf:"bytes,1,opt,name=Filesystem" json:"Filesystem,omitempty"`
+}
+
+func (m *ListFilesystemVersionsReq) Reset()                    { *m = ListFilesystemVersionsReq{} }
+func (m *ListFilesystemVersionsReq) String() string            { return proto.CompactTextString(m) }
+func (*ListFilesystemVersionsReq) ProtoMessage()               {}
+func (*ListFilesystemVersionsReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
+
+func (m *ListFilesystemVersionsReq) GetFilesystem() string {
+	if m != nil {
+		return m.Filesystem
+	}
+	return ""
+}
+
+type ListFilesystemVersionsRes struct {
+	Versions []*FilesystemVersion `protobuf:"bytes,1,rep,name=Versions" json:"Versions,omitempty"`
+}
+
+func (m *ListFilesystemVersionsRes) Reset()                    { *m = ListFilesystemVersionsRes{} }
+func (m *ListFilesystemVersionsRes) String() string            { return proto.CompactTextString(m) }
+func (*ListFilesystemVersionsRes) ProtoMessage()               {}
+func (*ListFilesystemVersionsRes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
+
+func (m *ListFilesystemVersionsRes) GetVersions() []*FilesystemVersion {
+	if m != nil {
+		return m.Versions
+	}
+	return nil
+}
+
+type FilesystemVersion struct {
+	Type      FilesystemVersion_VersionType `protobuf:"varint,1,opt,name=Type,enum=pdu.FilesystemVersion_VersionType" json:"Type,omitempty"`
+	Name      string                        `protobuf:"bytes,2,opt,name=Name" json:"Name,omitempty"`
+	Guid      uint64                        `protobuf:"varint,3,opt,name=Guid" json:"Guid,omitempty"`
+	CreateTXG uint64                        `protobuf:"varint,4,opt,name=CreateTXG" json:"CreateTXG,omitempty"`
+	Creation  string                        `protobuf:"bytes,5,opt,name=Creation" json:"Creation,omitempty"`
+}
+
+func (m *FilesystemVersion) Reset()                    { *m = FilesystemVersion{} }
+func (m *FilesystemVersion) String() string            { return proto.CompactTextString(m) }
+func (*FilesystemVersion) ProtoMessage()               {}
+func (*FilesystemVersion) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
+
+func (m *FilesystemVersion) GetType() FilesystemVersion_VersionType {
+	if m != nil {
+		return m.Type
+	}
+	return FilesystemVersion_Snapshot
+}
+
+func (m *FilesystemVersion) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *FilesystemVersion) GetGuid() uint64 {
+	if m != nil {
+		return m.Guid
+	}
+	return 0
+}
+
+func (m *FilesystemVersion) GetCreateTXG() uint64 {
+	if m != nil {
+		return m.CreateTXG
+	}
+	return 0
+}
+
+func (m *FilesystemVersion) GetCreation() string {
+	if m != nil {
+		return m.Creation
+	}
+	return ""
+}
+
+type SendReq struct {
+	Filesystem string `protobuf:"bytes,1,opt,name=Filesystem" json:"Filesystem,omitempty"`
+	From       string `protobuf:"bytes,2,opt,name=From" json:"From,omitempty"`
+	// May be empty / null to request a full transfer of From
+	To string `protobuf:"bytes,3,opt,name=To" json:"To,omitempty"`
+	// If ResumeToken is not empty, the resume token that CAN be tried for 'zfs send' by the sender.
+	// The sender MUST indicate in SendRes.UsedResumeToken
+	// If it does not work, the sender SHOULD clear the resume token on their side
+	// and use From and To instead
+	// If ResumeToken is not empty, the GUIDs of From and To
+	// MUST correspond to those encoded in the ResumeToken.
+	// Otherwise, the Sender MUST return an error.
+	ResumeToken string `protobuf:"bytes,4,opt,name=ResumeToken" json:"ResumeToken,omitempty"`
+	Compress    bool   `protobuf:"varint,5,opt,name=Compress" json:"Compress,omitempty"`
+	Dedup       bool   `protobuf:"varint,6,opt,name=Dedup" json:"Dedup,omitempty"`
+}
+
+func (m *SendReq) Reset()                    { *m = SendReq{} }
+func (m *SendReq) String() string            { return proto.CompactTextString(m) }
+func (*SendReq) ProtoMessage()               {}
+func (*SendReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
+
+func (m *SendReq) GetFilesystem() string {
+	if m != nil {
+		return m.Filesystem
+	}
+	return ""
+}
+
+func (m *SendReq) GetFrom() string {
+	if m != nil {
+		return m.From
+	}
+	return ""
+}
+
+func (m *SendReq) GetTo() string {
+	if m != nil {
+		return m.To
+	}
+	return ""
+}
+
+func (m *SendReq) GetResumeToken() string {
+	if m != nil {
+		return m.ResumeToken
+	}
+	return ""
+}
+
+func (m *SendReq) GetCompress() bool {
+	if m != nil {
+		return m.Compress
+	}
+	return false
+}
+
+func (m *SendReq) GetDedup() bool {
+	if m != nil {
+		return m.Dedup
+	}
+	return false
+}
+
+type Property struct {
+	Name  string `protobuf:"bytes,1,opt,name=Name" json:"Name,omitempty"`
+	Value string `protobuf:"bytes,2,opt,name=Value" json:"Value,omitempty"`
+}
+
+func (m *Property) Reset()                    { *m = Property{} }
+func (m *Property) String() string            { return proto.CompactTextString(m) }
+func (*Property) ProtoMessage()               {}
+func (*Property) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
+
+func (m *Property) GetName() string {
+	if m != nil {
+		return m.Name
+	}
+	return ""
+}
+
+func (m *Property) GetValue() string {
+	if m != nil {
+		return m.Value
+	}
+	return ""
+}
+
+type SendRes struct {
+	// Whether the resume token provided in the request has been used or not.
+	UsedResumeToken bool        `protobuf:"varint,1,opt,name=UsedResumeToken" json:"UsedResumeToken,omitempty"`
+	Properties      []*Property `protobuf:"bytes,2,rep,name=Properties" json:"Properties,omitempty"`
+}
+
+func (m *SendRes) Reset()                    { *m = SendRes{} }
+func (m *SendRes) String() string            { return proto.CompactTextString(m) }
+func (*SendRes) ProtoMessage()               {}
+func (*SendRes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
+
+func (m *SendRes) GetUsedResumeToken() bool {
+	if m != nil {
+		return m.UsedResumeToken
+	}
+	return false
+}
+
+func (m *SendRes) GetProperties() []*Property {
+	if m != nil {
+		return m.Properties
+	}
+	return nil
+}
+
+type ReceiveReq struct {
+	Filesystem string `protobuf:"bytes,1,opt,name=Filesystem" json:"Filesystem,omitempty"`
+	// If true, the receiver should clear the resume token before perfoming the zfs recv of the stream in the request
+	ClearResumeToken bool `protobuf:"varint,2,opt,name=ClearResumeToken" json:"ClearResumeToken,omitempty"`
+}
+
+func (m *ReceiveReq) Reset()                    { *m = ReceiveReq{} }
+func (m *ReceiveReq) String() string            { return proto.CompactTextString(m) }
+func (*ReceiveReq) ProtoMessage()               {}
+func (*ReceiveReq) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
+
+func (m *ReceiveReq) GetFilesystem() string {
+	if m != nil {
+		return m.Filesystem
+	}
+	return ""
+}
+
+func (m *ReceiveReq) GetClearResumeToken() bool {
+	if m != nil {
+		return m.ClearResumeToken
+	}
+	return false
+}
+
+type ReceiveRes struct {
+}
+
+func (m *ReceiveRes) Reset()                    { *m = ReceiveRes{} }
+func (m *ReceiveRes) String() string            { return proto.CompactTextString(m) }
+func (*ReceiveRes) ProtoMessage()               {}
+func (*ReceiveRes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
+
+func init() {
+	proto.RegisterType((*ListFilesystemReq)(nil), "pdu.ListFilesystemReq")
+	proto.RegisterType((*ListFilesystemRes)(nil), "pdu.ListFilesystemRes")
+	proto.RegisterType((*Filesystem)(nil), "pdu.Filesystem")
+	proto.RegisterType((*ListFilesystemVersionsReq)(nil), "pdu.ListFilesystemVersionsReq")
+	proto.RegisterType((*ListFilesystemVersionsRes)(nil), "pdu.ListFilesystemVersionsRes")
+	proto.RegisterType((*FilesystemVersion)(nil), "pdu.FilesystemVersion")
+	proto.RegisterType((*SendReq)(nil), "pdu.SendReq")
+	proto.RegisterType((*Property)(nil), "pdu.Property")
+	proto.RegisterType((*SendRes)(nil), "pdu.SendRes")
+	proto.RegisterType((*ReceiveReq)(nil), "pdu.ReceiveReq")
+	proto.RegisterType((*ReceiveRes)(nil), "pdu.ReceiveRes")
+	proto.RegisterEnum("pdu.FilesystemVersion_VersionType", FilesystemVersion_VersionType_name, FilesystemVersion_VersionType_value)
+}
+
+func init() { proto.RegisterFile("pdu.proto", fileDescriptor0) }
+
+var fileDescriptor0 = []byte{
+	// 445 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xc1, 0x6e, 0xd3, 0x40,
+	0x10, 0x65, 0x13, 0xa7, 0x38, 0x93, 0xd2, 0xa6, 0x4b, 0x85, 0x0c, 0x42, 0x28, 0xda, 0x53, 0x40,
+	0x22, 0x12, 0x01, 0x71, 0xe1, 0xd6, 0xa2, 0xf4, 0x82, 0xa0, 0xda, 0x9a, 0xaa, 0x57, 0x17, 0x8f,
+	0x54, 0x2b, 0xb1, 0x77, 0xbb, 0x63, 0x23, 0xe5, 0x73, 0xf8, 0x2b, 0x3e, 0x07, 0x79, 0x6a, 0x27,
+	0x4b, 0x0c, 0x52, 0x4e, 0x99, 0xf7, 0x66, 0x32, 0xf3, 0xe6, 0xcd, 0x1a, 0x86, 0x36, 0xad, 0x66,
+	0xd6, 0x99, 0xd2, 0xc8, 0xbe, 0x4d, 0x2b, 0xf5, 0x14, 0x4e, 0xbe, 0x64, 0x54, 0x2e, 0xb2, 0x15,
+	0xd2, 0x9a, 0x4a, 0xcc, 0x35, 0xde, 0xab, 0x45, 0x97, 0x24, 0xf9, 0x0e, 0x46, 0x5b, 0x82, 0x22,
+	0x31, 0xe9, 0x4f, 0x47, 0xf3, 0xe3, 0x59, 0xdd, 0xcf, 0x2b, 0xf4, 0x6b, 0xd4, 0x19, 0xc0, 0x16,
+	0x4a, 0x09, 0xc1, 0x65, 0x52, 0xde, 0x45, 0x62, 0x22, 0xa6, 0x43, 0xcd, 0xb1, 0x9c, 0xc0, 0x48,
+	0x23, 0x55, 0x39, 0xc6, 0x66, 0x89, 0x45, 0xd4, 0xe3, 0x94, 0x4f, 0xa9, 0x4f, 0xf0, 0xfc, 0x6f,
+	0x2d, 0xd7, 0xe8, 0x28, 0x33, 0x05, 0x69, 0xbc, 0x97, 0xaf, 0xfc, 0x01, 0x4d, 0x63, 0x8f, 0x51,
+	0xdf, 0xfe, 0xff, 0x67, 0x92, 0x73, 0x08, 0x5b, 0xd8, 0x6c, 0xf3, 0x6c, 0x67, 0x9b, 0x26, 0xad,
+	0x37, 0x75, 0xea, 0xb7, 0x80, 0x93, 0x4e, 0x5e, 0x7e, 0x84, 0x20, 0x5e, 0x5b, 0x64, 0x01, 0x47,
+	0x73, 0xf5, 0xef, 0x2e, 0xb3, 0xe6, 0xb7, 0xae, 0xd4, 0x5c, 0x5f, 0x3b, 0xf2, 0x35, 0xc9, 0xb1,
+	0x59, 0x9b, 0xe3, 0x9a, 0xbb, 0xa8, 0xb2, 0x34, 0xea, 0x4f, 0xc4, 0x34, 0xd0, 0x1c, 0xcb, 0x97,
+	0x30, 0x3c, 0x77, 0x98, 0x94, 0x18, 0xdf, 0x5c, 0x44, 0x01, 0x27, 0xb6, 0x84, 0x7c, 0x01, 0x21,
+	0x83, 0xcc, 0x14, 0xd1, 0x80, 0x3b, 0x6d, 0xb0, 0x7a, 0x0d, 0x23, 0x6f, 0xac, 0x3c, 0x84, 0xf0,
+	0xaa, 0x48, 0x2c, 0xdd, 0x99, 0x72, 0xfc, 0xa8, 0x46, 0x67, 0xc6, 0x2c, 0xf3, 0xc4, 0x2d, 0xc7,
+	0x42, 0xfd, 0x12, 0xf0, 0xf8, 0x0a, 0x8b, 0x74, 0x0f, 0x5f, 0x6b, 0x91, 0x0b, 0x67, 0xf2, 0x56,
+	0x78, 0x1d, 0xcb, 0x23, 0xe8, 0xc5, 0x86, 0x65, 0x0f, 0x75, 0x2f, 0x36, 0xbb, 0xa7, 0x0d, 0x3a,
+	0xa7, 0x65, 0xe1, 0x26, 0xb7, 0x0e, 0x89, 0x58, 0x78, 0xa8, 0x37, 0x58, 0x9e, 0xc2, 0xe0, 0x33,
+	0xa6, 0x95, 0x8d, 0x0e, 0x38, 0xf1, 0x00, 0xd4, 0x07, 0x08, 0x2f, 0x9d, 0xb1, 0xe8, 0xca, 0xf5,
+	0xc6, 0x3c, 0xe1, 0x99, 0x77, 0x0a, 0x83, 0xeb, 0x64, 0x55, 0xb5, 0x8e, 0x3e, 0x00, 0x75, 0xdb,
+	0x2e, 0x46, 0x72, 0x0a, 0xc7, 0xdf, 0x09, 0x53, 0x5f, 0x98, 0xe0, 0x01, 0xbb, 0xb4, 0x7c, 0x0b,
+	0xd0, 0x8c, 0xca, 0x90, 0xa2, 0x1e, 0xbf, 0x8f, 0x27, 0x7c, 0xd9, 0x56, 0x81, 0xf6, 0x0a, 0xd4,
+	0x0d, 0x80, 0xc6, 0x1f, 0x98, 0xfd, 0xc4, 0x7d, 0xfc, 0x7b, 0x03, 0xe3, 0xf3, 0x15, 0x26, 0x6e,
+	0xf7, 0xed, 0x87, 0xba, 0xc3, 0xab, 0x43, 0xaf, 0x33, 0xdd, 0x1e, 0xf0, 0xb7, 0xfb, 0xfe, 0x4f,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xc4, 0x8d, 0xb7, 0xc8, 0x03, 0x00, 0x00,
+}

replication/pdu/pdu.proto

@@ -0,0 +1,78 @@
+syntax = "proto3";
+
+package pdu;
+
+message ListFilesystemReq {}
+
+message ListFilesystemRes {
+    repeated Filesystem Filesystems = 1;
+}
+
+message Filesystem {
+    string Path = 1;
+    string ResumeToken = 2;
+}
+
+message ListFilesystemVersionsReq {
+    string Filesystem = 1;
+}
+
+message ListFilesystemVersionsRes {
+    repeated FilesystemVersion Versions = 1;
+}
+
+message FilesystemVersion {
+    enum VersionType {
+        Snapshot = 0;
+        Bookmark = 1;
+    }
+    VersionType Type = 1;
+    string Name = 2;
+    uint64 Guid = 3;
+    uint64 CreateTXG = 4;
+    string Creation = 5; // RFC 3339
+}
+
+
+message SendReq {
+    string Filesystem  = 1;
+    string From = 2;
+    // May be empty / null to request a full transfer of From
+    string To = 3;
+
+    // If ResumeToken is not empty, the resume token that CAN be tried for 'zfs send' by the sender.
+    // The sender MUST indicate in SendRes.UsedResumeToken
+    // If it does not work, the sender SHOULD clear the resume token on their side
+    // and use From and To instead
+    // If ResumeToken is not empty, the GUIDs of From and To
+    // MUST correspond to those encoded in the ResumeToken.
+    // Otherwise, the Sender MUST return an error.
+    string ResumeToken  = 4;
+    bool Compress = 5;
+    bool Dedup = 6;
+}
+
+message Property {
+    string Name = 1;
+    string Value = 2;
+}
+
+message SendRes {
+    // The actual stream is in the stream part of the streamrpc response
+
+    // Whether the resume token provided in the request has been used or not.
+    bool UsedResumeToken = 1;
+
+    repeated Property Properties  = 2;
+}
+
+message ReceiveReq {
+    // The stream part of the streamrpc request contains the zfs send stream
+
+    string Filesystem = 1;
+
+    // If true, the receiver should clear the resume token before perfoming the zfs recv of the stream in the request
+    bool ClearResumeToken = 2;
+}
+
+message ReceiveRes {}

replication/pdu/pdu_extras.go

@@ -0,0 +1,73 @@
+package pdu
+
+import (
+	"fmt"
+	"github.com/zrepl/zrepl/zfs"
+	"time"
+)
+
+func (v *FilesystemVersion) RelName() string {
+	zv := v.ZFSFilesystemVersion()
+	return zv.String()
+}
+
+func (v FilesystemVersion_VersionType) ZFSVersionType() zfs.VersionType {
+	switch v {
+	case FilesystemVersion_Snapshot:
+		return zfs.Snapshot
+	case FilesystemVersion_Bookmark:
+		return zfs.Bookmark
+	default:
+		panic(fmt.Sprintf("unexpected v.Type %#v", v))
+	}
+}
+
+func FilesystemVersionFromZFS(fsv zfs.FilesystemVersion) *FilesystemVersion {
+	var t FilesystemVersion_VersionType
+	switch fsv.Type {
+	case zfs.Bookmark:
+		t = FilesystemVersion_Bookmark
+	case zfs.Snapshot:
+		t = FilesystemVersion_Snapshot
+	default:
+		panic("unknown fsv.Type: " + fsv.Type)
+	}
+	return &FilesystemVersion{
+		Type: t,
+		Name: fsv.Name,
+		Guid: fsv.Guid,
+		CreateTXG: fsv.CreateTXG,
+		Creation: fsv.Creation.Format(time.RFC3339),
+	}
+}
+
+func (v *FilesystemVersion) CreationAsTime() (time.Time, error) {
+	return time.Parse(time.RFC3339, v.Creation)
+}
+
+// implement fsfsm.FilesystemVersion
+func (v *FilesystemVersion) SnapshotTime() time.Time {
+	t, err := v.CreationAsTime()
+	if err != nil {
+		panic(err) // FIXME
+	}
+	return t
+}
+
+func (v *FilesystemVersion) ZFSFilesystemVersion() *zfs.FilesystemVersion {
+	ct := time.Time{}
+	if v.Creation != "" {
+		var err error
+		ct, err = time.Parse(time.RFC3339, v.Creation)
+		if err != nil {
+			panic(err)
+		}
+	}
+	return &zfs.FilesystemVersion{
+		Type: v.Type.ZFSVersionType(),
+		Name: v.Name,
+		Guid: v.Guid,
+		CreateTXG: v.CreateTXG,
+		Creation: ct,
+	}
+}

replication/pdu/pdu_test.go

@@ -0,0 +1,64 @@
+package pdu
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestFilesystemVersion_RelName(t *testing.T) {
+
+	type TestCase struct {
+		In FilesystemVersion
+		Out string
+		Panic bool
+	}
+
+	tcs := []TestCase{
+		{
+			In: FilesystemVersion{
+				Type: FilesystemVersion_Snapshot,
+				Name: "foobar",
+			},
+			Out: "@foobar",
+		},
+		{
+			In: FilesystemVersion{
+				Type: FilesystemVersion_Bookmark,
+				Name: "foobar",
+			},
+			Out: "#foobar",
+		},
+		{
+			In: FilesystemVersion{
+				Type: 2342,
+				Name: "foobar",
+			},
+			Panic: true,
+		},
+	}
+
+	for _, tc := range tcs {
+		if tc.Panic {
+			assert.Panics(t, func() {
+				tc.In.RelName()
+			})
+		} else {
+			o := tc.In.RelName()
+			assert.Equal(t, tc.Out, o)
+		}
+	}
+
+}
+
+func TestFilesystemVersion_ZFSFilesystemVersion(t *testing.T) {
+
+	empty := &FilesystemVersion{}
+	emptyZFS := empty.ZFSFilesystemVersion()
+	assert.Zero(t, emptyZFS.Creation)
+
+	dateInvalid := &FilesystemVersion{Creation:"foobar"}
+	assert.Panics(t, func() {
+		dateInvalid.ZFSFilesystemVersion()
+	})
+
+}