corrections for reservation handling
git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/trunk@1375309 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/tashi/client/tashi-admin.py b/src/tashi/client/tashi-admin.py
index 12cf6ba..b7b81dc 100755
--- a/src/tashi/client/tashi-admin.py
+++ b/src/tashi/client/tashi-admin.py
@@ -131,7 +131,7 @@
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 @@
sys.exit(-1)
hostId = checkHid(options.hostname)
- rv = remoteCommand("delReservation", hostId, username)
+ rv = remoteCommand("delReservation", hostId, options.username)
print rv
return 0
diff --git a/src/tashi/clustermanager/clustermanagerservice.py b/src/tashi/clustermanager/clustermanagerservice.py
index a963555..f590b43 100644
--- a/src/tashi/clustermanager/clustermanagerservice.py
+++ b/src/tashi/clustermanager/clustermanagerservice.py
@@ -605,7 +605,6 @@
# extern
def addReservation(self, hostId, username):
- hostNotes = notes
host = self.data.acquireHost(hostId)
msg = None
try:
@@ -624,7 +623,6 @@
# extern
def delReservation(self, hostId, username):
- hostNotes = notes
host = self.data.acquireHost(hostId)
msg = None
try:
@@ -647,7 +645,7 @@
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))
