vagrant-vsphere 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a1a898766988a184569fc058c077650f032569b
-  data.tar.gz: e0947ca1cd5ed3b11fe6d63e2d0520cc7e1667bb
+  metadata.gz: d18d24bc77ed74d9653df37d88dd8f86f5b7330d
+  data.tar.gz: 21c8bd222a808a4cfa0885a5a319be806d4612e3
 SHA512:
-  metadata.gz: 4fb61ccad6fc0d7bb33442f22795c51da9c9b78df40c3b8e7575f3fb8e5b56bb5ff7ad7323589b2fb6befa9ccad6b27f71772d3b84818c3f47b348210c08d196
-  data.tar.gz: 6c64eb13ce87c80388698978a362f4ef4b525126a5d4803cc780046670ee7fb6c24628c8d052a85be8fa220441b0569519c408daf47cd6b241b51fcd5e018997
+  metadata.gz: 3f754461b77ae977825e5333be117af21babb85872472330e39d9b8049077dce0a22efbd1e0cced27a00e22f7a56baa9cf497a799641a3c5eb66638b06998ed0
+  data.tar.gz: 8d3481366b6e28f2678310ce9a20d6d70a33c40bfe6b74023ec1764c14eb7f8c41b872958aafec2a7a918cd608b48ec89b1afdf6f1502db7f44a0c20d335580f

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.11.0
+current_version = 1.11.1
 tag = true
 commit = true
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.11.1 (2017-02-27)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.11.1)
+  - Fix 'real_nic_ip' filter logic bug
+    ([vagrant-vsphere:fix_ssh_ip_selection](https://github.com/nsidc/vagrant-vsphere/pull/229))
+
 ## [1.11.0 (2016-11-23)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.11.0)
 
   - Wait for Windows sysprep when cloning a Windows box

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

data/lib/vSphere/action/get_ssh_info.rb

@@ -20,9 +20,12 @@ module VagrantPlugins
 
         def filter_guest_nic(vm, machine)
           return vm.guest.ipAddress unless machine.provider_config.real_nic_ip
-          ip_addresses = vm.guest.net.select { |g| g.deviceConfigId > 0 }.map { |g| g.ipAddress[0] }
+
+          interfaces = vm.guest.net.select { |g| g.deviceConfigId > 0 }
+          ip_addresses = interfaces.map { |i| i.ipConfig.ipAddress.select { |a| a.state == 'preferred' } }.flatten
+
           fail Errors::VSphereError.new, :'multiple_interface_with_real_nic_ip_set' if ip_addresses.size > 1
-          ip_addresses.first
+          ip_addresses.first.ipAddress
         end
 
         def get_ssh_info(connection, machine)

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.11.0'
+    VERSION = '1.11.1'
   end
 end

data/spec/get_ssh_info_spec.rb

@@ -28,27 +28,50 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
     expect(@env[:machine_ssh_info][:host]).to be IP_ADDRESS
   end
 
-  context 'when acting on a VM with multiple network adapters' do
+  context 'when acting on a VM with a single network adapter' do
     before do
       allow(@vm.guest).to receive(:ipAddress) { '127.0.0.2' }
+      @env[:machine].stub(:id).and_return(EXISTING_UUID)
+    end
+
+    it 'should return the correct ip address' do
+      call
+      expect(@env[:machine_ssh_info][:host]).to eq '127.0.0.2'
+    end
+  end
+
+  context 'when acting on a VM with multiple network adapters' do
+    before do
+      @env[:machine].stub(:id).and_return(EXISTING_UUID)
       allow(@vm.guest).to receive(:net) {
-        [
-          double('guest_nic_info',
-                 ipAddress: ['127.0.0.2', 'mac address'],
-                 deviceConfigId: -1
-                ),
-          double('guest_nic_info',
-                 ipAddress: ['127.0.0.1', 'mac address'],
-                 deviceConfigId: 4000
-                )
+        [double('GuestNicInfo',
+                ipAddress: ['bad address', '127.0.0.1'],
+                deviceConfigId: 4000,
+                ipConfig: double('NetIpConfigInfo',
+                                 ipAddress: [double('NetIpConfigInfoIpAddress',
+                                                    ipAddress: 'bad address', state: 'unknown'),
+                                             double('NetIpConfigInfoIpAddress',
+                                                    ipAddress: '127.0.0.1', state: 'preferred')]
+                                )
+               ),
+         double('GuestNicInfo',
+                ipAddress: ['bad address', '255.255.255.255'],
+                deviceConfigId: -1,
+                ipConfig: double('NetIpConfigInfo',
+                                 ipAddress: [double('NetIpConfigInfoIpAddress',
+                                                    ipAddress: 'bad address', state: 'unknown'),
+                                             double('NetIpConfigInfoIpAddress',
+                                                    ipAddress: '255.255.255.255', state: 'preferred')]
+                                )
+               )
         ]
       }
-      @env[:machine].stub(:id).and_return(EXISTING_UUID)
     end
+
     context 'when the real_nic_ip option is false' do
       it 'sets the ssh info the original adapter' do
         call
-        expect(@env[:machine_ssh_info][:host]).to eq '127.0.0.2'
+        expect(@env[:machine_ssh_info][:host]).to eq IP_ADDRESS
       end
     end
 
@@ -59,17 +82,29 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
       context 'when there are mutiple valid adapters' do
         before do
           allow(@vm.guest).to receive(:net) {
-            [
-              double('guest_nic_info',
-                     ipAddress: ['127.0.0.2', 'mac address'],
-                     deviceConfigId: 4001
-                    ),
-              double('guest_nic_info',
-                     ipAddress: ['127.0.0.1', 'mac address'],
-                     deviceConfigId: 4000
-                    )
+            [double('GuestNicInfo',
+                    ipAddress: ['bad address', '127.0.0.1'],
+                    deviceConfigId: 4000,
+                    ipConfig: double('NetIpConfigInfo',
+                                     ipAddress: [double('NetIpConfigInfoIpAddress',
+                                                        ipAddress: 'bad address', state: 'unknown'),
+                                                 double('NetIpConfigInfoIpAddress',
+                                                        ipAddress: '127.0.0.2', state: 'preferred')]
+                                    )
+                   ),
+             double('GuestNicInfo',
+                    ipAddress: ['bad address', '255.255.255.255'],
+                    deviceConfigId: 2000,
+                    ipConfig: double('NetIpConfigInfo',
+                                     ipAddress: [double('NetIpConfigInfoIpAddress',
+                                                        ipAddress: 'bad address', state: 'unknown'),
+                                                 double('NetIpConfigInfoIpAddress',
+                                                        ipAddress: '255.255.255.255', state: 'preferred')]
+                                    )
+                   )
             ]
           }
+
         end
         it 'should raise an error' do
           expect { call }.to raise_error(VagrantPlugins::VSphere::Errors::VSphereError)

data/vSphere.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rbvmomi', '>=1.8.2', '<2.0.0'
   s.add_dependency 'i18n', '>= 0.6.4', '< 0.8.0'
 
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '11.1.2' # pinned to accommodate rubocop 0.32.1
   s.add_development_dependency 'rspec-core'
   s.add_development_dependency 'rspec-expectations'
   s.add_development_dependency 'rspec-mocks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -68,16 +68,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.1.2
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: VMWare vSphere provider