diff -u -r1.4.2.17 FenceHandler.py --- conga-0.12.2/luci/site/luci/Extensions/FenceHandler.py 23 Apr 2009 20:38:52 -0000 1.4.2.17 +++ conga-0.12.2/luci/site/luci/Extensions/FenceHandler.py 10 Dec 2009 08:02:51 -0000 @@ -43,6 +43,7 @@ FI_PROVIDE_EPSERVER = 'A PServer value must be provided for this Egenera Fence' FI_PROVIDE_NODENAME = 'A Node Name value must be provided for this SCSI Fence' FI_PROVIDE_PARTITION = 'A partition name must be provided for this LPAR Fence' +FI_PROVIDE_MANAGED = 'A managed system name must be provided for this LPAR Fence' ILLEGAL_CHARS_REPLACED = 'Illegal characters were replaced by underscores. Feel free to set a new value.' @@ -1252,6 +1253,14 @@ except Exception, e: errors.append(FI_PROVIDE_PARTITION) + try: + managed = form['managed'].strip() + if not managed: + raise Exception, 'blank' + fenceinst.addAttribute('managed', managed) + except Exception, e: + errors.append(FI_PROVIDE_MANAGED) + fenceinst.addAttribute('secure', '1') return errors diff -u -r1.2.2.12 fence-macros --- conga-0.12.2/luci/cluster/fence-macros 14 May 2009 21:05:58 -0000 1.2.2.12 +++ conga-0.12.2/luci/cluster/fence-macros 10 Dec 2009 08:02:51 -0000 @@ -1762,6 +1762,15 @@ </td> </tr> + <tr> + <td>Managed System</td> + <td> + <input name="managed" type="text" + tal:attributes=" + value cur_instance/managed | nothing" /> + </td> + </tr> + <tr><td colspan="2"> <div class="hbSubmit"> <tal:block tal:condition="exists:cur_fence_instance_id"> diff -u -r1.1.2.11 validate_fence.js --- conga-0.12.2/luci/cluster/validate_fence.js 23 Apr 2009 20:38:51 -0000 1.1.2.11 +++ conga-0.12.2/luci/cluster/validate_fence.js 10 Dec 2009 08:02:51 -0000 @@ -20,7 +20,7 @@ fence_inst_validator['vixel'] = [ 'port' ]; fence_inst_validator['wti'] = [ 'port', 'secure' ]; fence_inst_validator['xvm'] = [ 'domain' ]; -fence_inst_validator['lpar'] = [ 'partition' ]; +fence_inst_validator['lpar'] = [ 'partition', 'managed' ]; fence_inst_validator['vmware'] = [ 'port' ]; var fence_validator = []; @@ -150,6 +150,7 @@ field_validator['pserver'] = validate_field_str; field_validator['domain'] = validate_field_str; field_validator['partition'] = validate_field_str; +field_validator['managed'] = validate_field_str; function validate_fence(form) { var errors = [];