CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-09-18 15:20:34
Modified files:
. : conga.spec.in.in
luci/cluster : cluster_svc-macros
luci/site/luci/Extensions: LuciValidation.py
luci/site/luci/var: Data.fs
Log message:
Update the zope DB.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.102&r2=1.45.2.103
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/cluster_svc-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.7&r2=1.3.2.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciValidation.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.6.2.8&r2=1.6.2.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/var/Data.fs.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.37&r2=1.15.2.38
--- conga/conga.spec.in.in 2008/09/17 06:29:54 1.45.2.102
+++ conga/conga.spec.in.in 2008/09/18 15:19:34 1.45.2.103
@@ -315,6 +315,7 @@
* Wed Aug 27 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.1-4
- Fix bz459562 (charset configuration fix for luci)
- Fix bz459469 (An unknown device type was given: "gnbd.")
+- Fix bz454933 (Add Support in Conga for Xen migration mapping)
- Fix bz459623 (Conga error adding new node to existing cluster)
* Thu Aug 07 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.1-3
--- conga/luci/cluster/cluster_svc-macros 2008/08/07 18:07:37 1.3.2.7
+++ conga/luci/cluster/cluster_svc-macros 2008/09/18 15:19:34 1.3.2.8
@@ -184,6 +184,10 @@
<td><span class="cluster_help" title="e.g.,
/etc/xen/">Path to VM configuration files</span></td>
<td><input type="text" name="vmpath" value=""
/></td>
</tr>
+ <tr class="systemsTable">
+ <td><span class="cluster_help"
title="memberhost:targethost,memberhost:targethost ..">VM Migration
Mapping</span></td>
+ <td><input type="text" name="migration_mapping"
value="" /></td>
+ </tr>
</tbody>
</table>
</div>
@@ -315,6 +319,13 @@
tal:attributes="value
sinfo/path | nothing" />
</td>
</tr>
+ <tr class="systemsTable">
+ <td><span class="cluster_help"
title="memberhost:targethost,memberhost:targethost ..">VM Migration
Mapping</span></td>
+ <td>
+ <input type="text"
name="migration_mapping"
+ tal:attributes="value
sinfo/migration_mapping | nothing" />
+ </td>
+ </tr>
</tbody>
</table>
</div>
--- conga/luci/site/luci/Extensions/LuciValidation.py 2008/08/07 18:07:37
1.6.2.8
+++ conga/luci/site/luci/Extensions/LuciValidation.py 2008/09/18 15:19:35
1.6.2.9
@@ -1087,7 +1087,7 @@
def validate_vmsvc_form(model, request):
errors = list()
- fvar = GetReqVars(request, [ 'vmname', 'oldname', 'vmpath', 'recovery',
'domain', 'migration_type', 'max_restarts', 'restart_expire_time'])
+ fvar = GetReqVars(request, [ 'vmname', 'oldname', 'vmpath', 'recovery',
'domain', 'migration_type', 'max_restarts', 'restart_expire_time',
'migration_mapping'])
vm_name = fvar['vmname']
if vm_name is None:
@@ -1141,6 +1141,8 @@
if migration_type is not None and migration_type != 'live' and
migration_type != 'pause':
errors.append('Migration type must be either "live" or "pause"')
+ migration_mapping = fvar['migration_mapping']
+
if len(errors) > 0:
return (False, {'errors': errors })
@@ -1182,6 +1184,14 @@
if migration_type:
xvm.addAttribute('migrate', str(migration_type))
+ if migration_mapping:
+ xvm.addAttribute('migration_mapping', str(migration_mapping))
+ else:
+ try:
+ xvm.removeAttribute('migration_mapping')
+ except:
+ pass
+
fdom = fvar['domain']
if fdom:
xvm.addAttribute('domain', fdom)
Binary files /cvs/cluster/conga/luci/site/luci/var/Data.fs 2008/08/07
18:07:37 1.15.2.37 and /cvs/cluster/conga/luci/site/luci/var/Data.fs
2008/09/18 15:19:36 1.15.2.38 differ
rcsdiff: /cvs/cluster/conga/luci/site/luci/var/Data.fs: diff failed
