Cleanup for Sahara fields

Since 'True' is the default value for 'required',
additional assignments are not needed.

Change-Id: If79dfe6ffff7fe30cec91b7f233035fe2e5b510a
This commit is contained in:
Tatiana Ovchinnikova 2014-07-24 17:17:26 +04:00
parent 1ea96903f0
commit ef2e5f3897
6 changed files with 6 additions and 20 deletions

View File

@ -36,8 +36,7 @@ class UploadFileForm(forms.SelfHandlingForm,
sahara = saharaclient.client(request) sahara = saharaclient.client(request)
self._generate_plugin_version_fields(sahara) self._generate_plugin_version_fields(sahara)
self.fields['template_file'] = forms.FileField(label=_("Template"), self.fields['template_file'] = forms.FileField(label=_("Template"))
required=True)
def handle(self, request, data): def handle(self, request, data):
try: try:

View File

@ -52,7 +52,6 @@ class SelectPluginAction(workflows.Action):
self.fields["plugin_name"] = forms.ChoiceField( self.fields["plugin_name"] = forms.ChoiceField(
label=_("Plugin name"), label=_("Plugin name"),
required=True,
choices=plugin_choices, choices=plugin_choices,
widget=forms.Select(attrs={"class": "plugin_name_choice"})) widget=forms.Select(attrs={"class": "plugin_name_choice"}))
@ -60,7 +59,6 @@ class SelectPluginAction(workflows.Action):
field_name = plugin.name + "_version" field_name = plugin.name + "_version"
choice_field = forms.ChoiceField( choice_field = forms.ChoiceField(
label=_("Hadoop version"), label=_("Hadoop version"),
required=True,
choices=[(version, version) for version in plugin.versions], choices=[(version, version) for version in plugin.versions],
widget=forms.Select( widget=forms.Select(
attrs={"class": "plugin_version_choice " attrs={"class": "plugin_version_choice "
@ -97,8 +95,7 @@ class GeneralConfigAction(workflows.Action):
required=False, required=False,
widget=forms.HiddenInput(attrs={"class": "hidden_to_delete_field"})) widget=forms.HiddenInput(attrs={"class": "hidden_to_delete_field"}))
cluster_template_name = forms.CharField(label=_("Template Name"), cluster_template_name = forms.CharField(label=_("Template Name"))
required=True)
description = forms.CharField(label=_("Description"), description = forms.CharField(label=_("Description"),
required=False, required=False,

View File

@ -65,8 +65,7 @@ class GeneralConfigAction(workflows.Action):
required=False, required=False,
widget=forms.HiddenInput(attrs={"class": "hidden_to_delete_field"})) widget=forms.HiddenInput(attrs={"class": "hidden_to_delete_field"}))
cluster_name = forms.CharField(label=_("Cluster Name"), cluster_name = forms.CharField(label=_("Cluster Name"))
required=True)
description = forms.CharField(label=_("Description"), description = forms.CharField(label=_("Description"),
required=False, required=False,
@ -75,8 +74,7 @@ class GeneralConfigAction(workflows.Action):
initial=(None, "None"), initial=(None, "None"),
required=False) required=False)
image = forms.ChoiceField(label=_("Base Image"), image = forms.ChoiceField(label=_("Base Image"))
required=True)
keypair = forms.ChoiceField( keypair = forms.ChoiceField(
label=_("Keypair"), label=_("Keypair"),
@ -92,7 +90,6 @@ class GeneralConfigAction(workflows.Action):
if saharaclient.base.is_service_enabled(request, 'network'): if saharaclient.base.is_service_enabled(request, 'network'):
self.fields["neutron_management_network"] = forms.ChoiceField( self.fields["neutron_management_network"] = forms.ChoiceField(
label=_("Neutron Management Network"), label=_("Neutron Management Network"),
required=True,
choices=self.populate_neutron_management_network_choices( choices=self.populate_neutron_management_network_choices(
request, {}) request, {})
) )

View File

@ -57,8 +57,7 @@ class EditTagsForm(ImageForm):
class RegisterImageForm(ImageForm): class RegisterImageForm(ImageForm):
image_id = forms.ChoiceField(label=_("Image"), image_id = forms.ChoiceField(label=_("Image"))
required=True)
def __init__(self, request, *args, **kwargs): def __init__(self, request, *args, **kwargs):
super(RegisterImageForm, self).__init__(request, *args, **kwargs) super(RegisterImageForm, self).__init__(request, *args, **kwargs)

View File

@ -61,8 +61,7 @@ class JobExecutionGeneralConfigAction(workflows.Action):
if request.REQUEST.get("job_id", None) is None: if request.REQUEST.get("job_id", None) is None:
self.fields["job"] = forms.ChoiceField( self.fields["job"] = forms.ChoiceField(
label=_("Job"), label=_("Job"))
required=True)
self.fields["job"].choices = self.populate_job_choices(request) self.fields["job"].choices = self.populate_job_choices(request)
else: else:
self.fields["job"] = forms.CharField( self.fields["job"] = forms.CharField(

View File

@ -104,17 +104,14 @@ def _create_step_action(name, title, parameters, advanced_fields=None,
def build_node_group_fields(action, name, template, count): def build_node_group_fields(action, name, template, count):
action.fields[name] = forms.CharField( action.fields[name] = forms.CharField(
label=_("Name"), label=_("Name"),
required=True,
widget=forms.TextInput()) widget=forms.TextInput())
action.fields[template] = forms.CharField( action.fields[template] = forms.CharField(
label=_("Node group cluster"), label=_("Node group cluster"),
required=True,
widget=forms.HiddenInput()) widget=forms.HiddenInput())
action.fields[count] = forms.IntegerField( action.fields[count] = forms.IntegerField(
label=_("Count"), label=_("Count"),
required=True,
min_value=0, min_value=0,
widget=forms.HiddenInput()) widget=forms.HiddenInput())
@ -155,7 +152,6 @@ class PluginAndVersionMixin(object):
self.fields["plugin_name"] = forms.ChoiceField( self.fields["plugin_name"] = forms.ChoiceField(
label=_("Plugin Name"), label=_("Plugin Name"),
required=True,
choices=plugin_choices, choices=plugin_choices,
widget=forms.Select(attrs={"class": "plugin_name_choice"})) widget=forms.Select(attrs={"class": "plugin_name_choice"}))
@ -163,7 +159,6 @@ class PluginAndVersionMixin(object):
field_name = plugin.name + "_version" field_name = plugin.name + "_version"
choice_field = forms.ChoiceField( choice_field = forms.ChoiceField(
label=_("Hadoop Version"), label=_("Hadoop Version"),
required=True,
choices=[(version, version) for version in plugin.versions], choices=[(version, version) for version in plugin.versions],
widget=forms.Select( widget=forms.Select(
attrs={"class": "plugin_version_choice " attrs={"class": "plugin_version_choice "