incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1375309 - in /incubator/tashi/trunk/src/tashi: client/tashi-admin.py clustermanager/clustermanagerservice.py
Date Mon, 20 Aug 2012 23:20:08 GMT
Author: stroucki
Date: Mon Aug 20 23:20:07 2012
New Revision: 1375309

URL: http://svn.apache.org/viewvc?rev=1375309&view=rev
Log:
corrections for reservation handling

Modified:
    incubator/tashi/trunk/src/tashi/client/tashi-admin.py
    incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py

Modified: incubator/tashi/trunk/src/tashi/client/tashi-admin.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/client/tashi-admin.py?rev=1375309&r1=1375308&r2=1375309&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/client/tashi-admin.py (original)
+++ incubator/tashi/trunk/src/tashi/client/tashi-admin.py Mon Aug 20 23:20:07 2012
@@ -131,7 +131,7 @@ def addReservation(args):
 		sys.exit(-1)
 
 	hostId = checkHid(options.hostname)
-	rv = remoteCommand("addReservation", hostId, username)
+	rv = remoteCommand("addReservation", hostId, options.username)
 	print rv
 	return 0
 
@@ -148,7 +148,7 @@ def delReservation(args):
 		sys.exit(-1)
 
 	hostId = checkHid(options.hostname)
-	rv = remoteCommand("delReservation", hostId, username)
+	rv = remoteCommand("delReservation", hostId, options.username)
 	print rv
 	return 0
 

Modified: incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py?rev=1375309&r1=1375308&r2=1375309&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/clustermanagerservice.py Mon Aug 20 23:20:07
2012
@@ -605,7 +605,6 @@ class ClusterManagerService(object):
 
 	# extern
 	def addReservation(self, hostId, username):
-		hostNotes = notes
 		host = self.data.acquireHost(hostId)
 		msg = None
 		try:
@@ -624,7 +623,6 @@ class ClusterManagerService(object):
 
 	# extern
 	def delReservation(self, hostId, username):
-		hostNotes = notes
 		host = self.data.acquireHost(hostId)
 		msg = None
 		try:
@@ -647,7 +645,7 @@ class ClusterManagerService(object):
 		users = host.reserved
 
 		if len(users) == 0:
-			return 'Host %s is not reserved for any users'
+			return 'Host %s is not reserved for any users' % (host.name)
 
 		usersstring = ', '.join(map(str, users))
 



Mime
View raw message