vagrant-vsphere 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c01f25efa00ea98bcb452252a6b12b97b1b0995f
-  data.tar.gz: 884af0b718650b7e200da266d733d14da07481dd
+  metadata.gz: 4307c8c51431eff788268fadd75b40aa9ef11999
+  data.tar.gz: cef638026da154cdf1ef3f309bbd6c4d86c8a18a
 SHA512:
-  metadata.gz: 323c6212de083fabb6201868fa1a5aaa244a8cc3cd8b9ee4eb80ff6350e4ee857019b44a0a7b82c59e5932d9572b2d4fd24e4426c43d71be17673edeb86d72b9
-  data.tar.gz: f4c4eb69428cc68ea185704f2c4d8684541457061f8328ccc675f8ddeb424d115e733c01337eef87d5a86833ab51bd0d0d334e10731d644a0204df144ab01478
+  metadata.gz: aaab5d5374e8b531a597814518bc1af885f460a81261e4c58a3ee164a532c876614013ce59fddcdaa86a66c1b97f22178b7bdc1c04fc3f48e273ad8de8dccdf1
+  data.tar.gz: e33528a10e88ff7daa3d1261c0e03884d515bbbbc58526697170ef03adc99ae121a919ab077f95bc01beae1b62418d4bc49855aa7e4dbce191140e3bc2e26352

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.3.0
+current_version = 1.4.0
 tag = true
 commit = true
 

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-07-15 14:24:31 -0600 using RuboCop version 0.32.1.
+# on 2015-07-21 12:35:10 -0600 using RuboCop version 0.32.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,18 +11,18 @@ Lint/NonLocalExitFromIterator:
 
 # Offense count: 11
 Metrics/AbcSize:
-  Max: 113
+  Max: 117
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 157
+  Max: 166
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
-  Max: 17
+  Max: 18
 
-# Offense count: 103
+# Offense count: 106
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 177
@@ -30,7 +30,7 @@ Metrics/LineLength:
 # Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 56
+  Max: 57
 
 # Offense count: 1
 # Configuration parameters: CountComments.
@@ -39,7 +39,7 @@ Metrics/ModuleLength:
 
 # Offense count: 3
 Metrics/PerceivedComplexity:
-  Max: 18
+  Max: 19
 
 # Offense count: 25
 Style/Documentation:
@@ -56,7 +56,7 @@ Style/EmptyLiteral:
 Style/FirstParameterIndentation:
   Enabled: false
 
-# Offense count: 1
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
 Style/HashSyntax:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.4.0 (2015-07-29)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.4.0)
+
+  - Add ability to configure the address type (originally submitted in
+    [mreuvers:master](https://github.com/nsidc/vagrant-vsphere/pull/121), but
+    merged
+    [nsidc:address-type](https://github.com/nsidc/vagrant-vsphere/pull/142))
+
 ## [1.3.0 (2015-07-21)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.3.0)
 
   - Add ability to configure CPU and memory reservations

data/README.md

@@ -19,9 +19,9 @@ This provider is built on top of the
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 1.3.0**
+**version: 1.4.0**
 
-vagrant-vsphere (**version: 1.3.0**) is available from
+vagrant-vsphere (**version: 1.4.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
@@ -133,6 +133,8 @@ This provider has the following settings, all are required unless noted:
 * `mac` - _Optional_ Used to set the mac address of the new VM
 * `cpu_reservation` - _Optional_ Configure the CPU time (in MHz) to reserve for this VM
 * `mem_reservation` - _Optional_ Configure the memory (in MB) to reserve for this VM
+* `addressType` - _Optional_ Configure the address type of the
+  [vSphere Virtual Ethernet Card](https://www.vmware.com/support/developer/vc-sdk/visdk2xpubs/ReferenceGuide/vim.vm.device.VirtualEthernetCard.html)
 
 ### Cloning from a VM rather than a template
 
@@ -194,9 +196,24 @@ executions.
 This is useful if running Vagrant from multiple directories or if multiple
 machines are defined in the Vagrantfile.
 
+### Setting addresType for network adapter
+
+This sets the addressType of the network adapter, for example 'Manual' to
+be able to set a manual mac address.
+This value may depend on the version of vSphere you use. It may be necessary
+to set this in combination with the mac field, in order to set a manual
+mac address. For valid values for this field see VirtualEthernetCard api
+documentation of vSphere.
+
+```ruby
+vsphere.addressType = 'Manual'
+```
+
 ### Setting the MAC address
 
-To set a static MAC address, add a `vsphere.mac` to your `Vagrantfile`:
+To set a static MAC address, add a `vsphere.mac` to your `Vagrantfile`.
+In some cases you must also set `vsphere.addressType` (see above) 
+to make this work:
 
 ```ruby
 vsphere.mac = '00:50:56:XX:YY:ZZ'

data/lib/vSphere/action/clone.rb

@@ -36,6 +36,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_address_type(template, spec, config.addressType) unless config.addressType.nil?
             add_custom_mac(template, spec, config.mac) unless config.mac.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?
@@ -189,6 +190,15 @@ module VagrantPlugins
           spec[:config][:deviceChange].uniq!
         end
 
+        def add_custom_address_type(template, spec, addressType)
+          spec[:config][:deviceChange] = []
+          config = template.config
+          card = config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).first || fail(Errors::VSphereError, :missing_network_card)
+          card.addressType = addressType
+          card_spec = { :deviceChange => [{ :operation => :edit, :device => card }] }
+          template.ReconfigVM_Task(:spec => card_spec).wait_for_completion
+        end
+
         def add_custom_mac(template, spec, mac)
           modify_network_card(template, spec) do |card|
             card.macAddress = mac

data/lib/vSphere/config.rb

@@ -20,6 +20,7 @@ module VagrantPlugins
       attr_accessor :proxy_host
       attr_accessor :proxy_port
       attr_accessor :vlan
+      attr_accessor :addressType
       attr_accessor :mac
       attr_accessor :memory_mb
       attr_accessor :cpu_count

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.3.0'
+    VERSION = '1.4.0'
   end
 end

data/spec/spec_helper.rb

@@ -56,6 +56,7 @@ RSpec.configure do |config|
         memory_mb: nil,
         cpu_count: nil,
         mac: nil,
+        addressType: nil,
         cpu_reservation: nil,
         mem_reservation: nil)
     vm_config = double(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: VMWare vSphere provider