vagrant-vsphere 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c011d25a3f928fd80cd7fc8c9df74e647de432a8
-  data.tar.gz: c4f6350c4ac9090a4fa87a167f9ae73e18069768
+  metadata.gz: 86bbc3afad22bc9be46d1ea266be3eb020251f29
+  data.tar.gz: 576d495fee241d31b5954b1bb55886bc7438b7e4
 SHA512:
-  metadata.gz: 51261468c611ba92faf5803e6883b7fa5219efe4c4be61a18cd54c42122a9bc6a8afd8261b9dcd26f7508d6dbec569916bf505021a34921c97ce550410830325
-  data.tar.gz: 45038a038b302e6c82a06d8e9bf459f35daa25f329b937ca1795d32795217383e2a17a57dcec9195b3978e58f876d98442dc5680cc43566a9841362c256aac0f
+  metadata.gz: 8f62c938f26de6ef905bf1d97899ff095630c4c165bd328ec8c9d6f2d7a1dafad4ace951cca5b4fd23c173936b89d23c9e285917b9f5d44593704395b95d48fc
+  data.tar.gz: f0a47dd6662ea81107f5a64761b5416933310739613dd19140de3416d37524f19c27c74a9b0b959dfee5ea1264ab11d54c854fc416763acd48e6f65f8f1e475d

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.15.0
+current_version = 0.16.0
 tag = true
 commit = true
 

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
-**version: 0.15.0**
+**version: 0.16.0**
 
-vagrant-vsphere (**version: 0.15.0**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
+vagrant-vsphere (**version: 0.16.0**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
 
@@ -101,6 +101,7 @@ This provider has the following settings, all are required unless noted:
 * `proxy_host` - _Optional_ proxy host name for connecting to vSphere via proxy
 * `proxy_port` - _Optional_ proxy port number for connecting to vSphere via proxy
 * `vlan` - _Optional_ vlan to connect the first NIC to
+* `memory_mb` - _Optional_ Configure the amount of memory (in MB) for the new VM
 
 ### Cloning from a VM rather than a template
 
@@ -192,6 +193,7 @@ This is useful if running Vagrant from multiple directories or if multiple machi
   * If the VM is powered on, then it is powered off, and destroyed.
   * If the VM is powered off, it is just destroyed.
   * If the VM is suspended, it is powered on, then powered off, then destroyed.
+* 0.16.0 Add ability to configure amount of memory the new cloned VM will have [#94 rylarson:add-memory-configuration](https://github.com/nsidc/vagrant-vsphere/pull/94).
 
 
 ## Versioning

data/lib/vSphere/action/clone.rb

@@ -28,10 +28,12 @@ module VagrantPlugins
           begin
             location = get_location connection, machine, config, template
             spec = RbVmomi::VIM.VirtualMachineCloneSpec :location => location, :powerOn => true, :template => false
+            spec[:config] = RbVmomi::VIM.VirtualMachineConfigSpec
             customization_info = get_customization_spec_info_by_name connection, machine
 
             spec[:customization] = get_customization_spec(machine, customization_info) unless customization_info.nil?
             add_custom_vlan(template, dc, spec, config.vlan) unless config.vlan.nil?
+            add_custom_memory(spec, config.memory_mb) unless config.memory_mb.nil?
 
             env[:ui].info I18n.t('vsphere.creating_cloned_vm')
             env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{template.pretty_path}"
@@ -137,7 +139,7 @@ module VagrantPlugins
         end
 
         def add_custom_vlan(template, dc, spec, vlan)
-          spec[:config] = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
+          spec[:config][:deviceChange] = []
           network = get_network_by_name(dc, vlan)
           config = template.config
           card = config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first or fail Errors::VSphereError, :missing_network_card
@@ -151,6 +153,10 @@ module VagrantPlugins
           dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
           spec[:config][:deviceChange].push dev_spec
         end
+
+        def add_custom_memory(spec, memory_mb)
+          spec[:config][:memoryMB] = Integer(memory_mb)
+        end
       end
     end
   end

data/lib/vSphere/config.rb

@@ -20,6 +20,7 @@ module VagrantPlugins
       attr_accessor :proxy_host
       attr_accessor :proxy_port
       attr_accessor :vlan
+      attr_accessor :memory_mb
 
       def validate(machine)
         errors = _detected_errors

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.15.0'
+    VERSION = '0.16.0'
   end
 end

data/spec/clone_spec.rb

@@ -12,7 +12,8 @@ describe VagrantPlugins::VSphere::Action::Clone do
     expect(@template).to have_received(:CloneVM_Task).with({
       :folder => @data_center,
       :name => NAME,
-      :spec => {:location => {:pool => @child_resource_pool} }
+      :spec => {:location => {:pool => @child_resource_pool}, 
+        :config => RbVmomi::VIM.VirtualMachineConfigSpec }
     })
   end
 
@@ -25,7 +26,8 @@ describe VagrantPlugins::VSphere::Action::Clone do
     expect(@template).to have_received(:CloneVM_Task).with({
       :folder => custom_base_folder,
       :name => NAME,
-      :spec => {:location => {:pool => @child_resource_pool} }
+      :spec => {:location => {:pool => @child_resource_pool},
+        :config => RbVmomi::VIM.VirtualMachineConfigSpec }
     })
   end
 
@@ -55,11 +57,22 @@ describe VagrantPlugins::VSphere::Action::Clone do
       :name => NAME,
       :spec => {:location => 
         {:pool => @child_resource_pool},
-        :config => expected_config
+          :config => expected_config
       }
     })
   end
 
+  it 'should create a CloneVM spec with configured memory_mb' do
+    @machine.provider_config.stub(:memory_mb).and_return(2048)
+    call
+    expect(@template).to have_received(:CloneVM_Task).with({
+      :folder => @data_center,
+      :name => NAME,
+      :spec => {:location => {:pool => @child_resource_pool}, 
+        :config => RbVmomi::VIM.VirtualMachineConfigSpec(:memoryMB => 2048) },
+    })
+  end
+
   it 'should set static IP when given config spec' do
     @machine.provider_config.stub(:customization_spec_name).and_return('spec')
     call
@@ -72,7 +85,8 @@ describe VagrantPlugins::VSphere::Action::Clone do
     expect(@template).to have_received(:CloneVM_Task).with({
       :folder => @data_center,
       :name => NAME,
-      :spec => {:location => {:pool => @root_resource_pool } }
+      :spec => {:location => {:pool => @root_resource_pool }, 
+        :config => RbVmomi::VIM.VirtualMachineConfigSpec }
     })
   end
 end

data/spec/spec_helper.rb

@@ -53,7 +53,8 @@ RSpec.configure do |config|
         :linked_clone => nil,
         :proxy_host => nil,
         :proxy_port => nil,
-        :vlan => nil)
+        :vlan => nil,
+        :memory_mb => nil)
     vm_config = double(
       :vm => double('config_vm',
                     :box => nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri