From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci cluster/cluster_svc-macros cluster/ ...
Date: 6 Mar 2008 21:27:17 -0000 [thread overview]
Message-ID: <20080306212717.32758.qmail@sourceware.org> (raw)
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 @@
<tal:block tal:condition="python: type == 'ASEHAagent'">
<div metal:use-macro="here/resource-form-macros/macros/ASEHAagent_macro" />
</tal:block>
+ <tal:block tal:condition="python: type == 'oracledb'">
+ <div metal:use-macro="here/resource-form-macros/macros/oracledb_macro" />
+ </tal:block>
</div>
<div metal:define-macro="service-config-head-macro" tal:omit-tag="">
--- 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 @@
<option name="SAPDatabase" value="SAPDatabase">SAP Database</option>
<option name="SAPInstance" value="SAPInstance">SAP Instance</option>
<option name="ASEHAagent" value="ASEHAagent">Sybase ASE Failover Instance</option>
+ <option name="oracledb" value="oracledb">Oracle 10g Failover Instance</option>
</select>
</form>
@@ -169,6 +170,7 @@
<div metal:use-macro="here/resource-form-macros/macros/SAPInstance_macro" />
<div metal:use-macro="here/resource-form-macros/macros/SAPDatabase_macro" />
<div metal:use-macro="here/resource-form-macros/macros/ASEHAagent_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/oracledb_macro" />
</div>
</div>
@@ -198,6 +200,7 @@
<option name="SAPDatabase" value="SAPDatabase">SAP Database</option>
<option name="SAPInstance" value="SAPInstance">SAP Instance</option>
<option name="ASEHAagent" value="ASEHAagent">Sybase ASE Failover Instance</option>
+ <option name="oracledb" value="oracledb">Oracle 10g Failover Instance</option>
</select>
</form>
@@ -244,6 +247,7 @@
<div metal:use-macro="here/resource-form-macros/macros/SAPInstance_macro" />
<div metal:use-macro="here/resource-form-macros/macros/SAPDatabase_macro" />
<div metal:use-macro="here/resource-form-macros/macros/ASEHAagent_macro" />
+ <div metal:use-macro="here/resource-form-macros/macros/oracledb_macro" />
</div>
</div>
@@ -1318,6 +1322,87 @@
</form>
</div>
+<div class="rescfg" name="oracledb"
+ tal:attributes="id res/name | nothing" metal:define-macro="oracledb_macro">
+ <p class="reshdr">Oracle 10g Failover Instance</p>
+
+ <form method="post"
+ tal:attributes="name res/parent_uuid | nothing"
+ tal:define="editDisabled resourceIsRef | nothing">
+
+ <input name="immutable" type="hidden" value="true"
+ tal:condition="editDisabled" />
+
+ <input name="edit" type="hidden" value="true"
+ tal:condition="python: ptype == '33' and True or False" />
+
+ <input name="pagetype" type="hidden"
+ tal:attributes="value python: ptype" />
+
+ <input name="global" type="hidden"
+ tal:attributes="value resourceIsRef | nothing" />
+
+ <input name="parent_uuid" type="hidden"
+ tal:attributes="value res/parent_uuid | nothing" />
+
+ <input name="uuid" type="hidden"
+ tal:attributes="value res/uuid | nothing" />
+
+ <input name="tree_level" type="hidden"
+ tal:attributes="value res/indent_ctr | string:0" />
+
+ <input name="clustername" type="hidden"
+ tal:attributes="
+ value request/clustername | request/form/clustername | nothing" />
+
+ <input name="oldname" type="hidden"
+ tal:attributes="value res/name | nothing" />
+
+ <input name="type" type="hidden" value="oracledb" />
+
+ <table class="systemsTable">
+ <tr class="systemsTable">
+ <td class="systemsTable">Instance name (SID) of Oracle instance</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="resourcename"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/name | nothing" />
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Oracle user name</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="user"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/user | nothing" />
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Oracle application home directory</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="home"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/home | nothing" />
+ </td>
+ </tr>
+ <tr class="systemsTable">
+ <td class="systemsTable">Virtual hostname (optional)</td>
+ <td class="systemsTable">
+ <input type="text" size="20" name="vhost"
+ tal:attributes="
+ disabled python: editDisabled;
+ value res/vhost | nothing" />
+ </td>
+ </tr>
+ </table>
+
+ <div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
+ </form>
+</div>
+
<div class="rescfg" name="ASEHAagent"
tal:attributes="id res/name | nothing" metal:define-macro="ASEHAagent_macro">
<p class="reshdr">Sybase ASE Failover Instance Configuration</p>
@@ -1447,8 +1532,8 @@
value res/attrs/deep_probe_timeout | nothing" />
</td>
</tr>
-
</table>
+
<div metal:use-macro="here/resource-form-macros/macros/res_form_footer" />
</form>
</div>
--- 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 }
next reply other threads:[~2008-03-06 21:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-06 21:27 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-25 15:54 [Cluster-devel] conga/luci cluster/cluster_svc-macros cluster/ rmccabe
2008-03-05 23:09 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080306212717.32758.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.