commit b2c85e7499cc16236103038d52ede12dcf1fe00f Author: Ryan McCabe <rmccabe(a)redhat.com&gt; Date: Tue Aug 3 18:17:23 2010 -0400 Fix netmask field inside of IP resources in services luci/widget_validators/validate_resource.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) --- diff --git a/luci/widget_validators/validate_resource.py b/luci/widget_validators/validate_resource.py index 8234159..1870f4c 100644 --- a/luci/widget_validators/validate_resource.py +++ b/luci/widget_validators/validate_resource.py @@ -536,7 +536,12 @@ def validate_clusvc_form(model, **kw): try: if res_type == 'ip': - dummy_form['resourcename'] = dummy_form['address'] + mask = dummy_form.get('address_mask') + if mask: + dummy_form['resourcename'] = '%s/%s' % (dummy_form['address_nominal'], dummy_form['address_mask']) + else: + dummy_form['resourcename'] = dummy_form['address_nominal'] + dummy_form['address'] = dummy_form['resourcename'] except: log.exception('no ipaddr') return (False, { 'errors': [ 'No IP address was given' ]})