Merge pull request #11589 from bzwei/heat_parameter_groups

Handle the case that a parameter group does not have label (cherry picked from commit 14f5a68) https://bugzilla.redhat.com/show_bug.cgi?id=1382819
ManageIQ · Oct 7, 2016 · b4186e1 · b4186e1
1 parent 119c5b9
commit b4186e1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/app/services/orchestration_template_dialog_service.rb b/app/services/orchestration_template_dialog_service.rb
@@ -46,7 +46,7 @@ def add_parameter_group(parameter_group, tab, position)
 
     tab.dialog_groups.build(
       :display  => "edit",
-      :label    => parameter_group.label,
+      :label    => parameter_group.label || "Parameter Group#{position}",
       :position => position
     ).tap do |dialog_group|
       parameter_group.parameters.each_with_index { |param, index| add_parameter_field(param, dialog_group, index) }

diff --git a/spec/fixtures/orchestration_templates/hot_parameters.yml b/spec/fixtures/orchestration_templates/hot_parameters.yml
@@ -9,9 +9,7 @@ parameter_groups:
   - flavor
   - image_id
   - cartridges
-- label: DB parameters
-  description: Database related parameters
-  parameters:
+- parameters:
   - admin_pass
   - db_port
   - metadata

diff --git a/spec/models/orchestration_template_hot_spec.rb b/spec/models/orchestration_template_hot_spec.rb
@@ -29,8 +29,8 @@ def assert_general_group(group)
   end
 
   def assert_db_group(group)
-    expect(group.label).to eq("DB parameters")
-    expect(group.description).to eq("Database related parameters")
+    expect(group.label).to be_nil
+    expect(group.description).to be_nil
 
     assert_hidden_length_patterns(group.parameters[0])
     assert_min_max_value(group.parameters[1])

diff --git a/spec/services/orchestration_template_dialog_service_spec.rb b/spec/services/orchestration_template_dialog_service_spec.rb
@@ -110,7 +110,7 @@ def assert_parameter_group1(group)
 
   def assert_parameter_group2(group)
     expect(group).to have_attributes(
-      :label   => "DB parameters",
+      :label   => "Parameter Group2",
       :display => "edit",
     )