diff --git a/app/controllers/application_controller/miq_request_methods.rb b/app/controllers/application_controller/miq_request_methods.rb index 69b2b38f6cd..334d2623656 100644 --- a/app/controllers/application_controller/miq_request_methods.rb +++ b/app/controllers/application_controller/miq_request_methods.rb @@ -238,7 +238,7 @@ def sort_vm_grid # get the sort column that was clicked on, else use the current one def sort_host_grid return unless load_edit("prov_edit__#{params[:id]}", "show_list") - @edit[:wf].kind_of?(MiqHostProvisionWorkflow) ? sort_grid('host', @edit[:wf].get_field(:src_host_ids, :service)[:values]) : sort_grid('host', @edit[:wf].get_field(:placement_host_name, :environment)[:values]) + sort_grid('host', @edit[:wf].get_field(:placement_host_name, :environment)[:values]) end # get the sort column that was clicked on, else use the current one @@ -430,23 +430,13 @@ def build_host_grid(hosts, sort_order = nil, sort_by = nil) # need to set options from @edit/@option based upon calling screen: show/edit options = @edit || @options - headers = if options[:wf].kind_of?(MiqHostProvisionWorkflow) - # non-editable grid for host prov to display hosts being provisioned - { - "name" => _("Name"), - "mac_address" => _("MAC Address"), - } - else - # editable grid for vm/migrate prov screens - { - "name" => _("Name"), - "v_total_vms" => _("Total VMs"), - "vmm_product" => _("Platform"), - "vmm_version" => _("Version"), - "state" => _("State"), - "maintenance" => _("Maintenance") - } - end + # editable grid for vm/migrate prov screens + headers = { "name" => _("Name"), + "v_total_vms" => _("Total VMs"), + "vmm_product" => _("Platform"), + "vmm_version" => _("Version"), + "state" => _("State"), + "maintenance" => _("Maintenance") } integer_fields = %w(v_total_vms) @@ -519,7 +509,6 @@ def dialog_partial_for_workflow case workflow when MiqProvisionVirtWorkflow then "shared/views/prov_dialog" when ManageIQ::Providers::Foreman::ConfigurationManager::ProvisionWorkflow then "prov_configured_system_foreman_dialog" - when MiqHostProvisionWorkflow then "prov_host_dialog" when VmMigrateWorkflow then "prov_vm_migrate_dialog" when PhysicalServerProvisionWorkflow then "prov_physical_server_dialog" end @@ -769,7 +758,7 @@ def prov_get_form_vars def prov_set_show_vars @showtype = "main" @options = @miq_request.get_options # Get the provision options from the request record - @options[:org_controller] = @miq_request.resource_type == "MiqHostProvisionRequest" ? "host" : "vm" + @options[:org_controller] = "vm" if @options[:schedule_time] @options[:schedule_time] = format_timezone(@options[:schedule_time], Time.zone, "raw") @options[:start_date] = "#{@options[:schedule_time].month}/#{@options[:schedule_time].day}/#{@options[:schedule_time].year}" # Set the start date @@ -794,7 +783,7 @@ def prov_set_show_vars end end @options[tag_symbol_for_workflow] ||= [] # Initialize if came back nil from record - unless ["MiqHostProvisionRequest", "VmMigrateRequest"].include?(@miq_request.resource_type) + unless ["VmMigrateRequest"].include?(@miq_request.resource_type) svm = VmOrTemplate.where(:id => @options[:src_vm_id][0]).first if @options[:src_vm_id] && @options[:src_vm_id][0] @sb[:vm_os] = svm.platform if svm end @@ -946,8 +935,6 @@ def workflow_instance_from_vars(req) MiqProvisionWorkflow.class_for_platform(@edit[:st_prov_type]) elsif @edit[:new][:st_prov_type] MiqProvisionWorkflow.class_for_platform(@edit[:new][:st_prov_type]) - else # handle copy button for host provisioning - MiqHostProvisionWorkflow end pre_prov_values = copy_hash(@edit[:wf].values) if @edit[:wf] @@ -962,13 +949,6 @@ def workflow_instance_from_vars(req) @edit[:prov_type] = "PhysicalServer" @edit[:new][:src_configured_system_ids] = params[:prov_id].kind_of?(Array) ? params[:prov_id] : [params[:prov_id]] wf_type = PhysicalServerProvisionWorkflow - else - @edit[:prov_type] = "Host" - if @edit[:new].empty? - # multiple / single hosts selected, src_host_ids should always be an array - @edit[:new][:src_host_ids] = params[:prov_id].kind_of?(Array) ? params[:prov_id] : [params[:prov_id]] - end - wf_type = MiqHostProvisionWorkflow end [wf_type.new(@edit[:new], current_user, options), pre_prov_values] # Return the new workflow and any pre_prov_values diff --git a/app/controllers/host_controller.rb b/app/controllers/host_controller.rb index c46f486b8f9..798661d6d0f 100644 --- a/app/controllers/host_controller.rb +++ b/app/controllers/host_controller.rb @@ -332,7 +332,6 @@ def button assign_policies(Host) if params[:pressed] == "host_protect" edit_record if params[:pressed] == "host_edit" custom_buttons if params[:pressed] == "custom_button" - prov_redirect if params[:pressed] == "host_miq_request_new" toggleservicescheduling if params[:pressed] == "host_cloud_service_scheduling_toggle" sethoststomanageable if params[:pressed] == "host_manageable" introspecthosts if params[:pressed] == "host_introspect" @@ -352,7 +351,7 @@ def button "host_protect", "perf_reload"].include?(params[:pressed]) && @flash_array.nil? # Another screen showing, so return - if @flash_array.nil? && !@refresh_partial && !["host_miq_request_new"].include?(params[:pressed]) # if no button handler ran, show not implemented msg + if @flash_array.nil? && !@refresh_partial # if no button handler ran, show not implemented msg add_flash(_("Button not yet implemented"), :error) @refresh_partial = "layouts/flash_msg" @refresh_div = "flash_msg_div" @@ -363,13 +362,13 @@ def button end end - if @lastaction == "show" && ["custom_button", "host_miq_request_new"].include?(params[:pressed]) + if @lastaction == "show" && ["custom_button"].include?(params[:pressed]) @host = @record = identify_record(params[:id]) end if single_delete_test single_delete_redirect - elsif params[:pressed].ends_with?("_edit") || ["host_miq_request_new", "#{pfx}_miq_request_new", + elsif params[:pressed].ends_with?("_edit") || ["#{pfx}_miq_request_new", "#{pfx}_clone", "#{pfx}_migrate", "#{pfx}_publish"].include?(params[:pressed]) if @flash_array @@ -377,7 +376,7 @@ def button replace_gtl_main_div else if @redirect_controller - if ["host_miq_request_new", "#{pfx}_clone", "#{pfx}_migrate", "#{pfx}_publish"].include?(params[:pressed]) + if ["#{pfx}_clone", "#{pfx}_migrate", "#{pfx}_publish"].include?(params[:pressed]) if flash_errors? javascript_flash else diff --git a/app/controllers/miq_request_controller.rb b/app/controllers/miq_request_controller.rb index f8a7f353592..0292b0fe02a 100644 --- a/app/controllers/miq_request_controller.rb +++ b/app/controllers/miq_request_controller.rb @@ -216,8 +216,7 @@ def prov_continue def prov_load_tab if @options && @options[:current_tab_key] == :purpose # Need to build again for purpose tab - fld = @options[:wf].kind_of?(MiqHostProvisionWorkflow) ? "tag_ids" : "vm_tags" - build_tags_tree(@options[:wf], @options[fld.to_s.to_sym], false) + build_tags_tree(@options[:wf], @options[:vm_tags], false) end # need to build host list view, to display on show screen @options[:host_sortdir] = "ASC" diff --git a/app/decorators/miq_event_definition_decorator.rb b/app/decorators/miq_event_definition_decorator.rb index 3549106a0d8..23b9907a9ea 100644 --- a/app/decorators/miq_event_definition_decorator.rb +++ b/app/decorators/miq_event_definition_decorator.rb @@ -97,7 +97,6 @@ def fonticon "host_disconnect" => "pficon pficon-screen", "host_failure" => "pficon pficon-screen", "host_perf_complete" => "pficon pficon-screen", - "host_provisioned" => "pficon pficon-screen", "host_remove_from_cluster" => "pficon pficon-screen", "host_scan_complete" => "pficon pficon-screen", "request_assign_company_tag" => "fa fa-tag", diff --git a/app/helpers/application_helper/button/host_miq_request_new.rb b/app/helpers/application_helper/button/host_miq_request_new.rb deleted file mode 100644 index c05b7293776..00000000000 --- a/app/helpers/application_helper/button/host_miq_request_new.rb +++ /dev/null @@ -1,9 +0,0 @@ -class ApplicationHelper::Button::HostMiqRequestNew < ApplicationHelper::Button::ButtonNewDiscover - needs :@record - - def disabled? - @error_message = _("No PXE Servers are available for Host provisioning") if PxeServer.count <= 0 - @error_message = _("This Host can not be provisioned because the MAC address is not known") unless @record.mac_address - @error_message.present? - end -end diff --git a/app/helpers/application_helper/button/miq_request_copy.rb b/app/helpers/application_helper/button/miq_request_copy.rb index dc80d288854..72050570980 100644 --- a/app/helpers/application_helper/button/miq_request_copy.rb +++ b/app/helpers/application_helper/button/miq_request_copy.rb @@ -4,7 +4,6 @@ class ApplicationHelper::Button::MiqRequestCopy < ApplicationHelper::Button::Miq def visible? return false unless super resource_types_for_miq_request_copy = %w(MiqProvisionRequest - MiqHostProvisionRequest MiqProvisionConfiguredSystemRequest) return false if !resource_types_for_miq_request_copy.include?(@record.resource_type) || ((current_user.name != @record.requester_name || diff --git a/app/helpers/application_helper/toolbar/host_center.rb b/app/helpers/application_helper/toolbar/host_center.rb index 9566cee453d..241e9bdc212 100644 --- a/app/helpers/application_helper/toolbar/host_center.rb +++ b/app/helpers/application_helper/toolbar/host_center.rb @@ -100,22 +100,6 @@ class ApplicationHelper::Toolbar::HostCenter < ApplicationHelper::Toolbar::Basic ] ), ]) - button_group('host_lifecycle', [ - select( - :host_lifecycle_choice, - 'fa fa-recycle fa-lg', - t = N_('Lifecycle'), - t, - :items => [ - button( - :host_miq_request_new, - 'pficon pficon-add-circle-o fa-lg', - t = N_('Provision this item'), - t, - :klass => ApplicationHelper::Button::HostMiqRequestNew), - ] - ), - ]) button_group('host_monitoring', [ select( :host_monitoring_choice, diff --git a/app/helpers/application_helper/toolbar/hosts_center.rb b/app/helpers/application_helper/toolbar/hosts_center.rb index 9402307e60a..ef1ee25b0d7 100644 --- a/app/helpers/application_helper/toolbar/hosts_center.rb +++ b/app/helpers/application_helper/toolbar/hosts_center.rb @@ -160,26 +160,6 @@ class ApplicationHelper::Toolbar::HostsCenter < ApplicationHelper::Toolbar::Basi ] ), ]) - button_group('host_lifecycle', [ - select( - :host_lifecycle_choice, - 'fa fa-recycle fa-lg', - t = N_('Lifecycle'), - t, - :items => [ - button( - :host_miq_request_new, - 'pficon pficon-add-circle-o fa-lg', - N_('Request to Provision items'), - N_('Provision items'), - :url_parms => "main_div", - :send_checked => true, - :enabled => false, - :onwhen => "1+", - :klass => ApplicationHelper::Button::ButtonNewDiscover), - ] - ), - ]) button_group('host_operations', [ select( :host_power_choice, diff --git a/app/presenters/menu/default_menu.rb b/app/presenters/menu/default_menu.rb index 689240d8267..aa24fab1e56 100644 --- a/app/presenters/menu/default_menu.rb +++ b/app/presenters/menu/default_menu.rb @@ -81,7 +81,6 @@ def infrastructure_menu_section Menu::Item.new('storage', N_('Datastores'), 'storage', {:feature => 'storage_show_list'}, '/storage/explorer'), Menu::Item.new('pxe', N_('PXE'), 'pxe', {:feature => 'pxe', :any => true}, '/pxe/explorer'), Menu::Item.new('switch', N_('Networking'), 'infra_networking', {:feature => 'infra_networking', :any => true}, '/infra_networking/explorer'), - Menu::Item.new('miq_request_host', N_('Requests'), 'host_miq_request', {:feature => 'host_miq_request_show_list'}, '/miq_request?typ=host'), Menu::Item.new('infra_topology', N_('Topology'), 'infra_topology', {:feature => 'infra_topology', :any => true}, '/infra_topology') ]) end diff --git a/app/views/miq_request/_prov_host_dialog.html.haml b/app/views/miq_request/_prov_host_dialog.html.haml deleted file mode 100644 index f75e0e9fa28..00000000000 --- a/app/views/miq_request/_prov_host_dialog.html.haml +++ /dev/null @@ -1,108 +0,0 @@ --# wf The workflow object currently in use --# dialog The name (symbol) of the selected dialog - -- current_tab = @edit && @edit[:new] ? @edit[:new][:current_tab_key] : @options[:current_tab_key] -%br - -- if dialog == current_tab - - case current_tab - - when :requester - - keys = [:owner_email, :owner_first_name, :owner_last_name, :owner_address, :owner_city, :owner_state, :owner_zip, :owner_country, :owner_title, :owner_company, :owner_department, :owner_office, :owner_phone, :owner_phone_mobile, :request_notes] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Request Information"), - :keys => keys}) - - keys = [:owner_manager, :owner_manager_mail, :owner_manager_mail] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Manager"), - :keys => keys}) - - when :purpose - - keys = [:vm_tags] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Select Tags to apply"), - :keys => keys}) - - when :service - - keys = [:src_host_ids] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => title_for_host, - :keys => keys}) - - keys = [:pxe_server_id, :pxe_image_id] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("PXE"), - :keys => keys}) - - when :environment - - keys = [:placement_ems_name] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Provider"), - :prefix => "miq_request/", - :keys => keys}) - - keys = [:placement_cluster_name] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => title_for_cluster, - :prefix => "miq_request/", - :keys => keys}) - - keys = [:attached_ds] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Datastore"), - :prefix => "miq_request/", - :keys => keys}) - - when :customize - - keys = [:root_password] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Credentials"), - :prefix => "miq_request/", - :keys => keys}) - - keys = [:addr_mode, :hostname, :ip_addr, :subnet_mask, :gateway] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("IP Address Information"), - :prefix => "miq_request/", - :keys => keys}) - - keys = [:dns_servers, :dns_suffixes] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("DNS"), - :prefix => "miq_request/", - :keys => keys}) - - keys = [:customization_template_id] - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Customize Template"), - :prefix => "miq_request/", - :keys => keys}) - - show_customization_template_script = (@edit && @edit[:new] && @edit[:new][:customization_template_script]) || (@options && @options[:customization_template_script]) - - keys = [show_customization_template_script ? :customization_template_script : nil].compact - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Selected Template Contents"), - :prefix => "miq_request/", - :keys => keys}) - - when :schedule - - has_schedule_time = (@edit && @edit[:new] && @edit[:new][:schedule_type] && @edit[:new][:schedule_type][0] == "schedule") || (@options && @options[:schedule_type] && @options[:schedule_type][0] == "schedule") - - keys = [:schedule_type, has_schedule_time ? :schedule_time : nil, :stateless].compact - = render(:partial => "prov_dialog_fieldset", - :locals => {:workflow => wf, - :dialog => dialog, - :label => _("Schedule Info"), - :keys => keys}) diff --git a/app/views/miq_request/_prov_host_grid.html.haml b/app/views/miq_request/_prov_host_grid.html.haml index 59093b5cadf..12a54bebd2c 100644 --- a/app/views/miq_request/_prov_host_grid.html.haml +++ b/app/views/miq_request/_prov_host_grid.html.haml @@ -21,28 +21,21 @@ - else = h(options[:host_headers][h]) %tbody - - unless options[:wf].kind_of?(MiqHostProvisionWorkflow) - - cls = @edit[:new][:placement_host_name] && @edit[:new][:placement_host_name][0].nil? ? "selected" : "" - %tr{:class => cls, :onclick => "miqAjax('/miq_request/prov_field_changed/?#{field_id}=__HOST__NONE__&id=#{id}');"} - %td - = "<#{_('None')}>" - %td - %td - %td - %td - %td + - cls = @edit[:new][:placement_host_name] && @edit[:new][:placement_host_name][0].nil? ? "selected" : "" + %tr{:class => cls, :onclick => "miqAjax('/miq_request/prov_field_changed/?#{field_id}=__HOST__NONE__&id=#{id}');"} + %td + = "<#{_('None')}>" + %td + %td + %td + %td + %td - @hosts.each do |row| - @id = row.id - - if options[:wf].kind_of?(MiqHostProvisionWorkflow) - %tr - - options[:host_columns].each do |col| - %td - = h(row.send(col)) - - else - - cls = @edit[:new][:placement_host_name] && @edit[:new][:placement_host_name][0] == @id ? "selected" : "" - %tr{:class => cls, :onclick => "miqAjax('/miq_request/prov_field_changed/?#{field_id}=#{@id}&id=#{id}');"} - - options[:host_columns].each do |col| - %td - = h(row.send(col)) + - cls = @edit[:new][:placement_host_name] && @edit[:new][:placement_host_name][0] == @id ? "selected" : "" + %tr{:class => cls, :onclick => "miqAjax('/miq_request/prov_field_changed/?#{field_id}=#{@id}&id=#{id}');"} + - options[:host_columns].each do |col| + %td + = h(row.send(col)) :javascript miqScrollToSelected('prov_host_div') diff --git a/app/views/miq_request/_request.html.haml b/app/views/miq_request/_request.html.haml index e6ef7bbc5f7..b23c80d1f8c 100644 --- a/app/views/miq_request/_request.html.haml +++ b/app/views/miq_request/_request.html.haml @@ -94,13 +94,6 @@ .col-md-8{:onclick => "DoNav('#{'/miq_request/show/' << @miq_request.id.to_s << '?display=miq_provisions'}');", :title => _("Click to view details")} = h(@miq_request.resource.miq_provisions.length) - - if @miq_request.resource_type == "MiqHostProvisionRequest" && @miq_request.resource.miq_host_provisions.length > 0 - .form-group - %label.control-label.col-md-2 - = _("Provisioned Hosts") - .col-md-8{:title => _("Click to view details"), - :onclick => "DoNav('#{'/miq_request/show/' << @miq_request.id.to_s << '?display=miq_provisions'}');"} - = h(@miq_request.resource.miq_host_provisions.length) - if @edit && @edit[:stamp_typ] %table{:width => "100%"} %tr diff --git a/locale/ManageIQ_UI_Classic.pot b/locale/ManageIQ_UI_Classic.pot index 1993ed53710..060843ddf30 100644 --- a/locale/ManageIQ_UI_Classic.pot +++ b/locale/ManageIQ_UI_Classic.pot @@ -16836,10 +16836,6 @@ msgstr "" msgid "No Owner" msgstr "" -#: ../app/helpers/application_helper/button/host_miq_request_new.rb:5 -msgid "No PXE Servers are available for Host provisioning" -msgstr "" - #: ../app/controllers/pxe_controller/pxe_servers.rb:111 msgid "No PXE Servers were selected to %{button}" msgstr "" @@ -26546,10 +26542,6 @@ msgstr "" msgid "This Group is Read Only and can not be edited" msgstr "" -#: ../app/helpers/application_helper/button/host_miq_request_new.rb:6 -msgid "This Host can not be provisioned because the MAC address is not known" -msgstr "" - #: ../app/helpers/view_helper.rb:50 msgid "This Hour" msgstr "" diff --git a/spec/helpers/application_helper/buttons/host_miq_request_new_spec.rb b/spec/helpers/application_helper/buttons/host_miq_request_new_spec.rb deleted file mode 100644 index 1ca47433d2a..00000000000 --- a/spec/helpers/application_helper/buttons/host_miq_request_new_spec.rb +++ /dev/null @@ -1,32 +0,0 @@ -describe ApplicationHelper::Button::HostMiqRequestNew do - let(:view_context) { setup_view_context_with_sandbox({}) } - let(:record) { FactoryGirl.create(:vm) } - let(:button) { described_class.new(view_context, {}, {'record' => record}, {}) } - - describe '#disabled?' do - subject { button[:title] } - before { allow(record).to receive(:mac_address).and_return(mac_address) } - before { allow(PxeServer).to receive(:all).and_return(serverAll) } - before(:each) { button.calculate_properties } - - context 'and record has mac address and servers' do - let(:mac_address) { "00:0D:93:13:51:1A" } - let(:serverAll) { ['FancyServer'] } - it_behaves_like 'an enabled button' - end - - context 'and record has no mac address' do - let(:mac_address) { false } - let(:serverAll) { ['FancyServer'] } - it_behaves_like 'a disabled button', - 'This Host can not be provisioned because the MAC address is not known' - end - - context 'and record has mac address but no servers' do - let(:mac_address) { "00:0D:93:13:51:1A" } - let(:serverAll) { [] } - it_behaves_like 'a disabled button', - 'No PXE Servers are available for Host provisioning' - end - end -end diff --git a/spec/helpers/application_helper/buttons/miq_request_approval_spec.rb b/spec/helpers/application_helper/buttons/miq_request_approval_spec.rb index 2e3fd1dc17b..6731945cb0f 100644 --- a/spec/helpers/application_helper/buttons/miq_request_approval_spec.rb +++ b/spec/helpers/application_helper/buttons/miq_request_approval_spec.rb @@ -14,7 +14,7 @@ let(:request) { "SomeRequest" } let(:username) { user.name } let(:state) { "xx" } - %w(MiqProvisionRequest MiqHostProvisionRequest VmReconfigureRequest VmCloudReconfigureRequest + %w(MiqProvisionRequest VmReconfigureRequest VmCloudReconfigureRequest VmMigrateRequest AutomationRequest ServiceTemplateProvisionRequest).each do |cls| context "id = miq_request_approval" do before do diff --git a/spec/helpers/application_helper/buttons/miq_request_copy_spec.rb b/spec/helpers/application_helper/buttons/miq_request_copy_spec.rb index b18ad02ecf5..8e33904e760 100644 --- a/spec/helpers/application_helper/buttons/miq_request_copy_spec.rb +++ b/spec/helpers/application_helper/buttons/miq_request_copy_spec.rb @@ -11,7 +11,7 @@ let(:view_context) { setup_view_context_with_sandbox({}) } let(:user) { FactoryGirl.create(:user) } - %w(MiqProvisionRequest MiqHostProvisionRequest VmReconfigureRequest VmCloudReconfigureRequest + %w(MiqProvisionRequest VmReconfigureRequest VmCloudReconfigureRequest VmMigrateRequest AutomationRequest ServiceTemplateProvisionRequest).each do |cls| let(:request) { "MiqProvisionRequest" } let(:username) { user.name } diff --git a/spec/helpers/application_helper/buttons/miq_request_edit_spec.rb b/spec/helpers/application_helper/buttons/miq_request_edit_spec.rb index a10bbe5b8de..5ec1d8fc4b7 100644 --- a/spec/helpers/application_helper/buttons/miq_request_edit_spec.rb +++ b/spec/helpers/application_helper/buttons/miq_request_edit_spec.rb @@ -14,7 +14,7 @@ let(:request) { "SomeRequest" } let(:username) { user.name } let(:state) { "xx" } - %w(MiqProvisionRequest MiqHostProvisionRequest VmReconfigureRequest VmCloudReconfigureRequest + %w(MiqProvisionRequest VmReconfigureRequest VmCloudReconfigureRequest VmMigrateRequest AutomationRequest ServiceTemplateProvisionRequest).each do |cls| context 'miq_request_edit' do before do diff --git a/spec/presenters/menu/default_menu_spec.rb b/spec/presenters/menu/default_menu_spec.rb index 4428207abe3..07804a03b22 100644 --- a/spec/presenters/menu/default_menu_spec.rb +++ b/spec/presenters/menu/default_menu_spec.rb @@ -25,7 +25,7 @@ FactoryGirl.create(:host_openstack_infra, :ems_id => @ems_openstack.id) menu = Menu::DefaultMenu.infrastructure_menu_section.items.map(&:name) result = ["Providers", "Clusters", "Nodes", "Virtual Machines", "Resource Pools", - "Datastores", "PXE", "Networking", "Requests", "Topology"] + "Datastores", "PXE", "Networking", "Topology"] expect(menu).to eq(result) end @@ -33,7 +33,7 @@ FactoryGirl.create(:host_vmware, :ems_id => @ems_vmware.id) menu = Menu::DefaultMenu.infrastructure_menu_section.items.map(&:name) result = ["Providers", "Clusters", "Hosts", "Virtual Machines", "Resource Pools", - "Datastores", "PXE", "Networking", "Requests", "Topology"] + "Datastores", "PXE", "Networking", "Topology"] expect(menu).to eq(result) end @@ -43,7 +43,7 @@ menu = Menu::DefaultMenu.infrastructure_menu_section.items.map(&:name) result = ["Providers", "Clusters", "Hosts / Nodes", "Virtual Machines", "Resource Pools", - "Datastores", "PXE", "Networking", "Requests", "Topology"] + "Datastores", "PXE", "Networking", "Topology"] expect(menu).to eq(result) end @@ -52,7 +52,7 @@ menu = Menu::DefaultMenu.infrastructure_menu_section.items.map(&:name) result = ["Providers", "Deployment Roles", "Hosts", "Virtual Machines", "Resource Pools", - "Datastores", "PXE", "Networking", "Requests", "Topology"] + "Datastores", "PXE", "Networking", "Topology"] expect(menu).to eq(result) end @@ -61,7 +61,7 @@ menu = Menu::DefaultMenu.infrastructure_menu_section.items.map(&:name) result = ["Providers", "Clusters", "Hosts", "Virtual Machines", "Resource Pools", - "Datastores", "PXE", "Networking", "Requests", "Topology"] + "Datastores", "PXE", "Networking", "Topology"] expect(menu).to eq(result) end @@ -71,7 +71,7 @@ menu = Menu::DefaultMenu.infrastructure_menu_section.items.map(&:name) result = ["Providers", "Clusters / Deployment Roles", "Hosts", "Virtual Machines", "Resource Pools", - "Datastores", "PXE", "Networking", "Requests", "Topology"] + "Datastores", "PXE", "Networking", "Topology"] expect(menu).to eq(result) end end