vagrant-proxmox 0.0.3 → 0.0.5

data/lib/vagrant-proxmox/action/get_node_list.rb

@@ -2,8 +2,8 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
-			# This action gets a list of all the nodes of a Proxmox server cluster
-			# and stores it under env[:proxmox_nodes]
+			# This action gets a list of all the nodes e.g. ['node1', 'node2'] of
+			# a Proxmox server cluster and stores it under env[:proxmox_nodes]
 			class GetNodeList < ProxmoxAction
 
 				def initialize app, env
@@ -11,10 +11,12 @@ module VagrantPlugins
 				end
 
 				def call env
-					endpoint = env[:machine].provider_config.endpoint
-					response = RestClient.get "#{endpoint}/nodes", {cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
-					env[:proxmox_nodes] = JSON.parse(response.to_s, symbolize_names: true)[:data]
-					next_action env
+					begin
+						env[:proxmox_nodes] = env[:proxmox_connection].get_node_list
+						next_action env
+					rescue => e
+						raise Errors::CommunicationError, error_msg: e.message
+					end
 				end
 
 			end

data/lib/vagrant-proxmox/action/is_created.rb

@@ -2,6 +2,7 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
+			# set env[:result] to :is_created
 			class IsCreated < ProxmoxAction
 
 				def initialize app, env

data/lib/vagrant-proxmox/action/is_stopped.rb

@@ -2,6 +2,7 @@ module VagrantPlugins
   module Proxmox
     module Action
 
+			# set env[:result] to :stopped
       class IsStopped < ProxmoxAction
 
         def initialize app, env

data/lib/vagrant-proxmox/action/message_file_not_found.rb

@@ -0,0 +1,21 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			class MessageFileNotFound < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+				end
+
+ 				def call env
+					#TODO add file name
+					env[:ui].info I18n.t('vagrant_proxmox.errors.file_not_found')
+					next_action env
+				end
+
+			end
+
+		end
+	end
+end

data/lib/vagrant-proxmox/action/message_not_running.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			class MessageNotRunning < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+				end
+
+ 				def call env
+					env[:ui].info I18n.t('vagrant_proxmox.errors.vm_not_running')
+					next_action env
+				end
+
+			end
+
+		end
+	end
+end

data/lib/vagrant-proxmox/action/message_upload_server_error.rb

@@ -0,0 +1,20 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			class MessageUploadServerError < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+				end
+
+ 				def call env
+					env[:ui].info I18n.t('vagrant_proxmox.errors.upload_server_error')
+					next_action env
+				end
+
+			end
+
+		end
+	end
+end

data/lib/vagrant-proxmox/action/proxmox_action.rb

@@ -10,34 +10,18 @@ module VagrantPlugins
 				end
 
 				protected
-				def parse_task_id proxmox_response
-					JSON.parse(proxmox_response.to_s, symbolize_names: true)[:data]
+				def get_machine_ip_address env
+					env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:ip] rescue nil
 				end
 
-				# Wait for the completion of the proxmox task with the given upid.
 				protected
-				def wait_for_completion task_upid, node, env, timeout_message
-					begin
-						retryable(on: VagrantPlugins::Proxmox::ProxmoxTaskNotFinished,
-											tries: env[:machine].provider_config.task_timeout,
-											sleep: env[:machine].provider_config.task_status_check_interval) do
-							exit_status = get_task_exitstatus task_upid, node, env
-							exit_status.nil? ? raise(VagrantPlugins::Proxmox::ProxmoxTaskNotFinished) : exit_status
-						end
-					rescue VagrantPlugins::Proxmox::ProxmoxTaskNotFinished
-						raise Errors::Timeout.new timeout_message
-					end
+				def get_machine_macaddress env
+					env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:macaddress] rescue nil
 				end
 
 				protected
-				def get_machine_ip_address env
-					env[:machine].config.vm.networks.select { |type, _| type == :public_network }.first[1][:ip] rescue nil
-				end
-
-				private
-				def get_task_exitstatus task_upid, node, env
-					response = RestClient.get "#{env[:machine].provider_config.endpoint}/nodes/#{node}/tasks/#{task_upid}/status", {cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
-					parse_task_id(response)[:exitstatus]
+				def connection env
+					env[:proxmox_connection]
 				end
 
 			end

data/lib/vagrant-proxmox/action/read_ssh_info.rb

@@ -2,6 +2,7 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
+			# This action stores the ssh information in env[:machine_ssh_info]
 			class ReadSSHInfo < ProxmoxAction
 
 				def initialize app, env

data/lib/vagrant-proxmox/action/read_state.rb

@@ -13,21 +13,18 @@ module VagrantPlugins
 
 				def call env
 					begin
-						if env[:machine].id
-							node, vm_id = env[:machine].id.split '/'
-							endpoint = env[:machine].provider_config.endpoint
-							response = RestClient.get "#{endpoint}/nodes/#{node}/openvz/#{vm_id}/status/current",
-																				{cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
-							states = {'running' => :running,
-												'stopped' => :stopped}
-							env[:machine_state_id] = states[JSON.parse(response.to_s)['data']['status']]
-						else
-							env[:machine_state_id] = :not_created
-						end
-					rescue RestClient::InternalServerError
-						env[:machine_state_id] = :not_created
+						env[:machine_state_id] =
+							if env[:machine].id
+								node, vm_id = env[:machine].id.split '/'
+								env[:proxmox_connection].get_vm_state vm_id
+							else
+								:not_created
+							end
+						next_action env
+					rescue => e
+						raise Errors::CommunicationError, error_msg: e.message
 					end
-					next_action env
+
 				end
 
 			end

data/lib/vagrant-proxmox/action/select_node.rb

@@ -0,0 +1,23 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			# This action reads the state of a Proxmox virtual machine and stores it
+			# in env[:machine_state_id].
+			class SelectNode < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::select_node'
+				end
+
+				def call env
+					env[:proxmox_selected_node] = env[:proxmox_nodes].sample
+					next_action env
+				end
+
+			end
+
+		end
+	end
+end

data/lib/vagrant-proxmox/action/shutdown_vm.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
-			# This action shuts down a Proxmox virtual machine.
+			# This action shuts down the Proxmox virtual machine in env[:machine]
 			class ShutdownVm < ProxmoxAction
 
 				def initialize app, env
@@ -11,14 +11,14 @@ module VagrantPlugins
 				end
 
 				def call env
-					endpoint = env[:machine].provider_config.endpoint
-					node, vm_id = env[:machine].id.split '/'
 					env[:ui].info I18n.t('vagrant_proxmox.shut_down_vm')
-					response = RestClient.post "#{endpoint}/nodes/#{node}/openvz/#{vm_id}/status/shutdown", nil,
-																		 {CSRFPreventionToken: env[:proxmox_csrf_prevention_token],
-																		  cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
-
-					wait_for_completion parse_task_id(response), node, env, 'vagrant_proxmox.errors.shutdown_vm_timeout'
+					begin
+						node, vm_id = env[:machine].id.split '/'
+						exit_status = connection(env).shutdown_vm vm_id
+						exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
+					rescue StandardError => e
+						raise VagrantPlugins::Proxmox::Errors::VMShutdownError, proxmox_exit_status: e.message
+					end
 					env[:ui].info I18n.t('vagrant_proxmox.done')
 
 					next_action env

data/lib/vagrant-proxmox/action/start_vm.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
-			# This action starts a Proxmox virtual machine.
+			# This action starts the Proxmox virtual machine in env[:machine]
 			class StartVm < ProxmoxAction
 
 				def initialize app, env
@@ -11,23 +11,31 @@ module VagrantPlugins
 				end
 
 				def call env
-					endpoint = env[:machine].provider_config.endpoint
-					node, vm_id = env[:machine].id.split '/'
 					env[:ui].info I18n.t('vagrant_proxmox.starting_vm')
-					response = RestClient.post "#{endpoint}/nodes/#{node}/openvz/#{vm_id}/status/start", nil,
-																		 {CSRFPreventionToken: env[:proxmox_csrf_prevention_token],
-																		  cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
+					begin
+						node, vm_id = env[:machine].id.split '/'
+						exit_status = connection(env).start_vm vm_id
+						exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
+					rescue StandardError => e
+						raise VagrantPlugins::Proxmox::Errors::VMStartError, proxmox_exit_status: e.message
+					end
 
-					wait_for_completion parse_task_id(response), node, env, 'vagrant_proxmox.errors.start_vm_timeout'
 					env[:ui].info I18n.t('vagrant_proxmox.done')
 
 					env[:ui].info I18n.t('vagrant_proxmox.waiting_for_ssh_connection')
-					loop do
-						# If we're interrupted then just back out
-						break if env[:interrupted]
-						break if env[:machine].communicate.ready?
-						sleep env[:machine].provider_config.task_status_check_interval
+
+					retryException = Class.new StandardError
+
+					begin
+						retryable(on: retryException,
+											tries: env[:machine].provider_config.ssh_timeout / env[:machine].provider_config.ssh_status_check_interval + 1,
+											sleep: env[:machine].provider_config.ssh_status_check_interval) do
+							raise retryException unless env[:interrupted] || env[:machine].communicate.ready?
+						end
+					rescue retryException
+						raise VagrantPlugins::Proxmox::Errors::SSHError
 					end
+
 					env[:ui].info I18n.t('vagrant_proxmox.done')
 
 					next_action env

data/lib/vagrant-proxmox/action/stop_vm.rb

@@ -2,7 +2,7 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
-			# This action stops a Proxmox virtual machine.
+			# This action stops the Proxmox virtual machine in env[:machine]
 			class StopVm < ProxmoxAction
 
 				def initialize app, env
@@ -11,14 +11,15 @@ module VagrantPlugins
 				end
 
 				def call env
-					endpoint = env[:machine].provider_config.endpoint
-					node, vm_id = env[:machine].id.split '/'
-					env[:ui].info I18n.t('vagrant_proxmox.stopping_vm')
-					response = RestClient.post "#{endpoint}/nodes/#{node}/openvz/#{vm_id}/status/stop", nil,
-																		 {CSRFPreventionToken: env[:proxmox_csrf_prevention_token],
-																		  cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
+					begin
+						node, vm_id = env[:machine].id.split '/'
+						env[:ui].info I18n.t('vagrant_proxmox.stopping_vm')
+						exit_status = connection(env).stop_vm vm_id
+						exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
+					rescue StandardError => e
+						raise VagrantPlugins::Proxmox::Errors::VMStopError, proxmox_exit_status: e.message
+					end
 
-					wait_for_completion parse_task_id(response), node, env, 'vagrant_proxmox.errors.stop_vm_timeout'
 					env[:ui].info I18n.t('vagrant_proxmox.done')
 
 					next_action env

data/lib/vagrant-proxmox/action/sync_folders.rb

@@ -33,7 +33,7 @@ module VagrantPlugins
 						# rsync over to the guest path using the SSH info
 						command = [
 								'rsync', '--verbose', '--archive', '--compress', '--delete',
-								'-e', "ssh -p #{ssh_info[:port]} -i '#{ssh_info[:private_key_path]}' -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null",
+								'-e', "ssh -p #{ssh_info[:port]} -i '#{ssh_info[:private_key_path][0]}' -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null",
 								hostpath, "#{ssh_info[:username]}@#{ssh_info[:host]}:#{guestpath}"]
 
 						rsync_process = Vagrant::Util::Subprocess.execute *command

data/lib/vagrant-proxmox/action/upload_iso_file.rb

@@ -0,0 +1,38 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			# This action uploads a iso file into the local storage a given node
+			class UploadIsoFile < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::iso_file_upload'
+				end
+
+				def call env
+					env[:result] = :ok
+					config = env[:machine].provider_config
+					if config.qemu_iso_file
+						env[:result] = upload_file env, config.qemu_iso_file
+					end
+					next_action env
+				end
+
+				private
+				def upload_file env, filename
+					if File.exist? filename
+						begin
+							connection(env).upload_file(filename, content_type: 'iso', node: env[:proxmox_selected_node], storage: 'local')
+							:ok
+						rescue
+							:server_upload_error
+						end
+					else
+						:file_not_found
+					end
+				end
+			end
+		end
+	end
+end

data/lib/vagrant-proxmox/action/upload_template_file.rb

@@ -0,0 +1,38 @@
+module VagrantPlugins
+	module Proxmox
+		module Action
+
+			# This action uploads a template file into the local storage of a given node
+			class UploadTemplateFile < ProxmoxAction
+
+				def initialize app, env
+					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::template_file_upload'
+				end
+
+				def call env
+					env[:result] = :ok
+					config = env[:machine].provider_config
+					if config.openvz_template_file
+						env[:result] = upload_file env, config.openvz_template_file
+					end
+					next_action env
+				end
+
+				private
+				def upload_file env, filename
+					if File.exist? filename
+						begin
+							connection(env).upload_file(filename, content_type: 'vztmpl', node: env[:proxmox_selected_node], storage: 'local')
+							:ok
+						rescue
+							:server_upload_error
+						end
+					else
+						:file_not_found
+					end
+				end
+			end
+		end
+	end
+end

data/lib/vagrant-proxmox/config.rb

@@ -17,10 +17,20 @@ module VagrantPlugins
 			# @return [String]
 			attr_accessor :password
 
-			# The openvz os template to use for the virtual machines
+			# The virtual machine type, e.g. :openvz or :qemu
+			#
+			# @return [Symbol]
+			attr_accessor :vm_type
+
+			# The openvz os template to use for the virtual machine
 			#
 			# @return [String]
-			attr_accessor :os_template
+			attr_accessor :openvz_os_template
+
+			# The openvz os template file to upload and use for the virtual machine
+			#
+			# @return [String]
+			attr_accessor :openvz_template_file
 
 			# The id range to use for the virtual machines
 			#
@@ -47,16 +57,60 @@ module VagrantPlugins
 			# @return [Integer, Proc]
 			attr_accessor :task_status_check_interval
 
+			# The maximum timeout for a ssh connection to a virtual machine (in seconds)
+			#
+			# @return [Integer]
+			attr_accessor :ssh_timeout
+
+			# The interval between two ssh reachability status retrievals (in seconds)
+			#
+			# @return [Integer, Proc]
+			attr_accessor :ssh_status_check_interval
+
+			# The maximum timeout for a proxmox server task if it's an upload (in seconds)
+			#
+			# @return [Integer]
+			attr_accessor :imgcopy_timeout
+
+			# The qemu virtual machine operating system, e.g. :l26
+			#
+			# @return [Symbol]
+			attr_accessor :qemu_os
+
+			# The qemu iso file to use for the virtual machine
+			#
+			# @return [String]
+			attr_accessor :qemu_iso
+
+			# The qemu iso file to upload and use for the virtual machine
+			#
+			# @return [String]
+			attr_accessor :qemu_iso_file
+
+			# The qemu disk size to use for the virtual machine, e.g. '30G'
+			#
+			# @return [String]
+			attr_accessor :qemu_disk_size
+
 			def initialize
 				@endpoint = UNSET_VALUE
 				@user_name = UNSET_VALUE
 				@password = UNSET_VALUE
-				@os_template = UNSET_VALUE
+				@vm_type = UNSET_VALUE
+				@openvz_os_template = UNSET_VALUE
+				@openvz_template_file = UNSET_VALUE
 				@vm_id_range = 900..999
 				@vm_name_prefix = 'vagrant_'
 				@vm_memory = 512
 				@task_timeout = 60
 				@task_status_check_interval = 2
+				@ssh_timeout = 60
+				@ssh_status_check_interval = 5
+				@imgcopy_timeout = 120
+				@qemu_os = UNSET_VALUE
+				@qemu_iso = UNSET_VALUE
+				@qemu_iso_file = UNSET_VALUE
+				@qemu_disk_size = UNSET_VALUE
 			end
 
 			# This is the hook that is called to finalize the object before it is put into use.
@@ -64,7 +118,16 @@ module VagrantPlugins
 				@endpoint = nil if @endpoint == UNSET_VALUE
 				@user_name = nil if @user_name == UNSET_VALUE
 				@password = nil if @password == UNSET_VALUE
-				@os_template = nil if @os_template == UNSET_VALUE
+				@vm_type = nil if @vm_type == UNSET_VALUE
+				@openvz_template_file = nil if @openvz_template_file == UNSET_VALUE
+				@openvz_os_template = "local:vztmpl/#{File.basename @openvz_template_file}" if @openvz_template_file
+				@openvz_os_template = nil if @openvz_os_template == UNSET_VALUE
+				@qemu_os = nil if @qemu_os == UNSET_VALUE
+				@qemu_iso_file = nil if @qemu_iso_file == UNSET_VALUE
+				@qemu_iso = "local:iso/#{File.basename @qemu_iso_file}" if @qemu_iso_file
+				@qemu_iso = nil if @qemu_iso == UNSET_VALUE
+				@qemu_disk_size = nil if @qemu_disk_size == UNSET_VALUE
+				@qemu_disk_size = convert_disk_size_to_gigabyte @qemu_disk_size if @qemu_disk_size
 			end
 
 			def validate machine
@@ -72,10 +135,27 @@ module VagrantPlugins
 				errors << I18n.t('vagrant_proxmox.errors.no_endpoint_specified') unless @endpoint
 				errors << I18n.t('vagrant_proxmox.errors.no_user_name_specified') unless @user_name
 				errors << I18n.t('vagrant_proxmox.errors.no_password_specified') unless @password
-				errors << I18n.t('vagrant_proxmox.errors.no_os_template_specified') unless @os_template
+				errors << I18n.t('vagrant_proxmox.errors.no_vm_type_specified') unless @vm_type
+				if @vm_type == :openvz
+					errors << I18n.t('vagrant_proxmox.errors.no_openvz_os_template_or_openvz_template_file_specified_for_type_openvz') unless @openvz_os_template || @openvz_template_file
+				end
+				if @vm_type == :qemu
+					errors << I18n.t('vagrant_proxmox.errors.no_qemu_os_specified_for_vm_type_qemu') unless @qemu_os
+					errors << I18n.t('vagrant_proxmox.errors.no_qemu_iso_or_qemu_iso_file_specified_for_vm_type_qemu') unless @qemu_iso || @qemu_iso_file
+					errors << I18n.t('vagrant_proxmox.errors.no_qemu_disk_size_specified_for_vm_type_qemu') unless @qemu_disk_size
+				end
 				{'Proxmox Provider' => errors}
 			end
 
+			private
+			def convert_disk_size_to_gigabyte disk_size
+				case disk_size[-1]
+					when 'G'
+						disk_size[0..-2]
+					else
+						disk_size
+				end
+			end
 		end
 	end
 end