diff --git a/app/controllers/ops_controller/settings/common.rb b/app/controllers/ops_controller/settings/common.rb index 242909d4fe4..cb65bc4d2df 100644 --- a/app/controllers/ops_controller/settings/common.rb +++ b/app/controllers/ops_controller/settings/common.rb @@ -1194,6 +1194,8 @@ def settings_get_info(nodetype = x_node) when "z" @servers = [] @record = @zone = @selected_zone = Zone.find(nodes.last) + @ntp_servers = @selected_zone&.settings_for_resource&.ntp ? + @selected_zone.settings_for_resource.ntp.to_h[:server].join(", ") : '' @right_cell_text = my_zone_name == @selected_zone.name ? _("Settings %{model} \"%{name}\" (current)") % {:name => @selected_zone.description, :model => ui_lookup(:model => @selected_zone.class.to_s)} : diff --git a/app/views/ops/_settings_evm_servers_tab.html.haml b/app/views/ops/_settings_evm_servers_tab.html.haml index c333c16d7cd..59ba2212924 100644 --- a/app/views/ops/_settings_evm_servers_tab.html.haml +++ b/app/views/ops/_settings_evm_servers_tab.html.haml @@ -26,7 +26,7 @@ = _("NTP Servers") .col-md-8 %p.form-control-static - = @selected_zone.settings[:ntp] ? @selected_zone.settings[:ntp][:server].join(", ") : '' + = @ntp_servers .form-group %label.col-md-2.control-label diff --git a/spec/controllers/ops_controller/settings/common_spec.rb b/spec/controllers/ops_controller/settings/common_spec.rb index b0de793cd30..c5cd981e0d5 100644 --- a/spec/controllers/ops_controller/settings/common_spec.rb +++ b/spec/controllers/ops_controller/settings/common_spec.rb @@ -231,6 +231,18 @@ expect(edit[:new]).to eq(edit[:current]) end end + + context 'zone node' do + it 'sets ntp server info for display' do + controller.instance_variable_set(:@sb, :active_tab => 'settings_zone') + controller.instance_variable_set(:@edit, :new => {:ntp => {:server => ["example1.com", "example2.com"]}}) + _guid, miq_server, zone = EvmSpecHelper.local_guid_miq_server_zone + controller.send(:zone_save_ntp_server_settings, zone) + allow(MiqServer).to receive(:my_server).and_return(miq_server) + controller.send(:settings_get_info, "z-#{zone.id}") + expect(assigns(:ntp_servers)).to eq("example1.com, example2.com") + end + end end end end