vagrant-vsphere 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35db4ce11715c001c9a4bebf6c8aff7217b49693
-  data.tar.gz: 7f5cd308f0ccc72b11909bf7bb08a1d9f4216c90
+  metadata.gz: 6b756fdb157919fecd29925a00eff198363f03cb
+  data.tar.gz: 469e8fb045b8480ea7421383b89de2bb64051eee
 SHA512:
-  metadata.gz: 13ce317e8bbeb73c86e4f63201dc9b2c7290bb8f6f431b0e0f6f9dcbd903a859a41fb877de5aae001c60b717ef7abadd42018d26a89fd79874f3ac8ef5166367
-  data.tar.gz: b882e45a9e16398cb60d5df25fdc2b134fb8b8b0ca7ba02227ac617ada0064a259d6143c79cd11de8b142c23b7c4375bea4a027b1b819eaaaabee4bf2a0ab4ae
+  metadata.gz: 10a8751efe9d1c22a6cd82aa8d77d66d6fdb2d52bba06998f37ea0c38baf6572b54ab3b4a8bb4a489a46766bedefffed896d80a3f4dcda2d77405cb52b35b6be
+  data.tar.gz: 79ca29a2965f8cdbd1babbda23129819429c50624cf863385df6465fedc7a21903f90d50b494b01943fd52e7cee8e6f797443842a4647e73f481d8939dcfabe9

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.9.2**
+**0.10.0**
 
-vagrant-vsphere (0.9.2) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
+vagrant-vsphere (0.10.0) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
 
@@ -93,6 +93,7 @@ This provider has the following settings, all are required unless noted:
 * `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
+* `vm_base_path` - _Optional_ path to folder where new VM sould be created, if not specified template's parent folder will be used
 * `name` - _Optional_ name of the new VM, if missing the name will be auto generated
 * `customization_spec_name` - _Optional_ customization spec for the new VM
 * `data_store_name` - _Optional_ the datastore where the VM will be located
@@ -172,7 +173,9 @@ This is useful if running Vagrant from multiple directories or if multiple machi
   * reuse folder sync code from Vagrant core. [#66 mkuzmin:sync-folders](https://github.com/nsidc/vagrant-vsphere/pull/66)
 * 0.9.2
   * Instruct vagrant to set the guest hostname according to Vagrantfile [#69 ddub:set-hostname](https://github.com/nsidc/vagrant-vsphere/pull/69)
-
+* 0.10.0
+  * new optional parameter to clone into custom folder in vSphere [#73 mikola-spb:vm-base-path](https://github.com/nsidc/vagrant-vsphere/pull/73)
+  * follows semvar better, this adds functionality in a backwards compatible way, so bumps the minor. 0.9.0, should have been a major version.
 
 ## Versioning
 

data/lib/vSphere/action/clone.rb

@@ -21,8 +21,9 @@ module VagrantPlugins
           name = get_name machine, config
           dc = get_datacenter connection, machine
           template = dc.find_vm config.template_name
-
           raise Errors::VSphereError, :'missing_template' if template.nil?
+          vm_base_folder = get_vm_base_folder dc, template, config
+          raise Errors::VSphereError, :'invalid_base_path' if vm_base_folder.nil?
 
           begin
             location = get_location connection, machine, config, template
@@ -32,10 +33,10 @@ module VagrantPlugins
             spec[:customization] = get_customization_spec(machine, customization_info) unless customization_info.nil?
 
             env[:ui].info I18n.t('vsphere.creating_cloned_vm')
-            env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{config.template_name}"
-            env[:ui].info " -- Name: #{name}"
+            env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{template.pretty_path}"
+            env[:ui].info " -- Target VM: #{vm_base_folder.pretty_path}/#{name}"
 
-            new_vm = template.CloneVM_Task(:folder => template.parent, :name => name, :spec => spec).wait_for_completion
+            new_vm = template.CloneVM_Task(:folder => vm_base_folder, :name => name, :spec => spec).wait_for_completion
           rescue Errors::VSphereError => e
             raise
           rescue Exception => e
@@ -125,6 +126,14 @@ module VagrantPlugins
           # milliseconds + random number suffix to allow for simultaneous `vagrant up` of the same box in different dirs
           prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
         end
+
+        def get_vm_base_folder(dc, template, config)
+          if config.vm_base_path.nil?
+            template.parent
+          else
+            dc.vmFolder.traverse(config.vm_base_path, RbVmomi::VIM::Folder)
+          end
+        end
       end
     end
   end

data/lib/vSphere/config.rb

@@ -13,6 +13,7 @@ module VagrantPlugins
       attr_accessor :clone_from_vm
       attr_accessor :template_name
       attr_accessor :name
+      attr_accessor :vm_base_path
       attr_accessor :customization_spec_name
       attr_accessor :data_store_name
       attr_accessor :linked_clone

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.9.2'
+    VERSION = '0.10.0'
   end
 end

data/locales/en.yml

@@ -24,6 +24,8 @@ en:
     errors:
       missing_template: |-
         Configured template/source VM could not be found
+      invalid_base_path: |-
+        Could not find base path for target VM, check 'vm_base_path' configuration value
       missing_datacenter: |-
         Configured data center not found
       missing_compute_resource: |-

data/spec/clone_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 
+CUSTOM_VM_FOLDER = 'custom_vm_folder'
+
 describe VagrantPlugins::VSphere::Action::Clone do
   before :each do
     @env[:vSphere_connection] = @vim
   end
 
-  it 'should create a CloneVM task' do
+  it "should create a CloneVM task with template's parent" do
     call
     expect(@template).to have_received(:CloneVM_Task).with({
       :folder => @data_center,
@@ -14,6 +16,19 @@ describe VagrantPlugins::VSphere::Action::Clone do
     })
   end
 
+  it 'should create a CloneVM task with custom folder when given vm base path' do
+    custom_base_folder = double(CUSTOM_VM_FOLDER,
+                                :pretty_path => "#{@data_center.pretty_path}/#{CUSTOM_VM_FOLDER}")
+    @machine.provider_config.stub(:vm_base_path).and_return(CUSTOM_VM_FOLDER)
+    @data_center.vmFolder.stub(:traverse).with(CUSTOM_VM_FOLDER, RbVmomi::VIM::Folder).and_return(custom_base_folder)
+    call
+    expect(@template).to have_received(:CloneVM_Task).with({
+      :folder => custom_base_folder,
+      :name => NAME,
+      :spec => {:location => {:pool => @child_resource_pool} }
+    })
+  end
+
   it 'should set the machine id to be the new UUID' do
     call
     expect(@machine).to have_received(:id=).with(NEW_UUID)

data/spec/spec_helper.rb

@@ -42,6 +42,7 @@ RSpec.configure do |config|
         :data_center_name => nil,
         :compute_resource_name => 'testcomputeresource',
         :resource_pool_name => 'testresourcepool',
+        :vm_base_path => nil,
         :template_name => TEMPLATE,
         :name => NAME,
         :insecure => true,
@@ -96,12 +97,14 @@ RSpec.configure do |config|
 
     @data_center = double('data_center',
                           :vmFolder => vm_folder,
+                          :pretty_path => "data_center/#{vm_folder}",
                           :find_compute_resource => double('compute resource', :resourcePool => @root_resource_pool))
 
     @template = double('template_vm',
                        :parent => @data_center,
+                       :pretty_path => "#{@data_center.pretty_path}/template_vm",
                        :CloneVM_Task => double('result',
-                                                :wait_for_completion => double('new_vm', :config => double('config', :uuid => NEW_UUID))))
+                                               :wait_for_completion => double('new_vm', :config => double('config', :uuid => NEW_UUID))))
 
     @data_center.stub(:find_vm).with(TEMPLATE).and_return(@template)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Andrew Grauch