Skip to content

Commit

Permalink
Delete code related to the no longer supported MKS remote consoles
Browse files Browse the repository at this point in the history
  • Loading branch information
skateman committed Jul 1, 2019
1 parent 85ee86e commit 85acbf7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 29 deletions.
5 changes: 0 additions & 5 deletions app/models/manageiq/providers/vmware/infra_manager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,6 @@ def vm_remove_disk_by_file(vm, options = {})
end
alias vm_remove_disk vm_remove_disk_by_file

def vm_acquire_mks_ticket(vm, options = {})
invoke_vim_ws(:acquireMksTicket, vm, options[:user_event])
end
alias_method :vm_remote_console_mks_acquire_ticket, :vm_acquire_mks_ticket

def vm_acquire_ticket(vm, options = {})
invoke_vim_ws(:acquireTicket, vm, options[:user_event], options[:ticket_type])
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module ManageIQ::Providers::Vmware::InfraManager::Vm::RemoteConsole
require_dependency 'securerandom'

def console_supported?(type)
%w(VMRC VNC MKS WEBMKS).include?(type.upcase)
%w(VMRC VNC WEBMKS).include?(type.upcase)
end

def validate_remote_console_acquire_ticket(protocol, options = {})
Expand Down Expand Up @@ -37,15 +37,6 @@ def remote_console_acquire_ticket_queue(protocol, userid)
MiqTask.generic_action_with_callback(task_opts, queue_opts)
end

#
# MKS
#

def remote_console_mks_acquire_ticket(_userid = nil, _originating_server = nil)
validate_remote_console_acquire_ticket("mks", :check_if_running => false)
ext_management_system.vm_remote_console_mks_acquire_ticket(self)
end

#
# VMRC
#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@
let(:vm) { FactoryBot.create(:vm_with_ref, :ext_management_system => ems) }

context '#remote_console_acquire_ticket' do
it 'with :mks' do
expect(vm).to receive(:remote_console_mks_acquire_ticket).with(user.userid, 1)
vm.remote_console_acquire_ticket(user.userid, 1, :mks)
end

it 'with :webmks' do
expect(vm).to receive(:remote_console_webmks_acquire_ticket).with(user.userid, 1)
vm.remote_console_acquire_ticket(user.userid, 1, :webmks)
Expand All @@ -41,15 +36,6 @@
allow(MiqServer).to receive_messages(:my_server => server)
end

it 'with :mks' do
vm.remote_console_acquire_ticket_queue(:mks, user.userid)

q_all = MiqQueue.all
expect(q_all.length).to eq(1)
expect(q_all[0].method_name).to eq('remote_console_acquire_ticket')
expect(q_all[0].args).to eq([user.userid, 1, :mks])
end

it 'with :webmks' do
vm.remote_console_acquire_ticket_queue(:webmks, user.userid)

Expand Down

0 comments on commit 85acbf7

Please sign in to comment.