vagrant-vsphere 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4dce496c79c53cffa0fa7364379c8331e4b918f
-  data.tar.gz: edc297f71f5fef2c79e03f2c6d5c25c8d4c67c90
+  metadata.gz: 18ea9f258ae0478f7b099bd5f90ab8cee9e5de79
+  data.tar.gz: 39813243c2ded6a1e451f504533cea4b4c230745
 SHA512:
-  metadata.gz: ebf9859f8b9c82f8b0807e549a2d5a267fc8966b5c450837eab8c4cef99e47348e13f7baa22643c6f2ad5eca145c677bf260674ebd72e7143fe69995912dfedf
-  data.tar.gz: 5ee5e449d626a37a7075d1581ba13ee12022f6e16f1385ff7bb2ff8a003c0217bada43864ab780ad9bde7f03fa8199b4d50f68251dc1a9381667a821a52bd1f8
+  metadata.gz: 6be072277703883e5e6876dc16c456656ca90073ea5c4d7b0fdb7ba8fab42792075abf3c598c0f6c69f273b9d349703ad08a18104af227c894eda3a8ccb68b40
+  data.tar.gz: 2281f71c3ad514d185aecda5962291ae1114019ad0b37d0089f4cfb186fea556d9df8a80169b8f8a57359582c0c2787295952f1805f883271bb8319c9980dbcd

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.13.1
+current_version = 0.14.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.13.1**
+**version: 0.14.0**
 
-vagrant-vsphere (**version: 0.13.1**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
+vagrant-vsphere (**version: 0.14.0**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
 
@@ -184,7 +184,9 @@ This is useful if running Vagrant from multiple directories or if multiple machi
   * Find and install box file for multi-provider boxes automatically [#86 mkuzmin:install-box](https://github.com/nsidc/vagrant-vsphere/pull/86) & [#87 mkuzmin/provider-name](https://github.com/nsidc/vagrant-vsphere/pull/87).
 * 0.13.1
   * Change Nokogiri Major Version dependency [#90 highsineburgh:SAITRADLab-master](https://github.com/nsidc/vagrant-vsphere/pull/90)
-
+* 0.14.0 Add vlan configuration [#91 rylarson:add-vlan-configuration](https://github.com/nsidc/vagrant-vsphere/pull/91)
+  * Added a new configuration option 'vlan' that lets you specify the vlan string
+  * If vlan is set, the clone spec is modified with an edit action to connect the first NIC on the VM to the configured VLAN.
 
 
 ## Versioning

data/lib/vSphere/action/clone.rb

@@ -31,6 +31,7 @@ module VagrantPlugins
             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?
 
             env[:ui].info I18n.t('vsphere.creating_cloned_vm')
             env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{template.pretty_path}"
@@ -131,9 +132,25 @@ module VagrantPlugins
           if config.vm_base_path.nil?
             template.parent
           else
-            dc.vmFolder.traverse(config.vm_base_path, RbVmomi::VIM::Folder, create=true)
+            dc.vmFolder.traverse(config.vm_base_path, RbVmomi::VIM::Folder, create = true)
           end
         end
+
+        def add_custom_vlan(template, dc, spec, vlan)
+          spec[:config] = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
+          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
+          begin
+            switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(:switchUuid => network.config.distributedVirtualSwitch.uuid, :portgroupKey => network.key)
+            card.backing.port = switch_port
+          rescue
+            # not connected to a distibuted switch?
+            card.backing.deviceName = network.name
+          end
+          dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => card, :operation => "edit")
+          spec[:config][:deviceChange].push dev_spec
+        end
       end
     end
   end

data/lib/vSphere/config.rb

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

data/lib/vSphere/util/vim_helpers.rb

@@ -35,6 +35,10 @@ module VagrantPlugins
 
           get_datacenter(connection, machine).find_datastore name or fail Errors::VSphereError, :missing_datastore
         end
+
+        def get_network_by_name(dc, name)
+          dc.network.find { |f| f.name == name } or fail Errors::VSphereError, :missing_vlan
+        end
       end
     end
   end

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.13.1'
+    VERSION = '0.14.0'
   end
 end

data/locales/en.yml

@@ -40,6 +40,10 @@ en:
         Configured data store not found
       too_many_private_networks: |-
         There a more private networks configured than can be assigned to the customization spec
+      missing_vlan: |-
+        Configured vlan not found
+      missing_network_card: |-
+        Cannot find network card to customize
     config:
       host: |-
         Configuration must specify a vSphere host

data/spec/clone_spec.rb

@@ -39,6 +39,27 @@ describe VagrantPlugins::VSphere::Action::Clone do
     expect(@app).to have_received :call
   end
 
+  it 'should create a CloneVM spec with configured vlan' do
+    @machine.provider_config.stub(:vlan).and_return('vlan')
+    network = double('network', :name => 'vlan')
+    network.stub(:config).and_raise(StandardError)
+    @data_center.stub(:network).and_return([network])
+    call
+
+    expected_config = RbVmomi::VIM.VirtualMachineConfigSpec(:deviceChange => Array.new)
+    expected_dev_spec = RbVmomi::VIM.VirtualDeviceConfigSpec(:device => @device, :operation => "edit")
+    expected_config[:deviceChange].push expected_dev_spec
+
+    expect(@template).to have_received(:CloneVM_Task).with({
+      :folder => @data_center,
+      :name => NAME,
+      :spec => {:location => 
+        {:pool => @child_resource_pool},
+        :config => expected_config
+      }
+    })
+  end
+
   it 'should set static IP when given config spec' do
     @machine.provider_config.stub(:customization_spec_name).and_return('spec')
     call

data/spec/spec_helper.rb

@@ -52,7 +52,8 @@ RSpec.configure do |config|
         :clone_from_vm => nil,
         :linked_clone => nil,
         :proxy_host => nil,
-        :proxy_port => nil)
+        :proxy_port => nil,
+        :vlan => nil)
     vm_config = double(
       :vm => double('config_vm',
                     :box => nil,
@@ -101,11 +102,20 @@ RSpec.configure do |config|
                           :pretty_path => "data_center/#{vm_folder}",
                           :find_compute_resource => double('compute resource', :resourcePool => @root_resource_pool))
 
+    @device = RbVmomi::VIM::VirtualEthernetCard.new
+    @device.stub(:backing).and_return(RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo.new)
+
+    @virtual_hardware = double('virtual_hardware',
+                               :device => [@device])
+    @template_config = double('template_config',
+                              :hardware => @virtual_hardware)
+
     @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))),
+                       :config => @template_config)
 
     @data_center.stub(:find_vm).with(TEMPLATE).and_return(@template)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: VMWare vSphere provider