Merge "Change the way of verifying field cidr"
This commit is contained in:
commit
c6f19dc6d6
|
@ -139,6 +139,7 @@ class CreateSubnetInfoAction(workflows.Action):
|
||||||
required=False)
|
required=False)
|
||||||
|
|
||||||
cidr = forms.IPField(label=_("Network Address"),
|
cidr = forms.IPField(label=_("Network Address"),
|
||||||
|
required=False,
|
||||||
initial="",
|
initial="",
|
||||||
error_messages={
|
error_messages={
|
||||||
'required': _('Specify "Network Address" or '
|
'required': _('Specify "Network Address" or '
|
||||||
|
@ -287,6 +288,10 @@ class CreateSubnetInfoAction(workflows.Action):
|
||||||
'"Enter Network Address manually" and specify '
|
'"Enter Network Address manually" and specify '
|
||||||
'"Network Address".')
|
'"Network Address".')
|
||||||
raise forms.ValidationError(msg)
|
raise forms.ValidationError(msg)
|
||||||
|
if not cidr and address_source != 'subnetpool':
|
||||||
|
msg = _('Specify "Network Address" or '
|
||||||
|
'clear "Create Subnet" checkbox in previous step.')
|
||||||
|
raise forms.ValidationError(msg)
|
||||||
if address_source == 'subnetpool' and 'cidr' in self._errors:
|
if address_source == 'subnetpool' and 'cidr' in self._errors:
|
||||||
del self._errors['cidr']
|
del self._errors['cidr']
|
||||||
elif cidr:
|
elif cidr:
|
||||||
|
|
Loading…
Reference in New Issue