[Ocfs2-test-devel] [PATCH 09/11] cross_delete

[Marcos Matsunaga]

ocfs2-test: changed to accept an alternate NIC to be used by the test.

- Added Tristan description of the -i argument.

Signed-off-by: Marcos Matsunaga <Marcos.Matsunaga at oracle.com>
Signed-off-by: Tristan Ye <tristan.ye at oracle.com>
---
 programs/cross_delete/crdel_gen_files.py |    2 +-
 programs/cross_delete/cross_delete.py    |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/programs/cross_delete/crdel_gen_files.py b/programs/cross_delete/crdel_gen_files.py
index f076f43..3691548 100755
--- a/programs/cross_delete/crdel_gen_files.py
+++ b/programs/cross_delete/crdel_gen_files.py
@@ -141,7 +141,7 @@ if DEBUGON:
 o2tf.CreateDir(DEBUGON, string.join(dirlist,','), logfile)
 #
 for i in range(dirlen):
-	o2tf.untar(DEBUGON, dirlist[i], tarfile, logfile)
+	o2tf.untar(DEBUGON, dirlist[i], tarfile, logfile, '1')
 #
 # Remove the workfile after it is done.
 #
diff --git a/programs/cross_delete/cross_delete.py b/programs/cross_delete/cross_delete.py
index 483bbe5..4577d70 100755
--- a/programs/cross_delete/cross_delete.py
+++ b/programs/cross_delete/cross_delete.py
@@ -154,6 +154,7 @@ def Cleanup(ret):
 #
 Usage = 'usage: %prog [-c|count count] \
 [-d|--dirlist dirlist] \
+[-i|--if <Network Interface>] \
 [-l|-logfile logfilename] \
 [-n|nodes nodelist] \
 [-t|--tarfile fullpath tar filename] \
@@ -174,6 +175,12 @@ if __name__=='__main__':
 		type='string',
 		help='Directory where the files will be extracted.')
 #
+        parser.add_option('-i',
+                '--if',
+                dest='interface',
+                type='string',
+                help='Network Interface name to be used for MPI messaging.')
+#
 	parser.add_option('-l',
 		'--logfile',
 		dest='logfile',
@@ -206,6 +213,7 @@ if __name__=='__main__':
 	count = options.count
 	dirlist = options.dirlist.split(',')
 	dirlen = len(dirlist)
+	interface = options.interface
 	nodelist = options.nodes.split(',')
 	nodelen = len(nodelist)
 	logfile = options.logfile
@@ -300,6 +308,7 @@ for y in range(count):
 		tarfile) ),
 		','.join(nodelist),
 		'ssh',
+		options.interface,
 		logfile,
 		'WAIT')
 	if not ret:
@@ -318,6 +327,7 @@ for y in range(count):
 		','.join(nodelist),
 		'ssh',
 		logfile,
+		options.interface,
 		'WAIT')
 	if not ret:
 		o2tf.printlog(
-- 
1.5.6.5