From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 23 Jan 2009 19:33:30 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions ClusterModel/M ...
Message-ID: <20090123193330.30671.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2009-01-23 19:33:30

Modified files:
	luci/site/luci/Extensions/ClusterModel: ModelBuilder.py 
	luci/site/luci/Extensions: ResourceHandler.py 

Log message:
	fix bz460038

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.11&r2=1.1.4.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.6&r2=1.1.4.7

--- conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py	2009/01/22 21:31:41	1.1.4.11
+++ conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py	2009/01/23 19:33:29	1.1.4.12
@@ -1154,7 +1154,7 @@
         self.cluster_ptr.addChild(cman)
         self.CMAN_ptr = cman
 
-      if not self.isQuorumd():
+      if not self.quorumd_ptr:
         if clusternodes_count == 2:
           self.CMAN_ptr.addAttribute('two_node', '1')
           self.CMAN_ptr.addAttribute('expected_votes', '1')
--- conga/luci/site/luci/Extensions/ResourceHandler.py	2008/05/12 17:37:38	1.1.4.6
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2009/01/23 19:33:29	1.1.4.7
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2008 Red Hat, Inc.
+# Copyright (C) 2006-2009 Red Hat, Inc.
 #
 # This program is free software; you can redistribute
 # it and/or modify it under the terms of version 2 of the
@@ -41,13 +41,13 @@
 
 def generate_fsid(model, name):
 	import binascii
-	from random import random
+	from random import randrange
 	fsid_list = get_fsid_list(model)
 
 	fsid = binascii.crc32(name) & 0xffff
 	dupe = fsid in fsid_list
 	while dupe is True:
-		fsid = (fsid + random.randrange(1, 0xfffe)) & 0xffff
+		fsid = (fsid + randrange(1, 0xfffe)) & 0xffff
 		dupe = fsid in fsid_list
 	return fsid