From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmccabe@sourceware.org Date: 6 Mar 2008 21:27:17 -0000 Subject: [Cluster-devel] conga/luci cluster/cluster_svc-macros cluster/ ... Message-ID: <20080306212717.32758.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 2008-03-06 21:27:16 Modified files: luci/cluster : cluster_svc-macros resource-form-macros resource_form_handlers.js luci/site/luci/Extensions: ResourceHandler.py luci/site/luci/Extensions/ClusterModel: ModelBuilder.py Log message: - UI support for the Oracle resource agent - Fix a bug that caused Sybase resources to not be displayed Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&r1=1.6&r2=1.7 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&r1=1.48&r2=1.49 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource_form_handlers.js.diff?cvsroot=cluster&r1=1.44&r2=1.45 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ResourceHandler.py.diff?cvsroot=cluster&r1=1.7&r2=1.8 http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py.diff?cvsroot=cluster&r1=1.16&r2=1.17 --- conga/luci/cluster/cluster_svc-macros 2008/03/05 23:08:57 1.6 +++ conga/luci/cluster/cluster_svc-macros 2008/03/06 21:27:16 1.7 @@ -620,6 +620,9 @@
+ +
+
--- conga/luci/cluster/resource-form-macros 2008/03/05 23:08:57 1.48 +++ conga/luci/cluster/resource-form-macros 2008/03/06 21:27:16 1.49 @@ -147,6 +147,7 @@ + @@ -169,6 +170,7 @@
+
@@ -198,6 +200,7 @@ + @@ -244,6 +247,7 @@
+
@@ -1318,6 +1322,87 @@
+
+

Oracle 10g Failover Instance

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Instance name (SID) of Oracle instance + +
Oracle user name + +
Oracle application home directory + +
Virtual hostname (optional) + +
+ +
+ +
+

Sybase ASE Failover Instance Configuration

@@ -1447,8 +1532,8 @@ value res/attrs/deep_probe_timeout | nothing" /> - +
--- conga/luci/cluster/resource_form_handlers.js 2008/03/05 23:08:57 1.44 +++ conga/luci/cluster/resource_form_handlers.js 2008/03/06 21:27:16 1.45 @@ -255,6 +255,11 @@ return (errors); } +function validate_oracle(form) { + var errors = new Array(); + return (errors); +} + function validate_sapdatabase(form) { var errors = new Array(); @@ -301,6 +306,7 @@ form_validators['SAPInstance'] = validate_sapinstance; form_validators['SAPDatabase'] = validate_sapdatabase; form_validators['ASEHAagent'] = validate_sybase; +form_validators['oracledb'] = validate_oracle; function check_form(form) { var valfn = form_validators[form.type.value]; --- conga/luci/site/luci/Extensions/ResourceHandler.py 2008/03/05 23:08:58 1.7 +++ conga/luci/site/luci/Extensions/ResourceHandler.py 2008/03/06 21:27:16 1.8 @@ -786,10 +786,13 @@ params = ( ('user', 'Oracle User Name', True, None), ('home', 'Oracle Home Directory', True, None), - ('type', 'Oracle Installation Type', True, None), + #('type', 'Oracle Installation Type', True, None), ('vhost', 'Virtual Hostname', False, None) ) errors = config_resource(params, res, rname, form) + dbtype = res.getAttribute('type') + if not dbtype: + res.addAttribute('type', '10g') return errors resource_table = { --- conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py 2008/02/05 18:26:55 1.16 +++ conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py 2008/03/06 21:27:16 1.17 @@ -33,6 +33,8 @@ from Tomcat5 import Tomcat5 from SAPDatabase import SAPDatabase from SAPInstance import SAPInstance +from SybaseASE import SybaseASE +from OracleDB import OracleDB from Multicast import Multicast from FenceDaemon import FenceDaemon from FenceXVMd import FenceXVMd @@ -93,6 +95,8 @@ 'nfsclient': NFSClient, 'SAPDatabase': SAPDatabase, 'SAPInstance': SAPInstance, + 'ASEHAagent': SybaseASE, + 'oracledb': OracleDB, 'device': Device }