[Cluster-devel] conga/luci cluster/resource-form-macros site/l ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2010-08-07 03:16:02

Modified files:
	luci/cluster   : resource-form-macros 
	luci/site/luci/Extensions: ResourceHandler.py 

Log message:
	Fix rhbz#587399 - Clarification on "type" when configuring oracledb resources

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/resource-form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.16&r2=1.21.2.17
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.9&r2=1.1.4.10

--- conga/luci/cluster/resource-form-macros	2009/05/21 13:32:04	1.21.2.16
+++ conga/luci/cluster/resource-form-macros	2010/08/07 03:16:01	1.21.2.17
@@ -1495,6 +1495,27 @@
 						value res/attrs/home | nothing" />
 			</td>
 		</tr>
+		<tr>
+			<td>Oracle installation type</td>
+			<td>
+				<select name="oracletype"
+					tal:attributes="disabled python: editDisabled"
+					tal:define="odbtype res/attrs/type | string:default">
+					<option name="default" value="default"
+						tal:content="string:Default"
+						tal:attributes="selected python:odbtype == 'default' and 'selected'"/>
+					<option value="base"
+						tal:content="string:Database Instance and Listener only"
+						tal:attributes="selected python:odbtype == 'base' and 'selected'"/>
+					<option value="base-em"
+						tal:content="string:Database, Listener, Enterprise Manager, and iSQL*Plus"
+						tal:attributes="selected python:odbtype in ('10g', 'base-em') and 'selected'"/>
+					<option value="ias"
+						tal:content="string:Internet Application Server (Infrastructure)"
+						tal:attributes="selected python:odbtype in ('ias', '10g-ias') and 'selected'"/>
+				</select>
+			</td>
+		</tr>
 		<tr class="systemsTable">
 			<td class="systemsTable">Virtual hostname (optional)</td>
 			<td class="systemsTable">
--- conga/luci/site/luci/Extensions/ResourceHandler.py	2010/01/07 18:08:35	1.1.4.9
+++ conga/luci/site/luci/Extensions/ResourceHandler.py	2010/08/07 03:16:02	1.1.4.10
@@ -804,13 +804,17 @@
 	params = (
 		('user', 'Oracle User Name', True, None),
 		('home', 'Oracle Home Directory', True, None),
-		#('type', 'Oracle Installation Type', True, None),
+		('oracletype', 'Oracle Installation Type', False, None),
 		('vhost', 'Virtual Hostname', False, None)
 	)
 	errors = config_resource(params, res, rname, form)
-	dbtype = res.getAttribute('type')
-	if not dbtype:
-		res.addAttribute('type', '10g')
+	dbtype = res.getAttribute('oracletype')
+	res.removeAttribute('type')
+	if dbtype:
+		res.removeAttribute('oracletype')
+		dbtype = dbtype.lower()
+		if dbtype in ('base', 'base-em', '10g', 'ias', '10g-ias'):
+			res.addAttribute('type', dbtype)
 	return errors
 
 resource_table = {