From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 7 Feb 2007 22:06:41 -0000 Subject: [Cluster-devel] conga ./.cvsignore luci/cluster/form-macros lu ... Message-ID: <20070207220641.10064.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-02-07 22:06:40 Modified files: . : .cvsignore luci/cluster : form-macros luci/site/luci/Extensions: cluster_adapters.py Added files: luci/cluster : validate_fdom.js Log message: fdom front-end code Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/.cvsignore.diff?cvsroot=cluster&r1=1.4&r2=1.5 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/validate_fdom.js.diff?cvsroot=cluster&r1=NONE&r2=1.1 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.179&r2=1.180 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.231&r2=1.232 --- conga/.cvsignore 2007/01/23 22:32:29 1.4 +++ conga/.cvsignore 2007/02/07 22:06:40 1.5 @@ -1,13 +1,10 @@ -Plone-2.5.tar.gz -Plone-2.5.2-1.tar.gz -Zope-2.9.3.tgz -Zope-2.9.4-final.tgz +Plone-*.tar.gz +Zope-*.tgz conga.spec.in conga.spec clustermon.spec.in clustermon.spec -clustermon-*.src.rpm +clustermon-*.rpm clustermon-*.tar.gz -conga-*.src.rpm +conga-*.rpm conga-*.tar.gz - /cvs/cluster/conga/luci/cluster/validate_fdom.js,v --> standard output revision 1.1 --- conga/luci/cluster/validate_fdom.js +++ - 2007-02-07 22:06:41.540519000 +0000 @@ -0,0 +1,25 @@ +function fdom_set_prioritized(form, state) { + var prilist = form.getElementsByTagName('input'); + if (!prilist) + return (-1); + for (var i = 0 ; i < prilist.length ; i++) { + if (prilist[i].type == 'text' && prilist[i].className == 'fdom_priority') + prilist[i].disabled = state; + } +} + +function validate_add_fdom(form) { + var errors = new Array(); + + if (!form.name || str_is_blank(fdom.name.value)) { + set_form_err(form.name); + errors.append('No name was given for this failover domain.'); + } else + clr_form_err(form.name); + + if (error_dialog(errors)) + return (-1); + + if (confirm('Add this failover domain?')) + form.submit(); +} --- conga/luci/cluster/form-macros 2007/02/07 17:18:42 1.179 +++ conga/luci/cluster/form-macros 2007/02/07 22:06:40 1.180 @@ -944,7 +944,8 @@ - Run XVM fence daemon + + Run XVM fence daemon @@ -4321,12 +4322,95 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Failover Domain Name + +
Prioritized + +
Restrict failover to this domain's members + +
+

+

Failover domain membership

+
+
+ +
+
NodeMemberPriority
+ + + + + +
+
+ + +
-

Failover Domain Add Form

- + +

Add a Failover Domain

+
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/07 22:00:50 1.231 +++ conga/luci/site/luci/Extensions/cluster_adapters.py 2007/02/07 22:06:40 1.232 @@ -2247,12 +2247,11 @@ return dummynode def getnodes(self, model): - mb = model - nodes = mb.getNodes() - names = list() - for node in nodes: - names.append(node.getName()) - return names + try: + return map(lambda x: str(x.getName()), model.getNodes()) + except Exception, e: + luci_log.debug_verbose('getnodes0: %s' % str(e)) + return [] def createCluConfigTree(self, request, model): dummynode = {}