vagrant-auto_network 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72d0e15630b3b3850d0409ca564ea4c47734696e
-  data.tar.gz: d34b1e0afaf9fc015585eb9249ff8f9f66c2c288
+  metadata.gz: 54c4da4f0bee53e5b39ea4bd507e11166a7b56e0
+  data.tar.gz: a35c80d6ad5fe095c669ab317f997717e382077b
 SHA512:
-  metadata.gz: ec5a9d7f8ba9dfb6e2fbb7516295e0fee80d603e7c18506d17d26241c4a5ac41876d446a71b92a108344226b93a4527eb6f1d89a0cdc1e7ea6b7aaf542d6cc39
-  data.tar.gz: e1d119a3a2e652e4c11821a88b24fca41958e3b733bf4126bd6360912339abe05eeef19c2c7ae55a0c589d4d61ad0e94d466aa2464232b801a1a59259b393339
+  metadata.gz: 65765f2eec79a431f740eeb2ad805f513eaa2eee7d35da0c98a0881c0a369e8fd5654715cdebf838d74c2d0e25b170a151ff46d77655ba1cb1c2253ad454ae0b
+  data.tar.gz: 9227ad6e275f71921a88019851773e86f8bdffec965555e3d525df221293c9cb507efe01de936a0e4a485015cc2cac8579623badad469f0d6e90c75a28026875

data/.travis.yml

@@ -13,5 +13,5 @@ env:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
     - TEST_VAGRANT_VERSION=v1.5.4 BUNDLER_VERSION=_1.5.3_
-    - TEST_VAGRANT_VERSION=v1.6.2
+    - TEST_VAGRANT_VERSION=v1.6.3
     - TEST_VAGRANT_VERSION=HEAD

data/CHANGELOG

@@ -1,6 +1,20 @@
 vagrant-auto_network
 ====================
 
+1.0.1
+-----
+
+2014-06-06
+
+This is a backwards compatible bugfix release.
+
+  * (GH-23) Fix crashes occurring when a VM has a pre-allocated AutoNetwork IP
+    address.
+
+  * Fix errors raised when a machine exists in the `.vagrant` directory
+    but no longer has a config in the `Vagrantfile`.
+
+
 1.0.0
 -----
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 ruby '2.0.0'
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.6.2'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.6.3'
 
 # Using the :plugins group causes Vagrant to automagially load auto_network
 # during acceptance tests.

data/lib/auto_network/action/filter_networks.rb

@@ -33,7 +33,16 @@ class AutoNetwork::Action::FilterNetworks < AutoNetwork::Action::Base
   end
 
   def machines_for_env
-    @global_env.active_machines.map { |vm_id| @global_env.machine(*vm_id) }
+    @global_env.active_machines.map do |vm_id|
+      begin
+        @global_env.machine(*vm_id)
+      rescue Vagrant::Errors::MachineNotFound
+        # This usually happens when the definition for a machine has been
+        # removed from the Vagrantfile, but the machine id still exists under
+        # the .vagrant directory.
+        nil
+      end
+    end.compact
   end
 
   def assign_address(machine)

data/lib/auto_network/action/request.rb

@@ -1,5 +1,8 @@
 require 'auto_network/action/base'
 
+
+# @todo This action should be renamed. It is more like a "pre-validation
+#   filter" than something that only fires during machine creation.
 class AutoNetwork::Action::Request < AutoNetwork::Action::Base
   # Request an auto_network IP address on VM creation
   #
@@ -12,20 +15,27 @@ class AutoNetwork::Action::Request < AutoNetwork::Action::Base
   def call(env)
     @env = env
 
-    @machine = @env[:machine]
+    machine = @env[:machine]
+
+    # Move along if this machine has no AutoNetwork interfaces.
+    @app.call(@env) if machine_auto_networks(machine).empty?
+
+    addr = AutoNetwork.active_pool_manager.address_for(machine)
+    if addr.nil?
+      addr = AutoNetwork.active_pool_manager.request(machine)
+      @env[:ui].info "AutoNetwork assigning #{addr.inspect} to '#{machine.name}'",
+        :prefix => true
+    end
 
-    request_address unless machine_has_address?(@machine)
+    filter_networks(machine, addr)
 
     @app.call(@env)
   end
 
   private
 
-  def request_address
-    machine_auto_networks(@machine).each do |net|
-      addr = AutoNetwork.active_pool_manager.request(@machine)
-      @env[:ui].info "AutoNetwork assigning #{addr.inspect} to '#{@machine.name}'",
-        :prefix => true
+  def filter_networks(machine, addr)
+    machine_auto_networks(machine).each do |net|
       filter_private_network(net, addr)
     end
   end

data/lib/auto_network/settings.rb

@@ -33,7 +33,7 @@ module AutoNetwork
       unless manager.is_a?(AutoNetwork::PoolManager)
         raise InvalidSettingErrror,
           :setting_name => 'pool_manager',
-          :value => manager
+          :value => manager.inspect
       end
 
       manager
@@ -64,7 +64,7 @@ module AutoNetwork
       rescue ArgumentError
         raise InvalidSettingErrror,
           :setting_name => 'default_pool',
-          :value => pool
+          :value => pool.inspect
       end
 
       @default_pool = pool

data/lib/auto_network/version.rb

@@ -1,3 +1,3 @@
 module AutoNetwork
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/integration/legacy_spec.rb

@@ -2,13 +2,8 @@ require 'spec_helper'
 require_relative 'shared/auto_network_0x_context'
 
 describe 'Working with AutoNetwork 0.x data' do
-  include_context 'vagrant-unit'
   include_context 'auto_network 0.x'
 
-  def current_ip(machine)
-    settings.pool_manager.with_pool_for(machine) {|p| p.address_for(machine)}
-  end
-
   before(:each) do
     env = test_env.create_vagrant_env
     @test_machine = env.machine(:test1, :dummy)

data/spec/integration/plugin_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 require_relative 'shared/auto_network_1x_context'
 
 describe AutoNetwork::Plugin do
-  include_context 'vagrant-unit'
   include_context 'auto_network 1.x'
 
   context 'when a vagrant environment is initialized' do
@@ -24,10 +23,6 @@ describe AutoNetwork::Plugin do
   end
 
   context 'when destroying a machine' do
-    def current_ip(machine)
-      settings.pool_manager.with_pool_for(machine) {|p| p.address_for(machine)}
-    end
-
     it 'releases the allocated IP address' do
       env = test_env.create_vagrant_env
       test_machine = env.machine(:test1, :dummy)
@@ -40,12 +35,38 @@ describe AutoNetwork::Plugin do
     end
   end
 
-  # Testing IP allocation is pretty tricky since it hooks into
-  # provider-specific behavior that our dummy provider does not have.
-  # Currently, this behavior is exercised by the acceptance tests.
-  context 'when creating a machine' do
-    it 'allocates an IP address' do
-      pending 'This is currently delegated to the acceptance suite.'
+  describe 'when running the request action' do
+    subject {
+      Vagrant::Action::Builder.new.tap {|b| b.use AutoNetwork::Action::Request }
+    }
+
+    context 'on a machine with no IP allocated' do
+      it 'allocates an IP address' do
+        env = test_env.create_vagrant_env
+        test_machine = env.machine(:test2, :dummy)
+
+        expect(current_ip(test_machine)).to be_nil
+
+        # This emulates Machine#action_raw which didn't show up until
+        # Vagrant 1.6.0
+        action_env = { :machine => test_machine }
+        env.action_runner.run(subject, action_env)
+
+        expect(current_ip(test_machine)).to eq('10.20.1.3')
+      end
+    end
+
+    context 'on a machine with an allocated IP address' do
+      it 'assigns the address to unfiltered network interfaces' do
+        env = test_env.create_vagrant_env
+        test_machine = env.machine(:test3, :dummy)
+
+        action_env = { :machine => test_machine }
+        env.action_runner.run(subject, action_env)
+
+        _, network_opts = test_machine.config.vm.networks.find {|n| n.first == :private_network}
+        expect(network_opts).to include(:ip => '10.20.1.4')
+      end
     end
   end
 end

data/spec/integration/shared/auto_network_0x_context.rb

@@ -1,19 +1,9 @@
-require_relative 'isolated_settings_context'
+require_relative 'auto_network_integration_context'
 
 # Creates an environment for each test containing data that would have been
 # created by an installation of AutoNetwork 0.x.
 shared_context 'auto_network 0.x' do
-  include_context 'vagrant-unit'
-  include_context 'auto_network-settings'
-
-  # Configure each testing environment to contain an AutoNetwork version 1 pool
-  # file and a single existing machine that has been allocated in the pool
-  let(:test_env) { isolated_environment }
-  let(:pool_file) { test_env.homedir.join('auto_network', 'pool.yaml') }
-  before(:each) do
-    pool_file.dirname.mkpath
-    pool_file.open('w+') do |f|
-      f.write <<-EOF
+  let(:pool_file_content) { <<-EOF }
 --- !ruby/object:AutoNetwork::Pool
 network_range: 10.20.1.0/29
 pool:
@@ -22,27 +12,8 @@ pool:
   10.20.1.4: 
   10.20.1.5: 
   10.20.1.6: 
-EOF
-    end
-
-    test_env.vagrantfile <<-EOF
-Vagrant.configure("2") do |config|
-  config.vm.define 'test1' do |node|
-    node.vm.network :private_network, :auto_network => true
-  end
-end
 EOF
 
-    # Touch an ID file so that Vagrant thinks test1 exists. The 'dummy'
-    # component of the path actually tells Vagrant which provider is managing
-    # the machine. vagrant-spec defines a dummy provider for us.
-    machine_dir = test_env.workdir.join('.vagrant/machines/test1/dummy')
-    machine_dir.mkpath
-    machine_dir.join('id').open('w+') { |f| f.write('some-uuid-string') }
-  end
+  include_context 'auto_network integration'
 
-  # Dispose of the temporary directory used to run the test.
-  after(:each) do
-    test_env.close
-  end
 end

data/spec/integration/shared/auto_network_1x_context.rb

@@ -1,19 +1,9 @@
-require_relative 'isolated_settings_context'
+require_relative 'auto_network_integration_context'
 
 # Creates an environment for each test containing a small pool of AutoNetwork
-# addresses and a single "created" VM.
+# addresses.
 shared_context 'auto_network 1.x' do
-  include_context 'vagrant-unit'
-  include_context 'auto_network-settings'
-
-  # Configure each testing environment to contain an AutoNetwork version 2 pool
-  # file and a single existing machine that has been allocated in the pool
-  let(:test_env) { isolated_environment }
-  let(:pool_file) { test_env.homedir.join('auto_network', 'pool.yaml') }
-  before(:each) do
-    pool_file.dirname.mkpath
-    pool_file.open('w+') do |f|
-      f.write <<-EOF
+  let(:pool_file_content) { <<-EOF }
 ---
 poolfile_version: 2
 pools:
@@ -25,29 +15,12 @@ pools:
         name: test1
       10.20.1.3: 
       10.20.1.4: 
+        path: #{test_env.workdir}
+        name: test3
       10.20.1.5: 
       10.20.1.6: 
-EOF
-    end
-
-    test_env.vagrantfile <<-EOF
-Vagrant.configure("2") do |config|
-  config.vm.define 'test1' do |node|
-    node.vm.network :private_network, :auto_network => true
-  end
-end
 EOF
 
-    # Touch an ID file so that Vagrant thinks test1 exists. The 'dummy'
-    # component of the path actually tells Vagrant which provider is managing
-    # the machine. vagrant-spec defines a dummy provider for us.
-    machine_dir = test_env.workdir.join('.vagrant/machines/test1/dummy')
-    machine_dir.mkpath
-    machine_dir.join('id').open('w+') { |f| f.write('') }
-  end
+  include_context 'auto_network integration'
 
-  # Dispose of the temporary directory used to run the test.
-  after(:each) do
-    test_env.close
-  end
 end

data/spec/integration/shared/auto_network_integration_context.rb

@@ -0,0 +1,84 @@
+# This context leverages the vagrant-spec library to set up isolated Vagrant
+# Environments in which integration tests can be run. Some additions are made
+# to the stop unit testing environment:
+#
+#   - The global AutoNetwork::Settings instance is stubbed such that a new
+#     settings instance is created for each test.
+#
+#   - An AutoNetwork pool file is added to each environment.
+#
+#   - A Vagrantfile and collection of machines are added that use AutoNetwork.
+#
+# This context can not be used directly. Instead, include one of the
+# version-specific contexts:
+#
+#   - auto_network 1.x
+#   - auto_network 0.x
+shared_context 'auto_network integration' do
+  include_context 'vagrant-unit'
+
+  # Create a Dummy settings module for each test.
+  let(:settings) {
+    Module.new do
+      extend AutoNetwork::Settings
+    end
+  }
+
+  # Stub the settings attached to the AutoNetwork module so we don't change
+  # global state during tests.
+  before(:each) do
+    allow(AutoNetwork).to receive(:pool_manager=) do |pool_manager|
+      settings.pool_manager = pool_manager
+    end
+    allow(AutoNetwork).to receive(:pool_manager).and_return { settings.pool_manager }
+  end
+
+  # Configure each testing environment to include an AutoNetwork pool file and
+  # some machine definitions.
+  let(:test_env) { isolated_environment }
+  let(:pool_file) { test_env.homedir.join('auto_network', 'pool.yaml') }
+  before(:each) do
+    pool_file.dirname.mkpath
+    # The actual contents of the poolfile are defined in the version-specific
+    # contexts.
+    pool_file.open('w+') {|f| f.write pool_file_content}
+
+    # Three machines are defined:
+    #
+    #   - test1 has an IP allocated in the pool and an ID allocated in the
+    #     `.vagrant` directory.
+    #
+    #   - test2 has no IP or ID allocated.
+    #
+    #   - test3 has an allocated IP, but no ID.
+    test_env.vagrantfile <<-EOF
+Vagrant.configure("2") do |config|
+  %w[test1 test2 test3].each do |machine|
+    config.vm.define machine do |node|
+      node.vm.network :private_network, :auto_network => true
+    end
+  end
+end
+EOF
+
+    # Touch an ID file so that Vagrant thinks test1 exists. The 'dummy'
+    # component of the path actually tells Vagrant which provider is managing
+    # the machine. vagrant-spec defines a dummy provider for us.
+    machine_dir = test_env.workdir.join('.vagrant/machines/test1/dummy')
+    machine_dir.mkpath
+    machine_dir.join('id').open('w+') { |f| f.write('some-uuid-string') }
+  end
+
+  # Dispose of the temporary Vagrant Environment used to run the test.
+  after(:each) do
+    test_env.close
+  end
+
+  # A helper for grabbing the IP allocated to a machine.
+  #
+  # TODO: This should probably be in a general utility module under the
+  # AutoNetwork namespace.
+  def current_ip(machine)
+    settings.pool_manager.with_pool_for(machine) {|p| p.address_for(machine)}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-auto_network
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -74,7 +74,7 @@ files:
 - spec/integration/plugin_spec.rb
 - spec/integration/shared/auto_network_0x_context.rb
 - spec/integration/shared/auto_network_1x_context.rb
-- spec/integration/shared/isolated_settings_context.rb
+- spec/integration/shared/auto_network_integration_context.rb
 - spec/spec_helper.rb
 - spec/unit/pool_spec.rb
 - spec/unit/settings_spec.rb

data/spec/integration/shared/isolated_settings_context.rb

@@ -1,17 +0,0 @@
-shared_context 'auto_network-settings' do
-  # Create a Dummy settings module for each test.
-  let(:settings) {
-    Module.new do
-      extend AutoNetwork::Settings
-    end
-  }
-
-  # Stub the settings attached to the AutoNetwork module so we don't change
-  # global state during tests.
-  before(:each) do
-    allow(AutoNetwork).to receive(:pool_manager=) do |pool_manager|
-      settings.pool_manager = pool_manager
-    end
-    allow(AutoNetwork).to receive(:pool_manager).and_return { settings.pool_manager }
-  end
-end