vagrant-proxmox 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23fb93ead7521fd41b3728351658699cc8401c52
-  data.tar.gz: 565cdfbaad59c6545b3c3068ded72091bcc25702
+  metadata.gz: 076be20bc1c88631ba0e7c3800e984cd8192e32a
+  data.tar.gz: 578fcb688c63d93d2d935d88267fec5f7e1866eb
 SHA512:
-  metadata.gz: e57908d99222f860c2fc63adea89708947a25237bfa6c72a21c9037961d3d4f291a41bac8580bbbb0f6be69199e28bd5c634ae01355c41b4a7f230665912c11a
-  data.tar.gz: 0120b509b00a936d85307e0ccefaf116b4fb9ac3d00f05d5360a884558031010a6b0bdb4c48588011001afcad959c980abbc34371ee4ba54d5ac0424f2a79b44
+  metadata.gz: 2d4aa5a81acc653d69477121d2912d0af8e3a2742f02fc85b8502788953859f148950d63f43866e5b59c0f6c0cf72d733cdba129ab76326bf5604cb5ce1cc5a9
+  data.tar.gz: c5f44f9e1675596a33ea8990ef44c3fccec2ecf902f9481c778b88f675c46feaf10a513d331abacee3a765f440b04af835297978d63d801c7117c9b1b68d07bb

data/lib/sanity_checks.rb

@@ -6,6 +6,6 @@ end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < '1.2.0'
+if Vagrant::VERSION < '1.4.0'
 	raise 'The Vagrant Proxmox plugin is only compatible with Vagrant 1.2+'
 end

data/lib/vagrant-proxmox.rb

@@ -1,12 +1,11 @@
 require 'pathname'
 require 'log4r'
-require 'rest-client'
-require 'retryable'
 require 'active_support/core_ext/object/try'
 
 require 'sanity_checks'
 require 'vagrant-proxmox/plugin'
 require 'vagrant-proxmox/errors'
+require 'vagrant-proxmox/proxmox/connection'
 
 
 module VagrantPlugins

data/lib/vagrant-proxmox/action.rb

@@ -32,128 +32,175 @@ module VagrantPlugins
 							end
 						else
 							b1.use GetNodeList
+							b1.use SelectNode
 							b1.use Provision
-							b1.use CreateVm
-							b1.use StartVm
-							b1.use SyncFolders
+							if env1[:machine].provider_config.vm_type == :openvz
+								b1.use Call, UploadTemplateFile do |env2, b2|
+									if env2[:result] == :ok
+										b2.use CreateVm
+										b2.use StartVm
+										b2.use SyncFolders
+									elsif env2[:result] == :file_not_found
+										b2.use MessageFileNotFound
+									elsif env2[:result] == :server_upload_error
+										b2.use MessageUploadServerError
+									end
+								end
+							elsif env1[:machine].provider_config.vm_type == :qemu
+								b1.use Call, UploadIsoFile do |env2, b2|
+									if env2[:result] == :ok
+										b2.use CreateVm
+										b2.use StartVm
+										b2.use SyncFolders
+									elsif env2[:result] == :file_not_found
+										b2.use MessageFileNotFound
+									elsif env2[:result] == :server_upload_error
+										b2.use MessageUploadServerError
+									end
+								end
+							end
 						end
 					end
 				end
 			end
 
-			def self.action_provision
-				Vagrant::Action::Builder.new.tap do |b|
-					b.use ConfigValidate
-					b.use Call, IsCreated do |env, b2|
-						if env[:result]
-							b2.use Provision
-							b2.use SyncFolders
-						else
-							b2.use MessageNotCreated
+		def self.action_provision
+			Vagrant::Action::Builder.new.tap do |b|
+				b.use ConfigValidate
+				b.use Call, IsCreated do |env1, b1|
+					if env1[:result]
+						b1.use Call, IsStopped do |env2, b2|
+							if env2[:result]
+								b2.use MessageNotRunning
+							else
+								b2.use Provision
+								b2.use SyncFolders
+							end
 						end
+					else
+						b1.use MessageNotCreated
 					end
 				end
 			end
+		end
 
-			def self.action_halt
-				Vagrant::Action::Builder.new.tap do |b|
-					b.use ConfigValidate
-					b.use Call, IsCreated do |env1, b1|
-						if env1[:result]
-							b1.use Call, IsStopped do |env2, b2|
-								if env2[:result]
-									b2.use MessageAlreadyStopped
-								else
-									b2.use ConnectProxmox
-									b2.use ShutdownVm
-								end
+		def self.action_halt
+			Vagrant::Action::Builder.new.tap do |b|
+				b.use ConfigValidate
+				b.use Call, IsCreated do |env1, b1|
+					if env1[:result]
+						b1.use Call, IsStopped do |env2, b2|
+							if env2[:result]
+								b2.use MessageAlreadyStopped
+							else
+								b2.use ConnectProxmox
+								b2.use ShutdownVm
 							end
-						else
-							b1.use MessageNotCreated
 						end
+					else
+						b1.use MessageNotCreated
 					end
 				end
 			end
+		end
 
-			# This action is called to destroy the remote machine.
-			def self.action_destroy
-				Vagrant::Action::Builder.new.tap do |b|
-					b.use ConfigValidate
-					b.use ConnectProxmox
-					b.use Call, IsCreated do |env1, b1|
-						if env1[:result]
-							b1.use Call, ::Vagrant::Action::Builtin::DestroyConfirm do |env2, b2|
-								if env2[:result]
-									b2.use Call, IsStopped do |env3, b3|
-										b3.use ShutdownVm unless env3[:result]
-										b3.use DestroyVm
-										b3.use ::Vagrant::Action::Builtin::ProvisionerCleanup
-										b3.use CleanupAfterDestroy
-									end
-								else
-									b2.use ::VagrantPlugins::ProviderVirtualBox::Action::MessageWillNotDestroy
+		# This action is called to destroy the remote machine.
+		def self.action_destroy
+			Vagrant::Action::Builder.new.tap do |b|
+				b.use ConfigValidate
+				b.use ConnectProxmox
+				b.use Call, IsCreated do |env1, b1|
+					if env1[:result]
+						b1.use Call, ::Vagrant::Action::Builtin::DestroyConfirm do |env2, b2|
+							if env2[:result]
+								b2.use Call, IsStopped do |env3, b3|
+									b3.use ShutdownVm unless env3[:result]
+									b3.use DestroyVm
+									b3.use ::Vagrant::Action::Builtin::ProvisionerCleanup
+									b3.use CleanupAfterDestroy
 								end
+							else
+								b2.use ::VagrantPlugins::ProviderVirtualBox::Action::MessageWillNotDestroy
 							end
-						else
-							b1.use MessageNotCreated
 						end
+					else
+						b1.use MessageNotCreated
 					end
 				end
 			end
+		end
 
-			def self.action_read_ssh_info
-				Vagrant::Action::Builder.new.tap do |b|
-					b.use ConfigValidate
-					b.use ConnectProxmox
-					b.use ReadSSHInfo
-				end
+		def self.action_read_ssh_info
+			Vagrant::Action::Builder.new.tap do |b|
+				b.use ConfigValidate
+				b.use ConnectProxmox
+				b.use ReadSSHInfo
 			end
+		end
 
-			def self.action_ssh
-				Vagrant::Action::Builder.new.tap do |b|
-					b.use ConfigValidate
-					b.use Call, IsCreated do |env, b2|
-						if env[:result]
-							b2.use SSHExec
-						else
-							b2.use MessageNotCreated
+		def self.action_ssh
+			Vagrant::Action::Builder.new.tap do |b|
+				b.use ConfigValidate
+				b.use Call, IsCreated do |env1, b1|
+					if env1[:result]
+						b1.use Call, IsStopped do |env2, b2|
+							if env2[:result]
+								b2.use MessageNotRunning
+							else
+								b2.use SSHExec
+							end
 						end
+					else
+						b1.use MessageNotCreated
 					end
 				end
 			end
+		end
 
-			def self.action_ssh_run
-				Vagrant::Action::Builder.new.tap do |b|
-					b.use ConfigValidate
-					b.use Call, IsCreated do |env, b2|
-						if env[:result]
-							b2.use SSHRun
-						else
-							b2.use MessageNotCreated
+		def self.action_ssh_run
+			Vagrant::Action::Builder.new.tap do |b|
+				b.use ConfigValidate
+				b.use Call, IsCreated do |env1, b1|
+					if env1[:result]
+						b1.use Call, IsStopped do |env2, b2|
+							if env2[:result]
+								b2.use MessageNotRunning
+							else
+								b2.use SSHRun
+							end
 						end
+					else
+						b1.use MessageNotCreated
 					end
 				end
 			end
+		end
 
-			action_root = Pathname.new(File.expand_path '../action', __FILE__)
-			autoload :ProxmoxAction, action_root.join('proxmox_action')
-			autoload :ConnectProxmox, action_root.join('connect_proxmox')
-			autoload :GetNodeList, action_root.join('get_node_list')
-			autoload :ReadState, action_root.join('read_state')
-			autoload :IsCreated, action_root.join('is_created')
-			autoload :IsStopped, action_root.join('is_stopped')
-			autoload :MessageAlreadyRunning, action_root.join('message_already_running')
-			autoload :MessageAlreadyStopped, action_root.join('message_already_stopped')
-			autoload :MessageNotCreated, action_root.join('message_not_created')
-			autoload :CreateVm, action_root.join('create_vm')
-			autoload :StartVm, action_root.join('start_vm')
-			autoload :StopVm, action_root.join('stop_vm')
-			autoload :ShutdownVm, action_root.join('shutdown_vm')
-			autoload :DestroyVm, action_root.join('destroy_vm')
-			autoload :CleanupAfterDestroy, action_root.join('cleanup_after_destroy')
-			autoload :ReadSSHInfo, action_root.join('read_ssh_info')
-			autoload :SyncFolders, action_root.join('sync_folders')
+		action_root = Pathname.new(File.expand_path '../action', __FILE__)
+		autoload :ProxmoxAction, action_root.join('proxmox_action')
+		autoload :ConnectProxmox, action_root.join('connect_proxmox')
+		autoload :GetNodeList, action_root.join('get_node_list')
+		autoload :SelectNode, action_root.join('select_node')
+		autoload :ReadState, action_root.join('read_state')
+		autoload :IsCreated, action_root.join('is_created')
+		autoload :IsStopped, action_root.join('is_stopped')
+		autoload :MessageAlreadyRunning, action_root.join('message_already_running')
+		autoload :MessageAlreadyStopped, action_root.join('message_already_stopped')
+		autoload :MessageNotCreated, action_root.join('message_not_created')
+		autoload :MessageNotRunning, action_root.join('message_not_running')
+		autoload :MessageFileNotFound, action_root.join('message_file_not_found')
+		autoload :MessageUploadServerError, action_root.join('message_upload_server_error')
+		autoload :CreateVm, action_root.join('create_vm')
+		autoload :StartVm, action_root.join('start_vm')
+		autoload :StopVm, action_root.join('stop_vm')
+		autoload :ShutdownVm, action_root.join('shutdown_vm')
+		autoload :DestroyVm, action_root.join('destroy_vm')
+		autoload :CleanupAfterDestroy, action_root.join('cleanup_after_destroy')
+		autoload :ReadSSHInfo, action_root.join('read_ssh_info')
+		autoload :SyncFolders, action_root.join('sync_folders')
+		autoload :UploadTemplateFile, action_root.join('upload_template_file')
+		autoload :UploadIsoFile, action_root.join('upload_iso_file')
 
-		end
 	end
 end
+end

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

@@ -2,9 +2,8 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
-			# This action connects to the Proxmox server and stores the access ticket
-			# and csrf prevention token in env[:proxmox_ticket] and
-			# env[:proxmox_csrf_prevention_token].
+			# This action connects to the Proxmox server and stores the
+			# connection in env[:proxmox_connection]
 			class ConnectProxmox < ProxmoxAction
 
 				def initialize app, env
@@ -13,13 +12,15 @@ module VagrantPlugins
 				end
 
 				def call env
-					config = env[:machine].provider_config
-					response = RestClient.post "#{config.endpoint}/access/ticket",
-					                           username: config.user_name, password: config.password
 					begin
-						json_response = JSON.parse response.to_s, symbolize_names: true
-						env[:proxmox_ticket] = json_response[:data][:ticket]
-						env[:proxmox_csrf_prevention_token] = json_response[:data][:CSRFPreventionToken]
+						config = env[:machine].provider_config
+						connection = Connection.new config.endpoint,
+																				vm_id_range: config.vm_id_range,
+																				task_timeout: config.task_timeout,
+																				task_status_check_interval: config.task_status_check_interval,
+																				imgcopy_timeout: config.imgcopy_timeout
+						connection.login username: config.user_name, password: config.password
+						env[:proxmox_connection] = connection
 					rescue => e
 						raise Errors::CommunicationError, error_msg: e.message
 					end
@@ -27,7 +28,6 @@ module VagrantPlugins
 				end
 
 			end
-
 		end
 	end
 end

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

@@ -14,29 +14,18 @@ module VagrantPlugins
 				def call env
 					env[:ui].info I18n.t('vagrant_proxmox.creating_vm')
 					config = env[:machine].provider_config
-					node = env[:proxmox_nodes].sample[:node]
+
+					node = env[:proxmox_selected_node]
 					vm_id = nil
 
 					begin
-						retryable(tries: config.task_timeout,
-						          sleep: config.task_status_check_interval) do
-							vm_id = get_free_vm_id env
-							params = {vmid: vm_id,
-							          ostemplate: config.os_template,
-							          hostname: env[:machine].config.vm.hostname || env[:machine].name.to_s,
-							          password: 'vagrant',
-							          memory: config.vm_memory,
-							          description: "#{config.vm_name_prefix}#{env[:machine].name}"}
-							get_machine_ip_address(env).try { |ip_address| params[:ip_address] = ip_address }
-
-							response = RestClient.post "#{config.endpoint}/nodes/#{node}/openvz", params,
-							                           {CSRFPreventionToken: env[:proxmox_csrf_prevention_token],
-							                            cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
-							exit_status = wait_for_completion parse_task_id(response), node, env, 'vagrant_proxmox.errors.create_vm_timeout'
-							exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
-						end
+						vm_id = connection(env).get_free_vm_id
+						params = create_params_openvz(config, env, vm_id) if config.vm_type == :openvz
+						params = create_params_qemu(config, env, vm_id) if config.vm_type == :qemu
+						exit_status = connection(env).create_vm node: node, vm_type: config.vm_type, params: params
+						exit_status == 'OK' ? exit_status : raise(VagrantPlugins::Proxmox::Errors::ProxmoxTaskFailed, proxmox_exit_status: exit_status)
 					rescue StandardError => e
-						raise VagrantPlugins::Proxmox::Errors::VMCreationError, proxmox_exit_status: e.message
+						raise VagrantPlugins::Proxmox::Errors::VMCreateError, proxmox_exit_status: e.message
 					end
 
 					env[:machine].id = "#{node}/#{vm_id}"
@@ -46,18 +35,34 @@ module VagrantPlugins
 				end
 
 				private
-				def get_free_vm_id env
-					response = RestClient.get "#{env[:machine].provider_config.endpoint}/cluster/resources?type=vm", {cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
-					json_response = JSON.parse response.to_s, symbolize_names: true
-
-					allowed_vm_ids = env[:machine].provider_config.vm_id_range.to_set
-					used_vm_ids = json_response[:data].map { |vm| vm[:vmid] }
-					free_vm_ids = (allowed_vm_ids - used_vm_ids).sort
-					free_vm_ids.empty? ? raise(VagrantPlugins::Proxmox::Errors::NoVmIdAvailable) : free_vm_ids.first
+				def create_params_qemu(config, env, vm_id)
+					network = 'e1000,bridge=vmbr0'
+					network = "e1000=#{get_machine_macaddress(env)},bridge=vmbr0" if get_machine_macaddress(env)
+					{vmid: vm_id,
+					 name: env[:machine].config.vm.hostname || env[:machine].name.to_s,
+					 ostype: config.qemu_os,
+					 ide2: "#{config.qemu_iso},media=cdrom",
+					 sata0: "raid:#{config.qemu_disk_size},format=qcow2",
+					 sockets: 1,
+					 cores: 1,
+					 memory: config.vm_memory,
+					 net0: network,
+					 description: "#{config.vm_name_prefix}#{env[:machine].name}"}
 				end
 
+				private
+				def create_params_openvz(config, env, vm_id)
+					{vmid: vm_id,
+					 ostemplate: config.openvz_os_template,
+					 hostname: env[:machine].config.vm.hostname || env[:machine].name.to_s,
+					 password: 'vagrant',
+					 memory: config.vm_memory,
+					 description: "#{config.vm_name_prefix}#{env[:machine].name}"}
+					.tap do |params|
+						params[:ip_address] = get_machine_ip_address(env) if get_machine_ip_address(env)
+					end
+				end
 			end
-
 		end
 	end
 end

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

@@ -2,21 +2,25 @@ module VagrantPlugins
 	module Proxmox
 		module Action
 
+			# This action destroys the virtual machine env[:machine]
 			class DestroyVm < ProxmoxAction
 
 				def initialize app, env
 					@app = app
+					@logger = Log4r::Logger.new 'vagrant_proxmox::action::destroy_vm'
 				end
 
 				def call env
 					env[:ui].info I18n.t('vagrant_proxmox.destroying_vm')
-					node, vm_id = env[:machine].id.split '/'
-					endpoint = env[:machine].provider_config.endpoint
-					response = RestClient.delete "#{endpoint}/nodes/#{node}/openvz/#{vm_id}",
-																		 {CSRFPreventionToken: env[:proxmox_csrf_prevention_token],
-																		  cookies: {PVEAuthCookie: env[:proxmox_ticket]}}
 
-					wait_for_completion parse_task_id(response), node, env, 'vagrant_proxmox.errors.destroy_vm_timeout'
+					begin
+						node, vm_id = env[:machine].id.split '/'
+						exit_status = connection(env).delete_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::VMDestroyError, proxmox_exit_status: e.message
+					end
+
 					env[:ui].info I18n.t('vagrant_proxmox.done')
 
 					next_action env