x/tuskar-ui
Code Issues Proposed changes

Simplified service config updates

Browse Source 
Change-Id: Ied0a73435b04701f28092535924bf52edb2bb1b3
This commit is contained in:
Jiri Tomasek 2015-05-20 13:54:34 +02:00
parent 7fcacc334f
commit b93f81011f
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tuskar_ui/infrastructure/parameters/forms.py
View File

@ -225,17 +225,19 @@ class SimpleEditServiceConfig(horizon.forms.SelfHandlingForm):
# Set the same parameter and value in all roles.
for role in plan.role_list:
key = role.parameter_prefix + param_name
params[key] = param_value
if key in [parameter.name
for parameter in role.parameter_list(plan)]:
params[key] = param_value
return params
def handle(self, request, data):
plan = api.tuskar.Plan.get_the_plan(self.request)
compute_prefix = plan.get_role_by_name('compute').parameter_prefix
compute_prefix = plan.get_role_by_name('Compute').parameter_prefix
controller_prefix = plan.get_role_by_name(
'controller').parameter_prefix
'Controller').parameter_prefix
cinder_prefix = plan.get_role_by_name(
'cinder-storage').parameter_prefix
'Cinder-Storage').parameter_prefix
virt_type = data.get('virt_type')
neutron_public_interface = data.get('neutron_public_interface')
@ -257,6 +259,7 @@ class SimpleEditServiceConfig(horizon.forms.SelfHandlingForm):
compute_prefix + 'NtpServer':
ntp_server,
}
parameters.update(self._load_additional_parameters(
plan, data,
'snmp_password', 'SnmpdReadonlyUserPassword'))

2
tuskar_ui/infrastructure/parameters/tests.py
View File

@ -123,8 +123,6 @@ class ParametersTest(test.BaseAdminViewTests):
'Controller-1::CinderISCSIHelper': u'lioadm',
'Controller-1::NovaComputeLibvirtType': u'qemu',
'Compute-1::SnmpdReadonlyUserPassword': u'password',
'Block Storage-1::SnmpdReadonlyUserPassword': u'password',
'Object Storage-1::SnmpdReadonlyUserPassword': u'password',
'Controller-1::NtpServer': u'',
'Controller-1::ExtraConfig': u'{}',
'Compute-1::ExtraConfig': u'{}',

3
tuskar_ui/infrastructure/static/infrastructure/scss/_individual_pages.scss
View File

@ -269,6 +269,7 @@ ul.nav-arrow {
}
}
// hacky positioning of advanced service config form buttons next to header
.page_form_actions {
margin-top: -3.4em;
margin-top: -5em;
}

4
tuskar_ui/infrastructure/templates/horizon/common/_horizontal_field.html
View File

@ -1,8 +1,8 @@
{% load form_helpers %}
<div class="form-group{% if field.errors %} has-error{% endif %} {{ field.css_classes }}">
<label class="control-label col-sm-3 {% if field.field.required or field.field.parameter.is_required %}{{ form.required_css_class }}{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
<div class="col-sm-9 {{ classes.value }} {{ field|wrapper_classes }}">
<label class="control-label col-lg-4 col-md-5 {% if field.field.required or field.field.parameter.is_required %}{{ form.required_css_class }}{% endif %}" for="{{ field.id_for_label }}">{{ field.label }}</label>
<div class="col-lg-8 col-md-7 {{ classes.value }} {{ field|wrapper_classes }}">
{{ field|add_bootstrap_class }}
{% for error in field.errors %}
<span class="help-block alert alert-danger {{ form.error_css_class }}">{{ error }}</span>