Skip to contentSkip to conversation

4.1 server tests: new helper new_pnfs_client_session for pnfs client

PATCH In review Kinglong Mee 1 participant 1 message Mar 30, 2015

Subsystems (2)
NFS client NFS server
lore
Share & tools
lore

Kinglong Mee

author
#0 lore raw

PATCH 2/3 4.1 server tests: new helper new_pnfs_client_session for pnfs client

Signed-off-by Kinglong Mee <[email protected]>
---
 nfs4.1/nfs4client.py                       |  9 +++++
 nfs4.1/server41tests/st_block.py           | 12 +++----
 nfs4.1/server41tests/st_current_stateid.py |  6 ++--
 nfs4.1/server41tests/st_debug.py           | 12 ++-----
 nfs4.1/server41tests/st_getdevicelist.py   | 54 +++++-------------------------
 5 files changed, 26 insertions(+), 67 deletions(-)
nfs4.1/nfs4client.py +9 -0
index 9ffe310..62ccc3a 100644
@@ -297,6 +297,15 @@ class NFS4Client(rpc.Client, rpc.Server):
         s.compound([op4.reclaim_complete(FALSE)])
         return s
 
+    def new_pnfs_client_session(self, name, flags=EXCHGID4_FLAG_USE_PNFS_MDS, sec=None):
+        # Make sure E_ID returns MDS capabilities
+        c = self.new_client(name, flags=flags)
+        if not c.flags & EXCHGID4_FLAG_USE_PNFS_MDS:
+            fail("Server can not be used as pnfs metadata server")
+        s = c.create_session(sec=sec)
+        s.compound([op4.reclaim_complete(FALSE)])
+        return s
+
     def create_tag(self):
         current_stack = inspect.stack()
         stackid = 0
nfs4.1/server41tests/st_block.py +4 -8
index a8c43dc..bf968f9 100644
@@ -15,8 +15,7 @@ def testStateid1(t, env):
     FLAGS: block
     CODE: BLOCK1
     """
-    sess = env.c1.new_client_session(env.testname(t),
-                                        flags=EXCHGID4_FLAG_USE_PNFS_MDS)
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
     # Create the file
     res = create_file(sess, env.testname(t))
     check(res)

@@ -57,8 +56,7 @@ def testStateid2(t, env):
     FLAGS: block
     CODE: BLOCK2
     """
-    c1 = env.c1.new_client_session(env.testname(t),
-                                    flags=EXCHGID4_FLAG_USE_PNFS_MDS)
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
     # Create the file
     res = create_file(sess, env.testname(t))
     check(res)

@@ -117,8 +115,7 @@ def testEmptyCommit(t, env):
     FLAGS: block
     CODE: BLOCK3
     """
-    c1 = env.c1.new_client_session(env.testname(t),
-                                    flags=EXCHGID4_FLAG_USE_PNFS_MDS)
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
     # Create the file
     res = create_file(sess, env.testname(t))
     check(res)

@@ -179,8 +176,7 @@ def testSplitCommit(t, env):
     FLAGS: block
     CODE: BLOCK4
     """
-    sess = env.c1.new_client_session(env.testname(t),
-                                        flags=EXCHGID4_FLAG_USE_PNFS_MDS)
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
     # Create the file
     res = create_file(sess, env.testname(t))
     check(res)
nfs4.1/server41tests/st_current_stateid.py +2 -4
index 98fc76f..aa1f689 100644
@@ -125,8 +125,7 @@ def testOpenLayoutGet(t, env):
     FLAGS: currentstateid pnfs
     CODE: CSID7
     """
-    sess = env.c1.new_client_session(env.testname(t),
-                                        flags=EXCHGID4_FLAG_USE_PNFS_MDS)
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
 
     open_op = open_create_file_op(sess, env.testname(t), open_create=OPEN4_CREATE)
     res = sess.compound( open_op + 

@@ -142,8 +141,7 @@ def testOpenSetattr(t, env):
     CODE: CSID8
     """
     size = 8
-    sess = env.c1.new_client_session(env.testname(t),
-                                        flags=EXCHGID4_FLAG_USE_PNFS_MDS)
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
 
     open_op = open_create_file_op(sess, env.testname(t), open_create=OPEN4_CREATE)
     res = sess.compound( open_op +
nfs4.1/server41tests/st_debug.py +2 -10
index efef6b5..233ca54 100644
@@ -94,11 +94,7 @@ def testLayout(t, env):
     FLAGS: layout all
     CODE: LAYOUT1
     """
-    # Make sure E_ID returns MDS capabilities
-    c1 = env.c1.new_client(env.testname(t), flags=EXCHGID4_FLAG_USE_PNFS_MDS)
-    if not c1.flags & EXCHGID4_FLAG_USE_PNFS_MDS:
-        fail("Server can not be used as pnfs metadata server")
-    sess = c1.create_session()
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
     # Test that fs handles block layouts
     ops = use_obj(env.opts.path) + [op.getattr(1<<FATTR4_FS_LAYOUT_TYPES)]
     res = sess.compound(ops)

@@ -126,11 +122,7 @@ def testGetDevList(t, env):
     FLAGS: layout all
     CODE: LAYOUT2
     """
-    # Make sure E_ID returns MDS capabilities
-    c1 = env.c1.new_client(env.testname(t), flags=EXCHGID4_FLAG_USE_PNFS_MDS)
-    if not c1.flags & EXCHGID4_FLAG_USE_PNFS_MDS:
-        fail("Server can not be used as pnfs metadata server")
-    sess = c1.create_session()
+    sess = env.c1.new_pnfs_client_session(env.testname(t))
     # Test that fs handles block layouts
     ops = use_obj(env.opts.path) + [op.getattr(1<<FATTR4_FS_LAYOUT_TYPES)]
     res = sess.compound(ops)
nfs4.1/server41tests/st_getdevicelist.py +9 -45

108 lines not on this page · raw message

Signature · 1 line
2.3.4