vagrant-vsphere 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd1509116bc12c045bab73a2ae34dbfbd6f9b573
-  data.tar.gz: 6eee258203566e7b0d811083efd1c9b38c979572
+  metadata.gz: ae7d9019775f8f961ef05883df03843773b9ebf3
+  data.tar.gz: 6c7a162ca9a69f024a2f4dc35ebb7192c8792355
 SHA512:
-  metadata.gz: d7f8aa26cb4912301bbd0a9ef69c635efc8ab98e1eeda81ea865963ff28f9d4c45fb65edc3f2b1817906e4506773ca221d911a812b0a4aacb2fe424e55ca0eed
-  data.tar.gz: 757f3bbe41516dc362f4c3c8a08f4b9082389a58e25c919a0c3c6d06a1e1af2bdf20c50953731736b207843776b747555628ff1a109a8824f479298fafb7817c
+  metadata.gz: 267fef6b672212a0e5bfde2660bc32354f0b4f963a7da8788a4597eb4cd107f1406a3ab4af2fc25922b077cd3aad5c91d70954ba4b226184b6c67fd215a6f661
+  data.tar.gz: 187a44c00e3123348f26bd3aa60c7f9f10d82c037f19e97f6ea8fe6a0ec3699c9db64f92d2f5b603355abb5c648edb9d2f1f972b06bbd5139b5e6c0b1b2e1c84

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.7.1
+current_version = 1.8.0
 tag = true
 commit = true
 

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.8.0 (2016-04-21)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.8.0)
+
+  - Allow VLANs on virtual switches to work correctly
+    ([adampointer:master](https://github.com/nsidc/vagrant-vsphere/pull/188)).
+  - Make compatible with `i18n` v0.7.0 (resolving
+    [#163](https://github.com/nsidc/vagrant-vsphere/pull/163)).
+  - Add support for specifying a full resource pool name
+    ([davidhrbac:master](https://github.com/nsidc/vagrant-vsphere/pull/152) and
+    [#189](https://github.com/nsidc/vagrant-vsphere/pull/189)).
+
 ## [1.7.1 (2016-03-30)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.7.1)
 
   - Allow `vagrant status` and `vagrant ssh` to run without a lock

data/Gemfile

@@ -8,7 +8,7 @@ group :development do
   # Vagrant environment itself using `vagrant plugin`.
 
   ruby '2.0.0'
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.4'
+  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.8.1'
 end
 
 group :plugins do

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.7.1**
+**version: 1.8.0**
 
-vagrant-vsphere (**version: 1.7.1**) is available from
+vagrant-vsphere (**version: 1.8.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation

data/lib/vSphere/action/clone.rb

@@ -212,7 +212,7 @@ module VagrantPlugins
           modify_network_card(template, spec) do |card|
             begin
               switch_port = RbVmomi::VIM.DistributedVirtualSwitchPortConnection(switchUuid: network.config.distributedVirtualSwitch.uuid, portgroupKey: network.key)
-              card.backing.port = switch_port
+              card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(port: switch_port)
             rescue
               # not connected to a distibuted switch?
               card.backing = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(network: network, deviceName: network.name)

data/lib/vSphere/util/vim_helpers.rb

@@ -13,12 +13,26 @@ module VagrantPlugins
         end
 
         def get_resource_pool(datacenter, machine)
-          compute_resource = get_compute_resource(datacenter, machine)
-          rp = compute_resource.resourcePool
-          unless machine.provider_config.resource_pool_name.nil?
-            rp = compute_resource.resourcePool.find(machine.provider_config.resource_pool_name)
-            fail Errors::VSphereError, :missing_resource_pool if rp.nil?
+          rp = get_compute_resource(datacenter, machine)
+
+          resource_pool_name = machine.provider_config.resource_pool_name || ''
+
+          entity_array = resource_pool_name.split('/')
+          entity_array.each do |entity_array_item|
+            next if entity_array_item.empty?
+            if rp.is_a? RbVmomi::VIM::Folder
+              rp = rp.childEntity.find { |f| f.name == entity_array_item } || fail(Errors::VSphereError, :missing_resource_pool)
+            elsif rp.is_a? RbVmomi::VIM::ClusterComputeResource
+              rp = rp.resourcePool.resourcePool.find { |f| f.name == entity_array_item } || fail(Errors::VSphereError, :missing_resource_pool)
+            elsif rp.is_a? RbVmomi::VIM::ResourcePool
+              rp = rp.resourcePool.find { |f| f.name == entity_array_item } || fail(Errors::VSphereError, :missing_resource_pool)
+            elsif rp.is_a? RbVmomi::VIM::ComputeResource
+              rp = rp.resourcePool.find(resource_pool_name) || fail(Errors::VSphereError, :missing_resource_pool)
+            else
+              fail Errors::VSphereError, :missing_resource_pool
+            end
           end
+          rp = rp.resourcePool if !rp.is_a?(RbVmomi::VIM::ResourcePool) && rp.respond_to?(:resourcePool)
           rp
         end
 

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.7.1'
+    VERSION = '1.8.0'
   end
 end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'vSphere/action/message_already_created'
 require 'vSphere/action/message_not_created'
 require 'vSphere/action/destroy'
 require 'vSphere/action/power_off'
+require 'vagrant-vsphere'
 
 VIM = RbVmomi::VIM
 
@@ -23,6 +24,8 @@ NAME = 'vm'
 IP_ADDRESS = '127.0.0.1'
 
 RSpec.configure do |config|
+  VagrantPlugins::VSphere::Plugin.setup_i18n
+
   # removes deprecation warnings.
   # http://stackoverflow.com/questions/20275510/how-to-avoid-deprecation-warning-for-stub-chain-in-rspec-3-0/20296359#20296359
   config.mock_with :rspec do |c|

data/vSphere.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'nokogiri', '~>1.5'
   # force the use of rbvmomi 1.8.2 to work around concurrency errors: https://github.com/nsidc/vagrant-vsphere/issues/139
   s.add_dependency 'rbvmomi', '~> 1.8.2'
-  s.add_dependency 'i18n', '~> 0.6.4'
+  s.add_dependency 'i18n', '>= 0.6.4', '< 0.8.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec-core'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -42,16 +42,22 @@ dependencies:
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement