← Back to branch summary

~rvb/maas/bug-1287310

« back to all changes in this revision

Viewing changes to src/maasserver/clusterrpc/power_parameters.py

  • Committer: Raphael Badin
  • Date: 2014-03-17 15:15:53 UTC
  • Revision ID: raphael.badin@canonical.com-20140317151553-qqtuaoab2akrqlo2
Fix bug 1287310.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/clusterrpc/power_parameters.py
40
40
from maasserver.clusterrpc.utils import call_clusters
41
41
from maasserver.config_forms import DictCharField
42
42
from maasserver.fields import MACAddressFormField
 
43
from maasserver.utils.forms import compose_invalid_choice_text
43
44
from provisioningserver.power_schema import (
44
45
    JSON_POWER_TYPE_SCHEMA,
45
46
    POWER_TYPE_PARAMETER_FIELD_SCHEMA,
66
67
    field_class = FIELD_TYPE_MAPPINGS.get(
67
68
        json_field['field_type'], forms.CharField)
68
69
    if json_field['field_type'] == 'choice':
 
70
        invalid_choice_message = compose_invalid_choice_text(
 
71
            json_field['name'], json_field['choices'])
69
72
        extra_parameters = {
70
73
            'choices': json_field['choices'],
71
74
            'initial': json_field['default'],
 
75
            'error_messages': {
 
76
                'invalid_choice': invalid_choice_message},
72
77
            }
73
78
    else:
74
79
        extra_parameters = {}