summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShireesh Anjal <anjalshireesh@gmail.com>2011-12-08 07:19:00 -0800
committerShireesh Anjal <anjalshireesh@gmail.com>2011-12-08 07:19:00 -0800
commite330a56bfab712af046a6ffae2beb8a4efc60ae3 (patch)
tree603cc10e29a5d793508cd7542131cf4a85e05840
parentb816816a5dc5d4ff01d0b79250c89e16d6e9cbe6 (diff)
parent7cf5f329aa930ecdecb97670b8b4c53d7c67ff69 (diff)
Merge pull request #17 from TimothyAsir/master
Fixed - Bug 3856 - add_user_cifs_all command executions shows traceback error.
-rwxr-xr-xsrc/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py7
-rwxr-xr-xsrc/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
index bdb6caa..956a9e4 100755
--- a/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
@@ -160,6 +160,8 @@ def getDiskDom():
diskTag.appendChild(diskDom.createTag("type", "BOOT"))
elif "UNINITIALIZED" == status:
diskTag.appendChild(diskDom.createTag("type", "UNKNOWN"))
+ elif "swap" == value["FsType"]:
+ diskTag.appendChild(diskDom.createTag("type", "SWAP"))
else:
diskTag.appendChild(diskDom.createTag("type", "DATA"))
diskTag.appendChild(diskDom.createTag("fsType", value["FsType"]))
@@ -182,7 +184,10 @@ def getDiskDom():
partitionTag.appendChild(diskDom.createTag("type", "BOOT"))
elif partValues["FsType"]:
partitionTag.appendChild(diskDom.createTag("status", "INITIALIZED"))
- partitionTag.appendChild(diskDom.createTag("type", "DATA"))
+ if "swap" == partValues["FsType"]:
+ partitionTag.appendChild(diskDom.createTag("type", "SWAP"))
+ else:
+ partitionTag.appendChild(diskDom.createTag("type", "DATA"))
else:
partitionTag.appendChild(diskDom.createTag("status", "UNINITIALIZED"))
partitionTag.appendChild(diskDom.createTag("type", "UNKNOWN"))
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
index 66236b5..bb17d4b 100755
--- a/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
@@ -77,7 +77,7 @@ def main():
existingUser = True
print (serverFile, uid, userName, password)
- rv = Utils.grun(serverFile, "add_user_cifs.py", [uid, userName, password])
+ rv = Utils.grun(serverFile, "add_user_cifs.py", ["%s" % uid, userName, password])
if existingUser:
sys.exit(rv)