vagrant-vsphere 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44eaadb2635893728366e8b5feb84895f30ebb9f
-  data.tar.gz: d543a5d6bd671ffe7ee51502d23df6c79e07285c
+  metadata.gz: b214391a7269ce42e0026ec47e2f9a9964fa8d97
+  data.tar.gz: 3aea2543fc0e5b23e503991469d20319ef1f3b56
 SHA512:
-  metadata.gz: 1de3807f0c71b4572e15f45fc95480de464eeb6838f4b565a97c4ec9209e2dd21ef918b4783753c06fe77e1bd1eb9f0a351eaf21da7c8978a644df2300f29006
-  data.tar.gz: 94ec4d567b84a2ab4cd7df12c06f3fbd7d470dac1c3f218b15e1063c013dac79344f5f954f00b9f4f6a8fa0385d5d187fc0109ebf5bf9776c1a57d468ec19bf4
+  metadata.gz: 2f36e7102acea74674c86bf8fb892c52fe24f636ef049708d038c023760271b975fd3cc90557225fcee02d648bb199099903372f5c927a14a3975e1071bbbc4e
+  data.tar.gz: f255d642094aa816e751474da9bbdb9ca855dcaebcc131f1fe941110d379bf3953d024d30c3c598120214718b4516423009a227fe1dd57ea839a844c862c40b6

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.8.1
+current_version = 1.9.0
 tag = true
 commit = true
 

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.9.0 (2016-05-17)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.9.0)
+
+  - Add real_nic_ip option/logic to support VMs with multiple bridge adapters
+    ([vagrant-vsphere:invalid_ip_address_fix](https://github.com/nsidc/vagrant-vsphere/pull/193)).
+
 ## [1.8.1 (2016-04-27)](https://github.com/nsidc/vagrant-vsphere/releases/tag/v1.8.1)
 
   - Fix error for initial VLAN/virtual switch support

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.8.1**
+**version: 1.9.0**
 
-vagrant-vsphere (**version: 1.8.1**) is available from
+vagrant-vsphere (**version: 1.9.0**) is available from
 [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
@@ -145,6 +145,10 @@ This provider has the following settings, all are required unless noted:
   where the key must start with `guestinfo.`. VMs with VWware Tools installed can
   retrieve the value of these variables using the `vmtoolsd` command: `vmtoolsd --cmd 'info-get guestinfo.some.variable'`.
 * `notes` - _Optional_ Add arbitrary notes to the VM
+* `real_nic_ip` - _Optional_ true/false - Enable logic that forces the acquisition of the ssh IP address
+  for a target VM to be retrieved from the list of vm adapters on the host and filtered for a single legitimate
+  adapter with a defined interface.   An error will be raised if this filter is enabled and multiple valid
+  adapters exist on a host. 
 
 ### Cloning from a VM rather than a template
 

data/lib/vSphere/action/get_ssh_info.rb

@@ -13,21 +13,27 @@ module VagrantPlugins
 
         def call(env)
           env[:machine_ssh_info] = get_ssh_info(env[:vSphere_connection], env[:machine])
-
           @app.call env
         end
 
         private
 
+        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] }
+          fail Errors::VSphereError.new, :'multiple_interface_with_real_nic_ip_set' if ip_addresses.size > 1
+          ip_addresses.first
+        end
+
         def get_ssh_info(connection, machine)
           return nil if machine.id.nil?
 
           vm = get_vm_by_uuid connection, machine
-
           return nil if vm.nil?
-          return nil if vm.guest.ipAddress.nil? || vm.guest.ipAddress.empty?
+          ip_address = filter_guest_nic(vm, machine)
+          return nil if ip_address.nil? || ip_address.empty?
           {
-            host: vm.guest.ipAddress,
+            host: ip_address,
             port: 22
           }
         end

data/lib/vSphere/config.rb

@@ -27,6 +27,7 @@ module VagrantPlugins
       attr_accessor :cpu_reservation
       attr_accessor :mem_reservation
       attr_accessor :extra_config
+      attr_accessor :real_nic_ip
       attr_accessor :notes
 
       attr_reader :custom_attributes

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '1.8.1'
+    VERSION = '1.9.0'
   end
 end

data/locales/en.yml

@@ -46,6 +46,8 @@ en:
         Cannot find network card to customize
       invalid_configuration_linked_clone_with_sdrs: |-
         Cannot use Linked Clone with Storage DRS
+      multiple_interface_with_real_nic_ip_set: |-
+        real_nic_ip filtering set with multiple valid VM interfaces available
 
     config:
       host: |-

data/spec/get_ssh_info_spec.rb

@@ -23,9 +23,64 @@ describe VagrantPlugins::VSphere::Action::GetSshInfo do
 
   it 'should set the ssh info host to the IP an existing VM' do
     @env[:machine].stub(:id).and_return(EXISTING_UUID)
-
     call
 
     expect(@env[:machine_ssh_info][:host]).to be IP_ADDRESS
   end
+
+  context 'when acting on a VM with multiple network adapters' do
+    before do
+      allow(@vm.guest).to receive(:ipAddress) { '127.0.0.2' }
+      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
+                )
+        ]
+      }
+      @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'
+      end
+    end
+
+    context 'when the real_nic_ip option is true' do
+      before do
+        @env[:machine].provider_config.stub(:real_nic_ip).and_return(true)
+      end
+      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
+                    )
+            ]
+          }
+        end
+        it 'should raise an error' do
+          expect { call }.to raise_error(VagrantPlugins::VSphere::Errors::VSphereError)
+        end
+      end
+
+      it 'sets the ssh info host to the correct adapter' do
+        call
+        expect(@env[:machine_ssh_info][:host]).to eq IP_ADDRESS
+      end
+
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -64,7 +64,8 @@ RSpec.configure do |config|
         mem_reservation: nil,
         custom_attributes: {},
         notes: nil,
-        extra_config: {})
+        extra_config: {},
+        real_nic_ip: false)
     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.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri