vagrant-proxmox 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52d86a90fe57dfe5b5e6e301b57308feb678e868
-  data.tar.gz: 3372e88c27a4fd155bccc466d851109eecf6ef92
+  metadata.gz: 2147dcafed88c358a388e15bff90b58f468b95ad
+  data.tar.gz: 60f3c2c0c6045353dec19188ddaa164fd1dc99d4
 SHA512:
-  metadata.gz: 911850cd404dffe56562c95c6e1fc293ba7771cb618339f9be5d8bda7ba3e30c956e3d180156e0d9b0dda7751737439fd4e0b782c871936fe32dfc3e02efe161
-  data.tar.gz: 8ddd8000896e351c5b1da84fa7b218a54ce71bb1405657437db61991097d97a5fb3c0cad5eaa01a0288163f781fac14b3205663557162e94fbec0a2a9b84ab72
+  metadata.gz: 09c263224795ea1f5bb85e10f3795c83d5351a339fc5c998879540e817397c19c6bb323e38abda26b96f2b079f0f8d4a924e54f1a45dfeb7b7ffe10d25604dd7
+  data.tar.gz: 563fcab8eba3640b08477576d4a1d7cf7209ebd99d1ea6edc624a509ebd6d8dce149ea575d33fc0b33b24ca494b837cbfacc5cfbda87b7ff6c6fbd0d4dd5809d

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

@@ -1,23 +1,31 @@
 module VagrantPlugins
-	module Proxmox
-		module Action
+  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
+      # 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 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
+        def call env
+          if env[:machine].provider_config.selected_node != Config::UNSET_VALUE
+            if env[:proxmox_nodes].include?(env[:machine].provider_config.selected_node)
+              env[:proxmox_selected_node] = env[:machine].provider_config.selected_node
+            else
+              raise Errors::InvalidNodeError, node: env[:machine].provider_config.selected_node
+            end
+          else
+            env[:proxmox_selected_node] = env[:proxmox_nodes].sample
+          end
+          next_action env
+        end
 
-			end
+      end
 
-		end
-	end
+    end
+  end
 end

data/lib/vagrant-proxmox/config.rb

@@ -7,6 +7,11 @@ module VagrantPlugins
 			# @return [String]
 			attr_accessor :endpoint
 
+			# The Proxmox preferred cluster node
+			#
+			# @return [String]
+			attr_accessor :selected_node
+
 			# The Proxmox user name
 			#
 			# @return [String]
@@ -94,6 +99,7 @@ module VagrantPlugins
 
 			def initialize
 				@endpoint = UNSET_VALUE
+				@selected_node = UNSET_VALUE
 				@user_name = UNSET_VALUE
 				@password = UNSET_VALUE
 				@vm_type = UNSET_VALUE
@@ -116,6 +122,7 @@ module VagrantPlugins
 			# This is the hook that is called to finalize the object before it is put into use.
 			def finalize!
 				@endpoint = nil if @endpoint == UNSET_VALUE
+				@selected_node = nil if @endpoint == UNSET_VALUE
 				@user_name = nil if @user_name == UNSET_VALUE
 				@password = nil if @password == UNSET_VALUE
 				@vm_type = nil if @vm_type == UNSET_VALUE

data/lib/vagrant-proxmox/errors.rb

@@ -54,6 +54,10 @@ module VagrantPlugins
 				error_key :ssh_error
 			end
 
+      class InvalidNodeError < VagrantProxmoxError
+        error_key :invalid_node_error
+      end
+
 		end
 	end
 end

data/lib/vagrant-proxmox/version.rb

@@ -1,7 +1,7 @@
 module VagrantPlugins
 	module Proxmox
 
-		VERSION = '0.0.6'
+		VERSION = '0.0.7'
 
 	end
 end

data/locales/en.yml

@@ -71,6 +71,7 @@ en:
       no_qemu_iso_or_qemu_iso_file_specified_for_vm_type_qemu: "No qemu_iso or qemu_iso_file specified for vm_type=:qemu"
       no_qemu_os_specified_for_vm_type_qemu: "No qemu_os specified for vm_type=:qemu"
       no_qemu_disk_size_specified_for_vm_type_qemu: "No qemu_disk_size specified for vm_type=:qemu"
+      invalid_node_error: 'Invalid node specified: %{node}'
     not_created: 'The virtual machine is not created on the server!'
     rsync_folder: |-
           Rsyncing folder: %{hostpath} => %{guestpath}

data/spec/actions/select_node_spec.rb

@@ -9,22 +9,46 @@ module VagrantPlugins::Proxmox
 		let(:connection) { Connection.new 'https://proxmox.example.com/api2/json' }
 		let(:env) { {machine: environment.machine(environment.primary_machine_name, :proxmox),
 								 proxmox_connection: connection, proxmox_nodes: nodes} }
-		let(:nodes) { ['node1', 'node2'] }
+		let(:nodes) { ['node1', 'node2', 'selected_node'] }
 
 		subject(:action) { described_class.new(-> (_) {}, environment) }
 
 		describe '#call' do
 
-			before do
-				allow(nodes).to receive(:sample).and_return 'node2'
-			end
-
-			it_behaves_like 'a proxmox action call'
-
-			it 'randomly selects a node from the list of available nodes' do
-				action.call env
-				expect(env[:proxmox_selected_node]).to eq('node2')
-			end
+      it_behaves_like 'a proxmox action call'
+
+      context "when no selected_node is specified in the configuration" do
+        it 'randomly selects a node from the list of available nodes' do
+          expect(nodes).to receive(:sample).and_return 'node2'
+          action.call env
+          expect(env[:proxmox_selected_node]).to eq('node2')
+        end
+      end
+
+      context "when a specific node is specified in the configuration" do
+
+        context "when this node is included in the nodes list" do
+          before do
+            env[:machine].provider_config.selected_node = 'selected_node'
+          end
+
+          it 'selects the selected_node' do
+            expect(nodes).not_to receive(:sample)
+            action.call env
+            expect(env[:proxmox_selected_node]).to eq('selected_node')
+          end
+        end
+
+        context "when this node is not included in the nodes list" do
+          before do
+            env[:machine].provider_config.selected_node = 'invalid_node'
+          end
+
+          it 'should raise an error' do
+            expect { action.call env }.to raise_error Errors::InvalidNodeError
+          end
+        end
+      end
 
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Dirk Grappendorf
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client