From 7ab7bab50b36dd883662fbd009cd18780b4397a3 Mon Sep 17 00:00:00 2001
From: Tim <timothyasir@gluster.com>
Date: Fri, 23 Sep 2011 14:53:53 +0530
Subject: Added grun.py wrapper.

---
 .../src/common/Utils.py                             |  4 ++--
 .../src/gateway/grun.py                             | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100755 src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py

(limited to 'src')

diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
index 9a17ba7b..fc9bac5d 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
+++ b/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
@@ -306,14 +306,14 @@ def getCifsUserUid(userName):
 
 def grun(serverFile, command, argumentList=[]):
     commandList = ["%s/%s" % (commandPath, command)] + argumentList
-    serverNameList = Utils.readFile(serverFile, lines=True)
+    serverNameList = readFile(serverFile, lines=True)
     if not serverNameList:
         return 1
     status = True
     for serverName in serverNameList:
         rv = runCommand(sshCommandPrefix + [serverName.strip()] + commandList, output=True)
         if rv["Status"] != 0:
-            sys.stderr.write("%s: %s\n" % (serverName, rv["Status"]))
+            sys.stderr.write("%s: %s\n" % (serverName.strip(), rv["Status"]))
             sys.stderr.write("Stdout:\n%s\n" % rv["Stdout"])
             sys.stderr.write("Stderr:\n%s\n" % rv["Stderr"])
             sys.stderr.write("---\n")
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py b/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py
new file mode 100755
index 00000000..6519d726
--- /dev/null
+++ b/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway.
+#
+
+import os
+import sys
+p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
+p2 = "%s/common" % os.path.dirname(p1)
+if not p1 in sys.path:
+    sys.path.append(p1)
+if not p2 in sys.path:
+    sys.path.append(p2)
+import Utils
+
+
+if len(sys.argv) < 3:
+    sys.stderr.write("usage: %s SERVER_FILE COMMAND [ARGUMENTS]\n" % os.path.basename(sys.argv[0]))
+    sys.exit(-1)
+
+sys.exit(Utils.grun(sys.argv[1], sys.argv[2], sys.argv[3:]))
-- 
cgit