Skip to content

Commit

Permalink
add integration tests for ocm storage driver
Browse files Browse the repository at this point in the history
  • Loading branch information
@gmgigi96
gmgigi96 committed Feb 20, 2023
1 parent 5353435 commit 683803c
Show file tree
Hide file tree
Showing 3 changed files with 255 additions and 4 deletions.
15 changes: 15 additions & 0 deletions tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-grpc.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ocminvitemanagersvc = "{{grpc_address}}"
ocmproviderauthorizersvc = "{{grpc_address}}"
ocmshareprovidersvc = "{{grpc_address}}"
ocmcoresvc = "{{grpc_address}}"
datagateway = "http://{{cesnethttp_address}}/datagateway"

[grpc.services.authregistry]
driver = "static"
Expand Down Expand Up @@ -56,3 +57,17 @@ driver = "json"

[grpc.services.userprovider.drivers.json]
users = "fixtures/ocm-users.demo.json"

[grpc.services.storageregistry]
[grpc.services.storageregistry.drivers.static]
[grpc.services.storageregistry.drivers.static.rules]
"/ocm" = {"address" = "{{grpc_address}}"}
"984e7351-2729-4417-99b4-ab5e6d41fa97" = {"address" = "{{grpc_address}}"}

[grpc.services.storageprovider]
driver = "ocm"
mount_path = "/ocm"
mount_id = "984e7351-2729-4417-99b4-ab5e6d41fa97"
data_server_url = "http://{{cesnethttp_address}}/data"

[grpc.services.storageprovider.drivers.ocm]
9 changes: 8 additions & 1 deletion tests/integration/grpc/fixtures/ocm-share/ocm-server-cesnet-http.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,11 @@ address = "{{grpc_address}}"
driver = "json"

[http.middlewares.providerauthorizer.drivers.json]
providers = "fixtures/ocm-providers.demo.json"
providers = "fixtures/ocm-providers.demo.json"

[http.services.datagateway]

[http.services.dataprovider]
driver = "ocm"

[http.services.dataprovider.drivers.ocm]
235 changes: 232 additions & 3 deletions tests/integration/grpc/ocm_share_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"context"
"io"
"net/http"
"path/filepath"
"strconv"
"strings"

Expand All @@ -47,6 +48,22 @@ import (
"github.com/studio-b12/gowebdav"
)

var (
editorPermissions = &provider.ResourcePermissions{
InitiateFileDownload: true,
InitiateFileUpload: true,
ListContainer: true,
GetPath: true,
Stat: true,
}
viewerPermissions = &provider.ResourcePermissions{
Stat: true,
InitiateFileDownload: true,
GetPath: true,
ListContainer: true,
}
)

var _ = Describe("ocm share", func() {
var (
revads = map[string]*Revad{}
Expand Down Expand Up @@ -211,6 +228,30 @@ var _ = Describe("ocm share", func() {
// TODO: enable once we don't send anymore the owner token
// err = webdavClient.Write(".", []byte("will-never-be-written"), 0)
// Expect(err).To(HaveOccurred())

By("marie access the share using the ocm mount")
ref := &provider.Reference{Path: ocmPath(share.Id, "")}
statRes, err := cesnetgw.Stat(ctxMarie, &provider.StatRequest{Ref: ref})
Expect(err).ToNot(HaveOccurred())
Expect(statRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK))
checkResourceInfo(statRes.Info, &provider.ResourceInfo{
Id: &provider.ResourceId{
StorageId: "984e7351-2729-4417-99b4-ab5e6d41fa97",
OpaqueId: share.Id.OpaqueId + ":/",
},
Name: "new-file",
Path: ocmPath(share.Id, ""),
Size: 4,
Type: provider.ResourceType_RESOURCE_TYPE_FILE,
PermissionSet: viewerPermissions,
})

data, err := helpers.Dowload(ctxMarie, cesnetgw, ref)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal([]byte("test")))

// TODO: enable once we don't send anymore the owner token
// Expect(helpers.UploadGateway(ctxMarie, cesnetgw, ref, []byte("will-never-be-written"))).ToNot(Succeed())
})
})

Expand Down Expand Up @@ -273,6 +314,32 @@ var _ = Describe("ocm share", func() {
newContent, err := download(ctxEinstein, cernboxgw, fileToShare)
Expect(err).ToNot(HaveOccurred())
Expect(newContent).To(Equal([]byte("new-content")))

By("marie access the share using the ocm mount")
ref := &provider.Reference{Path: ocmPath(share.Id, "")}
statRes, err := cesnetgw.Stat(ctxMarie, &provider.StatRequest{Ref: ref})
Expect(err).ToNot(HaveOccurred())
Expect(statRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK))
checkResourceInfo(statRes.Info, &provider.ResourceInfo{
Id: &provider.ResourceId{
StorageId: "984e7351-2729-4417-99b4-ab5e6d41fa97",
OpaqueId: share.Id.OpaqueId + ":/",
},
Name: "new-file",
Path: ocmPath(share.Id, ""),
Size: uint64(len(data)),
Type: provider.ResourceType_RESOURCE_TYPE_FILE,
PermissionSet: editorPermissions,
})

data, err = helpers.Dowload(ctxMarie, cesnetgw, ref)
Expect(err).ToNot(HaveOccurred())
Expect(data).To(Equal([]byte("new-content")))

Expect(helpers.UploadGateway(ctxMarie, cesnetgw, ref, []byte("uploaded-from-ocm-mount"))).To(Succeed())
newContent, err = download(ctxEinstein, cernboxgw, fileToShare)
Expect(err).ToNot(HaveOccurred())
Expect(newContent).To(Equal([]byte("uploaded-from-ocm-mount")))
})
})

Expand All @@ -282,7 +349,12 @@ var _ = Describe("ocm share", func() {
"foo": helpers.File{
Content: "foo",
},
"dir": helpers.Folder{},
"dir": helpers.Folder{
"foo": helpers.File{
Content: "dir/foo",
},
"bar": helpers.Folder{},
},
}
fileToShare := &provider.Reference{Path: "/home/ocm-share-folder"}
Expect(helpers.CreateStructure(ctxEinstein, cernboxgw, fileToShare.Path, structure)).To(Succeed())
Expand Down Expand Up @@ -336,6 +408,42 @@ var _ = Describe("ocm share", func() {

// By("check that marie does not have permissions to create files")
// Expect(webdavClient.Write("new-file", []byte("new-file"), 0)).ToNot(Succeed())

By("marie access the share using the ocm mount")
ref := &provider.Reference{Path: ocmPath(share.Id, "dir")}
listFolderRes, err := cesnetgw.ListContainer(ctxMarie, &provider.ListContainerRequest{
Ref: ref,
})
Expect(err).ToNot(HaveOccurred())
Expect(listFolderRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK))
checkResourceInfoList(listFolderRes.Infos, []*provider.ResourceInfo{
{
Id: &provider.ResourceId{
StorageId: "984e7351-2729-4417-99b4-ab5e6d41fa97",
OpaqueId: share.Id.OpaqueId + ":/dir/foo",
},
Name: "foo",
Path: ocmPath(share.Id, "dir/foo"),
Size: 7,
Type: provider.ResourceType_RESOURCE_TYPE_FILE,
PermissionSet: viewerPermissions,
},
{
Id: &provider.ResourceId{
StorageId: "984e7351-2729-4417-99b4-ab5e6d41fa97",
OpaqueId: share.Id.OpaqueId + ":/dir/bar",
},
Name: "bar",
Path: ocmPath(share.Id, "dir/bar"),
Size: 0,
Type: provider.ResourceType_RESOURCE_TYPE_CONTAINER,
PermissionSet: viewerPermissions,
},
})

// TODO: enable once we don't send anymore the owner token
// newFile := &provider.Reference{Path: ocmPath(share.Id, "dir/new")}
// Expect(helpers.UploadGateway(ctxMarie, cesnetgw, newFile, []byte("uploaded-from-ocm-mount"))).ToNot(Succeed())
})
})

Expand All @@ -345,7 +453,12 @@ var _ = Describe("ocm share", func() {
"foo": helpers.File{
Content: "foo",
},
"dir": helpers.Folder{},
"dir": helpers.Folder{
"foo": helpers.File{
Content: "dir/foo",
},
"bar": helpers.Folder{},
},
}
fileToShare := &provider.Reference{Path: "/home/ocm-share-folder"}

Expand Down Expand Up @@ -403,7 +516,91 @@ var _ = Describe("ocm share", func() {
"foo": helpers.File{
Content: "foo",
},
"dir": helpers.Folder{},
"dir": helpers.Folder{
"foo": helpers.File{
Content: "dir/foo",
},
"bar": helpers.Folder{},
},
"new-file": helpers.File{
Content: "new-file",
},
}))

By("marie access the share using the ocm mount")
ref := &provider.Reference{Path: ocmPath(share.Id, "dir")}
listFolderRes, err := cesnetgw.ListContainer(ctxMarie, &provider.ListContainerRequest{
Ref: ref,
})
Expect(err).ToNot(HaveOccurred())
Expect(listFolderRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK))
checkResourceInfoList(listFolderRes.Infos, []*provider.ResourceInfo{
{
Id: &provider.ResourceId{
StorageId: "984e7351-2729-4417-99b4-ab5e6d41fa97",
OpaqueId: share.Id.OpaqueId + ":/dir/foo",
},
Name: "foo",
Path: ocmPath(share.Id, "dir/foo"),
Size: 7,
Type: provider.ResourceType_RESOURCE_TYPE_FILE,
PermissionSet: editorPermissions,
},
{
Id: &provider.ResourceId{
StorageId: "984e7351-2729-4417-99b4-ab5e6d41fa97",
OpaqueId: share.Id.OpaqueId + ":/dir/bar",
},
Name: "bar",
Path: ocmPath(share.Id, "dir/bar"),
Size: 0,
Type: provider.ResourceType_RESOURCE_TYPE_CONTAINER,
PermissionSet: editorPermissions,
},
})

// create a new file
newFile := &provider.Reference{Path: ocmPath(share.Id, "dir/new-file")}
Expect(helpers.UploadGateway(ctxMarie, cesnetgw, newFile, []byte("uploaded-from-ocm-mount"))).To(Succeed())
Expect(helpers.SameContentWebDAV(webdavClient, fileToShare.Path, helpers.Folder{
"foo": helpers.File{
Content: "foo",
},
"dir": helpers.Folder{
"foo": helpers.File{
Content: "dir/foo",
},
"bar": helpers.Folder{},
"new-file": helpers.File{
Content: "uploaded-from-ocm-mount",
},
},
"new-file": helpers.File{
Content: "new-file",
},
}))

// create a new directory
newDir := &provider.Reference{Path: ocmPath(share.Id, "dir/new-dir")}
createDirRes, err := cesnetgw.CreateContainer(ctxMarie, &provider.CreateContainerRequest{
Ref: newDir,
})
Expect(err).ToNot(HaveOccurred())
Expect(createDirRes.Status.Code).To(Equal(rpcv1beta1.Code_CODE_OK))
Expect(helpers.SameContentWebDAV(webdavClient, fileToShare.Path, helpers.Folder{
"foo": helpers.File{
Content: "foo",
},
"dir": helpers.Folder{
"foo": helpers.File{
Content: "dir/foo",
},
"bar": helpers.Folder{},
"new-file": helpers.File{
Content: "uploaded-from-ocm-mount",
},
"new-dir": helpers.Folder{},
},
"new-file": helpers.File{
Content: "new-file",
},
Expand Down Expand Up @@ -527,3 +724,35 @@ func download(ctx context.Context, gw gatewaypb.GatewayAPIClient, ref *provider.

return io.ReadAll(httpRes.Body)
}

func ocmPath(id *ocmv1beta1.ShareId, p string) string {
return filepath.Join("/ocm", id.OpaqueId, p)
}

func checkResourceInfo(info, target *provider.ResourceInfo) {
Expect(info.Id).To(Equal(target.Id))
Expect(info.Name).To(Equal(target.Name))
Expect(info.Path).To(Equal(target.Path))
Expect(info.Size).To(Equal(target.Size))
Expect(info.Type).To(Equal(target.Type))
Expect(info.PermissionSet).To(Equal(target.PermissionSet))
}

func mapResourceInfos(l []*provider.ResourceInfo) map[string]*provider.ResourceInfo {
m := make(map[string]*provider.ResourceInfo)
for _, e := range l {
m[e.Path] = e
}
return m
}

func checkResourceInfoList(l1, l2 []*provider.ResourceInfo) {
m1, m2 := mapResourceInfos(l1), mapResourceInfos(l2)
Expect(l1).To(HaveLen(len(l2)))

for k, ri1 := range m1 {
ri2, ok := m2[k]
Expect(ok).To(BeTrue())
checkResourceInfo(ri1, ri2)
}
}

0 comments on commit 683803c

Please sign in to comment.