From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 24 Jan 2007 19:45:45 -0000 Subject: [Cluster-devel] conga/luci cluster/validate_config_gulm.js sit ... Message-ID: <20070124194545.28504.qmail@sourceware.org> List-Id: 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 Changes by: rmccabe at sourceware.org 2007-01-24 19:45:44 Modified files: luci/cluster : validate_config_gulm.js luci/site/luci/Extensions: Cluster.py ModelBuilder.py clui_constants.py cluster_adapters.py Log message: can't have 4 GULM lock servers Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_config_gulm.js.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/Cluster.py.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ModelBuilder.py.diff?cvsroot=cluster&r1=1.17&r2=1.18 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/clui_constants.py.diff?cvsroot=cluster&r1=1.1&r2=1.2 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.210&r2=1.211 --- conga/luci/cluster/validate_config_gulm.js 2007/01/22 21:19:29 1.1 +++ conga/luci/cluster/validate_config_gulm.js 2007/01/24 19:45:43 1.2 @@ -10,8 +10,8 @@ lscount++; } - if (lscount != 1 && lscount != 3 && lscount != 4 && lscount != 5) - errors.push('You must have exactly 1, 3, 4, or 5 GULM lockservers.'); + if (lscount != 1 && lscount != 3 && lscount != 5) + errors.push('You must have exactly 1, 3, or 5 GULM lockservers.'); if (error_dialog(errors)) return (-1); --- conga/luci/site/luci/Extensions/Cluster.py 2006/10/16 20:46:55 1.4 +++ conga/luci/site/luci/Extensions/Cluster.py 2007/01/24 19:45:44 1.5 @@ -8,7 +8,7 @@ ACTUAL_CLUSTER_NAME_DESC = "The Actual Cluster Name should be used for storage configuration, such as making a clustered file system" CLUSTER_POPULATION = "Number of Members: %d" DLM_TYPE = "Locking Type: Distributed" -GULM_TYPE = "Locking Type: GuLM" +GULM_TYPE = "Locking Type: GULM" LOCKSERVER = "Lock Server:" CONFIG_VERSION = "Config Version" MCAST_MODE = "Cluster Manager using Multicast Mode. \n Multicast Address: %s" --- conga/luci/site/luci/Extensions/ModelBuilder.py 2007/01/23 22:32:29 1.17 +++ conga/luci/site/luci/Extensions/ModelBuilder.py 2007/01/24 19:45:44 1.18 @@ -92,7 +92,7 @@ ###----------------------------------- -INVALID_GULM_COUNT="GuLM locking mechanism may consist of 1, 3, 4 or 5 locking servers. You have configured %d. Fix the error and try saving again." +INVALID_GULM_COUNT="GULM locking mechanism may consist of 1, 3, or 5 locking servers. You have configured %d. Fix the error and try saving again." class ModelBuilder: @@ -543,7 +543,7 @@ def deleteNode(self, clusternode): #1) delete node #2) delete failoverdomainnodes with same name - #3) delete lockserver nodes if GuLM + #3) delete lockserver nodes if GULM name = clusternode.getName() @@ -786,7 +786,7 @@ def isNodeLockserver(self,name): gptr = self.getGULMPtr() - if gptr == None: #Obviously not GuLM + if gptr == None: #Obviously not GULM return False children = gptr.getChildren() for child in children: @@ -797,7 +797,7 @@ def removeLockserver(self, clusternode): gptr = self.getGULMPtr() - if gptr == None: #Obviously not GuLM + if gptr == None: #Obviously not GULM return children = gptr.getChildren() for child in children: @@ -1025,7 +1025,7 @@ def check_gulm_count(self): if self.getLockType() == GULM_TYPE: gulm_count = len(self.getGULMPtr().getChildren()) - if not (gulm_count in (1, 3, 4, 5)): + if not (gulm_count in (1, 3, 5)): return False return True --- conga/luci/site/luci/Extensions/clui_constants.py 2006/05/30 20:17:21 1.1 +++ conga/luci/site/luci/Extensions/clui_constants.py 2007/01/24 19:45:44 1.2 @@ -66,7 +66,7 @@ XML_CONFIG_ERROR=_("A problem was encountered while reading configuration file %s . Details or the error appear below. Click the \'Cancel\' button to quit the application. Click the \'New\' button to create a new configuration file. To continue anyway (Not Recommended!), click the \'Ok\' button.") -SWITCH_TO_GULM=_("Change to GuLM Lockserver") +SWITCH_TO_GULM=_("Change to GULM Lockserver") SWITCH_TO_DLM=_("Change to Distributed Lock Manager") SWITCH_TO_BROADCAST=_("Change to Broadcast Mode for Cluster Manager") SWITCH_TO_MULTICAST=_("Change to Multicast Mode for Cluster Manager") --- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/01/23 13:53:36 1.210 +++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/01/24 19:45:44 1.211 @@ -1151,8 +1151,8 @@ gulm_lockservers.append(ls) num_ls = len(gulm_lockservers) - if not num_ls in (1, 3, 4, 5): - return (False, {'errors': [ 'You must have exactly 1, 3, 4, or 5 GULM lock servers. You selected %d nodes as lock servers.' % num_ls ]}) + if not num_ls in (1, 3, 5): + return (False, {'errors': [ 'You must have exactly 1, 3, or 5 GULM lock servers. You submitted %d lock servers.' % num_ls ]}) model.GULM_ptr.children = gulm_lockservers return (True, {})