vagrant-vsphere 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d45a1640a54cc4ac0664e27c68354033c93ffa4
-  data.tar.gz: 8d9c88fd620a038420beba0d12387206e55ebcda
+  metadata.gz: 81543750c5ee31e6115c32b28ff14394da3e380d
+  data.tar.gz: 13f541745820d6d9708d4ef35332f9ca71b04acb
 SHA512:
-  metadata.gz: 2fb7ae63b09ecef5e1f7997bbe392aa4e43b147fc1164ff2587b225a3ca4ae65acfbdd8d63f69f1c32fefee3fb8e4da876f004156645e9d857870314c5b03bd1
-  data.tar.gz: c88435f3e28890dbf622cbfef423d3e88bf4d3dcac5c051cd87cd2740bda09c64b7581d25e8f4522f527d0e9c4d9a390760a6b121359f1f21c859550a33cb7b4
+  metadata.gz: 78d97ccc5a9844e82cc41dbfc3637490ad0caec3e8fe611ff05284c9727212121dc2ddeb17e5a380a7d4a666c9c0a6332941395201ab2e4609f469f783fc56c7
+  data.tar.gz: b52dcfda735e1c49c47e5b7a4bdf9c039fbc33c14f3eea3f206a4f9d061c7b2bff776310602381ca99f3fcf940bb471a6c95738920f5f5088fd9e3cbdb630273

data/README.md

@@ -12,9 +12,9 @@ This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**0.8.0**
+**0.8.4**
 
-vagrant-vsphere (0.8.0) is available from [RubyGems.org](https://rubygems.org/)
+vagrant-vsphere (0.8.4) is available from [RubyGems.org](https://rubygems.org/)
 
 ## Installation
 
@@ -90,7 +90,7 @@ This provider has the following settings, all are required unless noted:
 * `password` - password  for connecting to vSphere
 * `data_center_name` - _Optional_ datacenter containing the computed resource, the template and where the new VM will be created, if not specified the first datacenter found will be used
 * `compute_resource_name` - _Required if cloning from template_ the name of the host containing the resource pool for the new VM
-* `resource_pool_name` - _Required if cloning from template_ the resource pool for the new VM
+* `resource_pool_name` - the resource pool for the new VM. If not supplied, and cloning from a template, uses the root resource pool
 * `clone_from_vm` - _Optional_ use a virtual machine instead of a template as the source for the cloning operation
 * `template_name` - the VM or VM template to clone
 * `name` - _Optional_ name of the new VM, if missing the name will be auto generated
@@ -161,6 +161,8 @@ This is useful if running Vagrant from multiple directories or if multiple machi
   * fixes additional no error messages
 * 0.8.3
   * Fixed "No error message" on rbvmomi method calls. [#74: mkuzmin:rbvmomi-error-messages](https://github.com/nsidc/vagrant-vsphere/pull/74)
+* 0.8.4
+  * Use root resource pool when cloning from template[#63: matt-richardson:support-resource-pools-on-vsphere-standard-edition](https://github.com/nsidc/vagrant-vsphere/pull/63)
 
 
 

data/lib/vSphere/config.rb

@@ -28,9 +28,8 @@ module VagrantPlugins
         errors <<  I18n.t('vsphere.config.password') if password.nil?
         errors <<  I18n.t('vsphere.config.template') if template_name.nil?
 
-        # These are only required if we're cloning from an actual template
+        # Only required if we're cloning from an actual template
         errors << I18n.t('vsphere.config.compute_resource') if compute_resource_name.nil? and not clone_from_vm
-        errors << I18n.t('vsphere.config.resource_pool') if resource_pool_name.nil? and not clone_from_vm
 
         { 'vSphere Provider' => errors }
       end

data/lib/vSphere/util/vim_helpers.rb

@@ -14,7 +14,11 @@ module VagrantPlugins
 
         def get_resource_pool(connection, machine)
           cr = get_datacenter(connection, machine).find_compute_resource(machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :missing_compute_resource
-          cr.resourcePool.find(machine.provider_config.resource_pool_name) or fail Errors::VSphereError, :missing_resource_pool
+          rp = cr.resourcePool
+          if !(machine.provider_config.resource_pool_name.nil?)
+            rp = cr.resourcePool.find(machine.provider_config.resource_pool_name) or  fail Errors::VSphereError, :missing_resource_pool
+          end
+          rp
         end
 
         def get_customization_spec_info_by_name(connection, machine)

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.8.3'
+    VERSION = '0.8.4'
   end
 end

data/spec/clone_spec.rb

@@ -6,27 +6,37 @@ describe VagrantPlugins::VSphere::Action::Clone do
   end
 
   it 'should create a CloneVM task' do
-    call    
-    @template.should have_received(:CloneVM_Task).with({
+    call
+    expect(@template).to have_received(:CloneVM_Task).with({
       :folder => @data_center,
       :name => NAME,
-      :spec => {}
+      :spec => {:location => {:pool => @child_resource_pool} }
     })
   end
 
   it 'should set the machine id to be the new UUID' do
     call
-    @machine.should have_received(:id=).with(NEW_UUID)
+    expect(@machine).to have_received(:id=).with(NEW_UUID)
   end
 
   it 'should call the next item in the middleware stack' do
     call
-    @app.should have_received :call
+    expect(@app).to have_received :call
   end
-  
+
   it 'should set static IP when given config spec' do
     @machine.provider_config.stub(:customization_spec_name).and_return('spec')
     call
-    @ip.should have_received(:ipAddress=).with('0.0.0.0')
+    expect(@ip).to have_received(:ipAddress=).with('0.0.0.0')
+  end
+
+  it 'should use root resource pool when cloning from template and no resource pool specified' do
+    @machine.provider_config.stub(:resource_pool_name).and_return(nil)
+    call
+    expect(@template).to have_received(:CloneVM_Task).with({
+      :folder => @data_center,
+      :name => NAME,
+      :spec => {:location => {:pool => @root_resource_pool } }
+    })
   end
-end
+end

data/spec/connect_vsphere_spec.rb

@@ -6,7 +6,7 @@ describe VagrantPlugins::VSphere::Action::ConnectVSphere do
   end
 
   it 'should connect to vSphere' do
-    VIM.should have_received(:connect).with({
+    expect(VIM).to have_received(:connect).with({
       :host => @env[:machine].provider_config.host,
       :user => @env[:machine].provider_config.user,
       :password => @env[:machine].provider_config.password,
@@ -17,10 +17,10 @@ describe VagrantPlugins::VSphere::Action::ConnectVSphere do
   end
 
   it 'should add the vSphere connection to the environment' do
-    @env[:vSphere_connection].should be @vim
+    expect(@env[:vSphere_connection]).to be @vim
   end
 
   it 'should call the next item in the middleware stack' do
-    @app.should have_received :call
+    expect(@app).to have_received :call
   end
 end

data/spec/destroy_spec.rb

@@ -10,7 +10,7 @@ describe VagrantPlugins::VSphere::Action::Destroy do
 
     call
 
-    @env[:machine].should have_received(:id=).with(nil)
+    expect(@env[:machine]).to have_received(:id=).with(nil)
   end
 
   it 'should not create a Destroy task if VM is not found' do
@@ -18,7 +18,7 @@ describe VagrantPlugins::VSphere::Action::Destroy do
 
     call
 
-    @vm.should_not have_received :Destroy_Task
+    expect(@vm).not_to have_received :Destroy_Task
   end
 
   it 'should create a VM Destroy task if the VM exists' do
@@ -26,6 +26,6 @@ describe VagrantPlugins::VSphere::Action::Destroy do
 
     call
 
-    @vm.should have_received :Destroy_Task
+    expect(@vm).to have_received :Destroy_Task
   end
-end
+end

data/spec/get_ssh_info_spec.rb

@@ -8,8 +8,8 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
   it 'should set the ssh info to nil if machine ID is not set' do
     call
 
-    @env.has_key?(:machine_ssh_info).should be true
-    @env[:machine_ssh_info].should be nil
+    expect(@env.has_key?(:machine_ssh_info)).to be true
+    expect(@env[:machine_ssh_info]).to be nil
   end
 
   it 'should set the ssh info to nil for a VM that does not exist' do
@@ -17,8 +17,8 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
 
     call
 
-    @env.has_key?(:machine_ssh_info).should be true
-    @env[:machine_ssh_info].should be nil
+    expect(@env.has_key?(:machine_ssh_info)).to be true
+    expect(@env[:machine_ssh_info]).to be nil
   end
 
   it 'should set the ssh info host to the IP an existing VM' do
@@ -26,6 +26,6 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
 
     call
 
-    @env[:machine_ssh_info][:host].should be IP_ADDRESS
+    expect(@env[:machine_ssh_info][:host]).to be IP_ADDRESS
   end
-end
+end

data/spec/get_state_spec.rb

@@ -8,7 +8,7 @@ describe VagrantPlugins::VSphere::Action::GetState do
   it 'should set state id to not created if machine ID is not set' do
     call
 
-    @env[:machine_state_id].should be :not_created
+    expect(@env[:machine_state_id]).to be :not_created
   end
 
   it 'should set state id to not created if VM is not found' do
@@ -16,7 +16,7 @@ describe VagrantPlugins::VSphere::Action::GetState do
 
     call
 
-    @env[:machine_state_id].should be :not_created
+    expect(@env[:machine_state_id]).to be :not_created
   end
 
   it 'should set state id to running if machine is powered on' do
@@ -25,7 +25,7 @@ describe VagrantPlugins::VSphere::Action::GetState do
 
     call
 
-    @env[:machine_state_id].should be :running
+    expect(@env[:machine_state_id]).to be :running
   end
 
   it 'should set state id to powered off if machine is powered off' do
@@ -34,7 +34,7 @@ describe VagrantPlugins::VSphere::Action::GetState do
 
     call
 
-    @env[:machine_state_id].should be :poweroff
+    expect(@env[:machine_state_id]).to be :poweroff
   end
 
   it 'should set state id to powered off if machine is suspended' do
@@ -43,12 +43,12 @@ describe VagrantPlugins::VSphere::Action::GetState do
 
     call
 
-    @env[:machine_state_id].should be :poweroff
+    expect(@env[:machine_state_id]).to be :poweroff
   end
 
   it 'should call the next item in the middleware stack' do
     call
 
-    @app.should have_received :call
+    expect(@app).to have_received :call
   end
 end

data/spec/is_created_spec.rb

@@ -11,7 +11,7 @@ describe VagrantPlugins::VSphere::Action::IsCreated do
 
     call
 
-    @env[:result].should be true
+    expect(@env[:result]).to be true
   end
 
   it 'should set result to false if the VM does not exist' do
@@ -19,11 +19,11 @@ describe VagrantPlugins::VSphere::Action::IsCreated do
 
     call
 
-    @env[:result].should be false
+    expect(@env[:result]).to be false
   end
 
   it 'should call the next item in the middleware stack' do
     call
-    @app.should have_received :call
+    expect(@app).to have_received :call
   end
-end
+end

data/spec/spec_helper.rb

@@ -22,6 +22,13 @@ NAME = 'vm'
 IP_ADDRESS = '127.0.0.1'
 
 RSpec.configure do |config|
+
+  # removes deprecation warnings.
+  # http://stackoverflow.com/questions/20275510/how-to-avoid-deprecation-warning-for-stub-chain-in-rspec-3-0/20296359#20296359
+  config.mock_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+
   config.before(:each) do
     def call
       described_class.new(@app, @env).call(@env)
@@ -74,9 +81,12 @@ RSpec.configure do |config|
     vm_folder.stub(:findByUuid).with(MISSING_UUID).and_return(nil)
     vm_folder.stub(:findByUuid).with(nil).and_return(nil)
 
+    @child_resource_pool = double('testresourcepool')
+    @root_resource_pool = double('pools', :find => @child_resource_pool)
+
     @data_center = double('data_center',
                           :vmFolder => vm_folder,
-                          :find_compute_resource => double('compute resource', :resourcePool => double('pools', :find => {})))
+                          :find_compute_resource => double('compute resource', :resourcePool => @root_resource_pool))
 
     @template = double('template_vm',
                        :parent => @data_center,
@@ -87,14 +97,15 @@ RSpec.configure do |config|
 
     service_instance = double 'service_instance', :find_datacenter => @data_center
     @ip = double 'ip', :ipAddress= => nil
-    customization_spec = double 'customization spec', :nicSettingMap => [double('nic setting', :adapter => double('adapter', :ip => @ip))]
-    customization_spec.stub(:clone).and_return(customization_spec)
-    customization_spec_manager = double 'customization spec manager', :GetCustomizationSpec => double('spec info', :spec => customization_spec)
+    @customization_spec = double 'customization spec', :nicSettingMap => [double('nic setting', :adapter => double('adapter', :ip => @ip))]
+    @customization_spec.stub(:clone).and_return(@customization_spec)
+    customization_spec_manager = double 'customization spec manager', :GetCustomizationSpec => double('spec info', :spec => @customization_spec)
     service_content = double 'service content', :customizationSpecManager => customization_spec_manager
     @vim = double 'vim', :serviceInstance => service_instance, :close => true, :serviceContent => service_content
 
     VIM.stub(:connect).and_return(@vim)
     VIM.stub(:VirtualMachineRelocateSpec).and_return({})
-    VIM.stub(:VirtualMachineCloneSpec).and_return({})
+    VIM.stub(:VirtualMachineCloneSpec) do |location, powerOn, template| { :location => location[:location] } end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri