[Cluster-devel] conga/luci/site/luci/Extensions LuciValidation.py

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2008-07-31 18:46:40

Modified files:
	luci/site/luci/Extensions: LuciValidation.py 

Log message:
	Fix the fix for bz429350

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.6&r2=1.6.2.7

--- conga/luci/site/luci/Extensions/LuciValidation.py	2008/07/23 19:55:41	1.6.2.6
+++ conga/luci/site/luci/Extensions/LuciValidation.py	2008/07/31 18:46:40	1.6.2.7
@@ -1134,13 +1134,6 @@
 				errors.append('Restart expire time must be a number greater than or equal to 0')
 				restart_expire_time = None
 
-	service_name = fvar['svc_name']
-	if service_name is None:
-		if LUCI_DEBUG_MODE is True:
-			luci_log.debug_verbose('vSA5: no service name')
-		errors.append('No service name was given')
-
-
 	migration_type = fvar['migration_type']
 	if migration_type is not None and migration_type != 'live' and migration_type != 'pause':
 		errors.append('Migration type must be either "live" or "pause"')
@@ -1194,7 +1187,6 @@
 			xvm.removeAttribute('domain')
 		except:
 			pass
-
 	if recovery:
 		xvm.addAttribute('recovery', recovery)
 	else:
@@ -1202,6 +1194,10 @@
 			xvm.removeAttribute('recovery')
 		except:
 			pass
+	if max_restarts is not None:
+		xvm.addAttribute('max_restarts', str(max_restarts))
+	if restart_expire_time is not None:
+		xvm.addAttribute('restart_expire_time', str(restart_expire_time))
 
 	if delete_vm is True:
 		action = VM_CONFIG