core: test: Fix NfsServerV3READDIR_3Test, NfsServerV3READDIRPLUS_3Test

These two tests heavily use mock code and directly interact with NFS
internals.

With the combination of FileHandle and Inode, a discrepancy of expected
NFS handles was uncovered -- the NFS handle shown to clients has an
exportId of 1 (via PseudoFS), whereas the underlying handle does not.

This now creates a test error because these two Inodes are different,
and mocking code only returns a value for an exact sequence of bytes.

Change the test such that all calls to NfsServerV3.NFSPROC3_READDIR* use
the public-facing Inode (with exportId 1), and all the other code the
underlying inode (with exportId=0/unset).

Related: #149
Signed-off-by: Christian Kohlschütter <[email protected]>

Author: kohlschuetter

core/src/test/java/org/dcache/nfs/v3/NfsServerV3READDIRPLUS_3Test.java

@@ -34,13 +34,15 @@
 
 public class NfsServerV3READDIRPLUS_3Test {
     private Inode dirInode;
+    private Inode dirInodePseudoFS;
     private Stat dirStat;
     private VirtualFileSystem vfs;
     private NfsServerV3 nfsServer;
 
     @Before
     public void setup() throws Exception {
-        dirInode = new Inode(0, 1, 0, new byte[] {0, 0, 0, 1}); // the dir we want to read;
+        dirInode = Inode.forFile(new byte[] {0, 0, 0, 1}); // the dir we want to read;
+        dirInodePseudoFS = new Inode(0, 1, 0, new byte[] {0, 0, 0, 1}); // the handle as seen from the outside
         dirStat = new Stat(); // the stat marking it as a dir
         // noinspection OctalInteger
         dirStat.setMode(Stat.S_IFDIR | 0755);
@@ -72,7 +74,7 @@ public void testReadDirWithNoResults() throws Exception {
 
         // set up and execute the call
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInode);
+        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInodePseudoFS);
         READDIRPLUS3res result = nfsServer.NFSPROC3_READDIRPLUS_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status);
@@ -94,7 +96,7 @@ public void testReadDirWithTinyLimit() throws Exception {
 
         // set up and execute the 1st call - no cookie, but very tight size limit
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInode, 10); // 10 bytes - not enough for anything
+        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInodePseudoFS, 10); // 10 bytes - not enough for anything
         READDIRPLUS3res result = nfsServer.NFSPROC3_READDIRPLUS_3(call, args);
 
         Assert.assertEquals(nfsstat.NFSERR_TOOSMALL, result.status); // error response
@@ -113,7 +115,7 @@ public void testContinueReadingAfterEOF() throws Exception {
 
         // set up and execute the 1st call - no cookie, but very tight size limit
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInode);
+        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInodePseudoFS);
         READDIRPLUS3res result = nfsServer.NFSPROC3_READDIRPLUS_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status); // response ok
@@ -123,7 +125,7 @@ public void testContinueReadingAfterEOF() throws Exception {
         // re-read after EOF
         long cookie = result.resok.reply.entries.nextentry.cookie.value.value;
         cookieVerifier = result.resok.cookieverf.value;
-        args = NfsV3Ops.readDirPlus(dirInode, cookie, cookieVerifier);
+        args = NfsV3Ops.readDirPlus(dirInodePseudoFS, cookie, cookieVerifier);
         result = nfsServer.NFSPROC3_READDIRPLUS_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status); // response ok
@@ -146,7 +148,7 @@ public void testSemiValidVerifier() throws Exception {
         long cookie = 1;
 
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInode, cookie, cookieVerifier);
+        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInodePseudoFS, cookie, cookieVerifier);
         READDIRPLUS3res result = nfsServer.NFSPROC3_READDIRPLUS_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status); // error response
@@ -170,7 +172,7 @@ public void testEofIfLastEntryDoesNotFit() throws Exception {
         when(vfs.list(eq(dirInode), any(), anyLong())).thenReturn(new DirectoryStream(cookieVerifier, dirContents));
 
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInode, 0, cookieVerifier, 3480, 1024); // only 22 entries will
+        READDIRPLUS3args args = NfsV3Ops.readDirPlus(dirInodePseudoFS, 0, cookieVerifier, 3480, 1024); // only 22 entries will
                                                                                                 // fit
         READDIRPLUS3res result = nfsServer.NFSPROC3_READDIRPLUS_3(call, args);
 

core/src/test/java/org/dcache/nfs/v3/NfsServerV3READDIR_3Test.java

@@ -35,13 +35,15 @@
 public class NfsServerV3READDIR_3Test {
 
     private Inode dirInode;
+    private Inode dirInodePseudoFS;
     private Stat dirStat;
     private VirtualFileSystem vfs;
     private NfsServerV3 nfsServer;
 
     @Before
     public void setup() throws Exception {
-        dirInode = new Inode(0, 1, 0, new byte[] {0, 0, 0, 1}); // the dir we want to read
+        dirInode = Inode.forFile(new byte[] {0, 0, 0, 1}); // the dir we want to read;
+        dirInodePseudoFS = new Inode(0, 1, 0, new byte[] {0, 0, 0, 1}); // the handle as seen from the outside
         dirStat = new Stat(); // the stat marking it as a dir
         // noinspection OctalInteger
         dirStat.setMode(Stat.S_IFDIR | 0755);
@@ -73,7 +75,7 @@ public void testReadDirWithNoResults() throws Exception {
 
         // set up and execute the call
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIR3args args = NfsV3Ops.readDir(dirInode);
+        READDIR3args args = NfsV3Ops.readDir(dirInodePseudoFS);
         READDIR3res result = nfsServer.NFSPROC3_READDIR_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status);
@@ -93,7 +95,7 @@ public void testReadDirWithTinyLimit() throws Exception {
 
         // set up and execute the 1st call - no cookie, but very tight size limit
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIR3args args = NfsV3Ops.readDir(dirInode, 10); // 10 bytes - not enough for anything
+        READDIR3args args = NfsV3Ops.readDir(dirInodePseudoFS, 10); // 10 bytes - not enough for anything
         READDIR3res result = nfsServer.NFSPROC3_READDIR_3(call, args);
 
         Assert.assertEquals(nfsstat.NFSERR_TOOSMALL, result.status); // error response
@@ -112,7 +114,7 @@ public void testContinueReadingAfterEOF() throws Exception {
 
         // set up and execute the 1st call - no cookie, but very tight size limit
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIR3args args = NfsV3Ops.readDir(dirInode);
+        READDIR3args args = NfsV3Ops.readDir(dirInodePseudoFS);
         READDIR3res result = nfsServer.NFSPROC3_READDIR_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status); // response ok
@@ -122,7 +124,7 @@ public void testContinueReadingAfterEOF() throws Exception {
         // reading after we got EOF
         long cookie = result.resok.reply.entries.nextentry.cookie.value.value;
         cookieVerifier = result.resok.cookieverf.value;
-        args = NfsV3Ops.readDir(dirInode, cookie, cookieVerifier);
+        args = NfsV3Ops.readDir(dirInodePseudoFS, cookie, cookieVerifier);
         result = nfsServer.NFSPROC3_READDIR_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status); // response ok
@@ -145,7 +147,7 @@ public void testSemiValidVerifier() throws Exception {
         long cookie = 1;
 
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIR3args args = NfsV3Ops.readDir(dirInode, cookie, cookieVerifier);
+        READDIR3args args = NfsV3Ops.readDir(dirInodePseudoFS, cookie, cookieVerifier);
         READDIR3res result = nfsServer.NFSPROC3_READDIR_3(call, args);
 
         Assert.assertEquals(nfsstat.NFS_OK, result.status); // error response
@@ -169,7 +171,7 @@ public void testEofIfLastEntryDoesNotFit() throws Exception {
         when(vfs.list(eq(dirInode), any(), anyLong())).thenReturn(new DirectoryStream(cookieVerifier, dirContents));
 
         RpcCall call = new RpcCallBuilder().from("1.2.3.4", "someHost.acme.com", 42).nfs3().noAuth().build();
-        READDIR3args args = NfsV3Ops.readDir(dirInode, 0, cookieVerifier, 836); // only 22 entries will fit
+        READDIR3args args = NfsV3Ops.readDir(dirInodePseudoFS, 0, cookieVerifier, 836); // only 22 entries will fit
         READDIR3res result = nfsServer.NFSPROC3_READDIR_3(call, args);
 
         int n = 0;