vagrant-vsphere 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f54f587a665afb29a5f6726a37de604ddb2b60cb
-  data.tar.gz: 249039db27a02d5674624bb6d7edea936ce49b29
+  metadata.gz: bde84889640454ab4fc3e756f28c8d1c949c70bf
+  data.tar.gz: 0268d91280e5ce182635227087062b0b53ecddf0
 SHA512:
-  metadata.gz: d02f2cacb9fa863829bac9a1125762f184f9f60251c58014d813b71f7ad4f574ee0b134a5a92cb9625d05112c9d15bdfe8243b03c889edc3e01a6d953a8e3e60
-  data.tar.gz: 84f303e78485dbf9a12546c0059e15828717b86969deb096f87c4560c2e24c2a8b9d0be9e2bbaa4af12bf56a55aa0f6515dbd18a4ac6e4cab773028b64d0ab92
+  metadata.gz: 35828ef6c5a0e9f2f76f6d962d2f3108656cd1e303e05cc563686d1c178fd38148e9b2e756f7e4f6fcda032dd63d149f15feb3507f3af0d3fefdc6b5319b3446
+  data.tar.gz: 98e6c963cee7eecb7ecaac8650ee97783b4e050cbbedfb8ad839726149feb42dde3e432c440c735aec2b5482d4fa5b7dc9027a1738d42689a7a0fcccb09e861b

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.4.1
+current_version = 1.5.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-21 12:35:10 -0600 using RuboCop version 0.32.1.
+# on 2015-09-02 10:38:06 -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: 117
+  Max: 120
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 166
+  Max: 169
 
 # Offense count: 3
 Metrics/CyclomaticComplexity:
   Max: 18
 
-# Offense count: 106
+# Offense count: 108
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 177
@@ -30,7 +30,7 @@ Metrics/LineLength:
 # Offense count: 12
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 57
+  Max: 60
 
 # Offense count: 1
 # Configuration parameters: CountComments.

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.5.0 (2015-09-08)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.5.0)
+
+  - Add support for custom attributes
+    ([michaeljb:custom-attributes](https://github.com/nsidc/vagrant-vsphere/pull/149)).
+
 ## [1.4.1 (2015-09-01)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.4.1)
 
   - Update dependency on [rbvmomi](https://github.com/vmware/rbvmomi) to 1.8.2

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.4.1**
+**version: 1.5.0**
 
-vagrant-vsphere (**version: 1.4.1**) is available from
+vagrant-vsphere (**version: 1.5.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
@@ -135,6 +135,11 @@ This provider has the following settings, all are required unless noted:
 * `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)
+* `custom_attribute` - _Optional_ Add a
+  [custom attribute](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAAahUKEwiWwbWX59jHAhVBC5IKHa3HAEU&url=http%3A%2F%2Fpubs.vmware.com%2Fvsphere-51%2Ftopic%2Fcom.vmware.vsphere.vcenterhost.doc%2FGUID-25244732-D473-4857-A471-579257B6D95F.html&usg=AFQjCNGTSl4cauFrflUJpBeTBb0Yv7R13g&sig2=a9he6W2qVvBSZ5lCiXnENA)
+  to the VM upon creation. This method takes a key/value pair,
+  e.g. `vsphere.custom_attribute('timestamp', Time.now.to_s)`, and may be called
+  multiple times to set different attributes.
 
 ### Cloning from a VM rather than a template
 
@@ -180,9 +185,9 @@ config.vm.network 'private_network', ip: '192.168.50.4'
 ```
 
 The IP address will only be set if a customization spec name is given. The
-customization spec must have network adapter settings configured with a static 
-IP address(just an unused address NOT the address you want the VM to be). The 
-config.vm.network line will overwrite the ip in the customization spec with the one you set. 
+customization spec must have network adapter settings configured with a static
+IP address(just an unused address NOT the address you want the VM to be). The
+config.vm.network line will overwrite the ip in the customization spec with the one you set.
 For each private network specified, there needs to be a corresponding network adapter in
 the customization spec. An error will be thrown if there are more networks than
 adapters.
@@ -212,7 +217,7 @@ vsphere.addressType = 'Manual'
 ### Setting the MAC address
 
 To set a static MAC address, add a `vsphere.mac` to your `Vagrantfile`.
-In some cases you must also set `vsphere.addressType` (see above) 
+In some cases you must also set `vsphere.addressType` (see above)
 to make this work:
 
 ```ruby
@@ -230,7 +235,7 @@ ESXi is not supported. Make sure to connect to a vCenter server and not directly
 ### Permissions
 If you have permission issues:
 
-1. give the connecting user read only access to everything, and full permission to a specific data center.  Narrow the permissions down after a VM is created. 
+1. give the connecting user read only access to everything, and full permission to a specific data center.  Narrow the permissions down after a VM is created.
 2. Be sure the path to the VM is correct. see  the "Template_Name" screenshots above for more information.
 
 ## Example Usage
@@ -259,6 +264,8 @@ Vagrant.configure("2") do |config|
     vsphere.user     = 'vagrant-user@vsphere'
     vsphere.password = '***************'
     vsphere.insecure = true
+
+    vsphere.custom_attribute('timestamp', Time.now.to_s)
   end
 end
 ```

data/lib/vSphere/action/clone.rb

@@ -77,6 +77,10 @@ module VagrantPlugins
               env[:ui].info " -- Target VM: #{vm_base_folder.pretty_path}/#{name}"
 
               new_vm = template.CloneVM_Task(folder: vm_base_folder, name: name, spec: spec).wait_for_completion
+
+              config.custom_attributes.each do |k, v|
+                new_vm.setCustomValue(key: k, value: v)
+              end
             end
           rescue Errors::VSphereError
             raise

data/lib/vSphere/config.rb

@@ -27,6 +27,16 @@ module VagrantPlugins
       attr_accessor :cpu_reservation
       attr_accessor :mem_reservation
 
+      attr_reader :custom_attributes
+
+      def initialize
+        @custom_attributes = {}
+      end
+
+      def custom_attribute(key, value)
+        @custom_attributes[key.to_sym] = value
+      end
+
       def validate(machine)
         errors = _detected_errors
 

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.4.1'
+    VERSION = '1.5.0'
   end
 end

data/spec/spec_helper.rb

@@ -58,7 +58,8 @@ RSpec.configure do |config|
         mac: nil,
         addressType: nil,
         cpu_reservation: nil,
-        mem_reservation: nil)
+        mem_reservation: nil,
+        custom_attributes: {})
     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: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri