vagrant-openstack-provider 0.6.0 → 0.6.1

data/spec/vagrant-openstack-provider/action/create_server_spec.rb

@@ -195,17 +195,20 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
       it 'become active after one retry' do
         nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'ACTIVE' })
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
-        @action.waiting_for_server_to_be_built(env, 'server-01', 1, 5)
+        config.stub(:server_create_timeout) { 5 }
+        @action.waiting_for_server_to_be_built(env, 'server-01', 1)
       end
       it 'timeout before the server become active' do
         nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'BUILD' })
         nova.should_receive(:get_server_details).with(env, 'server-01').at_least(2).times
-        expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1, 3) }.to raise_error Errors::Timeout
+        config.stub(:server_create_timeout) { 3 }
+        expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1) }.to raise_error Errors::Timeout
       end
       it 'raise an error after one retry' do
         nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'ERROR' })
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
-        expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1, 3) }.to raise_error Errors::ServerStatusError
+        config.stub(:server_create_timeout) { 3 }
+        expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1) }.to raise_error Errors::ServerStatusError
       end
     end
   end

data/spec/vagrant-openstack-provider/action/create_stack_spec.rb

@@ -22,6 +22,7 @@ describe VagrantPlugins::Openstack::Action::CreateStack do
           }
         ]
       end
+      config.stub(:stack_create_timeout) { 200 }
     end
   end
 
@@ -80,17 +81,20 @@ describe VagrantPlugins::Openstack::Action::CreateStack do
       it 'become active after one retry' do
         heat.stub(:get_stack_details).and_return({ 'stack_status' => 'CREATE_IN_PROGRESS' }, { 'stack_status' => 'CREATE_COMPLETE' })
         heat.should_receive(:get_stack_details).with(env, 'stack1', 'id-01').exactly(2).times
-        @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1, 5)
+        config.stub(:stack_create_timeout) { 5 }
+        @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1)
       end
       it 'timeout before the server become active' do
         heat.stub(:get_stack_details).and_return({ 'stack_status' => 'CREATE_IN_PROGRESS' }, { 'stack_status' => 'CREATE_IN_PROGRESS' })
         heat.should_receive(:get_stack_details).with(env, 'stack1', 'id-01').at_least(2).times
-        expect { @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1, 3) }.to raise_error Errors::Timeout
+        config.stub(:stack_create_timeout) { 3 }
+        expect { @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1) }.to raise_error Errors::Timeout
       end
       it 'raise an error after one retry' do
         heat.stub(:get_stack_details).and_return({ 'stack_status' => 'CREATE_IN_PROGRESS' }, { 'stack_status' => 'CREATE_FAILED' })
         heat.should_receive(:get_stack_details).with(env, 'stack1', 'id-01').exactly(2).times
-        expect { @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1, 3) }.to raise_error Errors::StackStatusError
+        config.stub(:stack_create_timeout) { 3 }
+        expect { @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1) }.to raise_error Errors::StackStatusError
       end
     end
   end

data/spec/vagrant-openstack-provider/action/delete_server_spec.rb

@@ -15,6 +15,10 @@ describe VagrantPlugins::Openstack::Action::DeleteServer do
     end
   end
 
+  let(:config) do
+    double('config')
+  end
+
   let(:env) do
     Hash.new.tap do |env|
       env[:ui] = double('ui')
@@ -22,6 +26,7 @@ describe VagrantPlugins::Openstack::Action::DeleteServer do
       env[:ui].stub(:error).with(anything)
       env[:openstack_client] = openstack_client
       env[:machine] = OpenStruct.new.tap do |m|
+        m.provider_config = config
         m.id = 'server_id'
       end
     end
@@ -59,22 +64,26 @@ describe VagrantPlugins::Openstack::Action::DeleteServer do
         nova.stub(:get_server_details).once.and_return('status' => 'ACTIVE')
         nova.stub(:get_server_details).once.and_raise(Errors::InstanceNotFound)
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(1).times
-        @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 5)
+        config.stub(:server_delete_timeout) { 5 }
+        @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1)
       end
       it 'become deleted after one retry' do
         nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'DELETED' })
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
-        @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 5)
+        config.stub(:server_delete_timeout) { 5 }
+        @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1)
       end
       it 'timeout before the server become active' do
         nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'ACTIVE' })
         nova.should_receive(:get_server_details).with(env, 'server-01').at_least(2).times
-        expect { @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 3) }.to raise_error Errors::Timeout
+        config.stub(:server_delete_timeout) { 3 }
+        expect { @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1) }.to raise_error Errors::Timeout
       end
       it 'raise an error after one retry' do
         nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'ERROR' })
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
-        expect { @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 3) }.to raise_error Errors::ServerStatusError
+        config.stub(:server_delete_timeout) { 3 }
+        expect { @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1) }.to raise_error Errors::ServerStatusError
       end
     end
   end

data/spec/vagrant-openstack-provider/action/read_ssh_info_spec.rb

@@ -25,8 +25,17 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
 
   let(:nova) do
     double('nova').tap do |nova|
-      nova.stub(:get_all_floating_ips).with(anything) do
-        [FloatingIP.new('80.81.82.83', 'pool-1', nil), FloatingIP.new('30.31.32.33', 'pool-2', '1234')]
+      nova.stub(:get_server_details).with(env, '1234') do
+        {
+          'addresses' => {
+            'net' => [
+              {
+                'addr' => '80.80.80.80',
+                'OS-EXT-IPS:type' => 'floating'
+              }
+            ]
+          }
+        }
       end
     end
   end
@@ -136,7 +145,19 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
           config.stub(:floating_ip) { '80.80.80.80' }
           config.stub(:keypair_name) { nil }
           config.stub(:public_key_path) { nil }
-          nova.stub(:get_server_details) { { 'key_name' => 'my_keypair_name' } }
+          nova.stub(:get_server_details) do
+            {
+              'key_name' => 'my_keypair_name',
+              'addresses' => {
+                'net' => [
+                  {
+                    'addr' => '80.80.80.80',
+                    'OS-EXT-IPS:type' => 'floating'
+                  }
+                ]
+              }
+            }
+          end
           expect(nova).to receive(:get_server_details).with(env, '1234')
           @action.read_ssh_info(env).should eq(
             host: '80.80.80.80',

data/spec/vagrant-openstack-provider/action/wait_active_spec.rb

@@ -6,6 +6,10 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
     double('nova')
   end
 
+  let(:config) do
+    double('config')
+  end
+
   let(:env) do
     Hash.new.tap do |env|
       env[:ui] = double('ui').tap do |ui|
@@ -16,6 +20,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
         os.stub(:nova) { nova }
       end
       env[:machine] = OpenStruct.new.tap do |m|
+        m.provider_config = config
         m.id = 'server_id'
       end
     end
@@ -33,13 +38,15 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
         nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'ACTIVE' })
         expect(nova).to receive(:get_server_details).with(env, 'server_id').exactly(2).times
         expect(app).to receive(:call)
-        @action = WaitForServerToBeActive.new(app, nil, 1, 5)
+        config.stub(:server_active_timeout) { 5 }
+        @action = WaitForServerToBeActive.new(app, nil, 1)
         @action.call(env)
       end
       it 'timeout after one retry' do
         nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'BUILD' })
         expect(nova).to receive(:get_server_details).with(env, 'server_id').at_least(2).times
-        @action = WaitForServerToBeActive.new(app, nil, 1, 2)
+        config.stub(:server_active_timeout) { 2 }
+        @action = WaitForServerToBeActive.new(app, nil, 1)
         expect { @action.call(env) }.to raise_error Errors::Timeout
       end
     end

data/spec/vagrant-openstack-provider/action/wait_stop_spec.rb

@@ -6,6 +6,10 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
     double('nova')
   end
 
+  let(:config) do
+    double('config')
+  end
+
   let(:env) do
     Hash.new.tap do |env|
       env[:ui] = double('ui').tap do |ui|
@@ -16,6 +20,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
         os.stub(:nova) { nova }
       end
       env[:machine] = OpenStruct.new.tap do |m|
+        m.provider_config = config
         m.id = 'server_id'
       end
     end
@@ -33,13 +38,15 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
         nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'SHUTOFF' })
         expect(nova).to receive(:get_server_details).with(env, 'server_id').exactly(2).times
         expect(app).to receive(:call)
-        @action = WaitForServerToStop.new(app, nil, 1, 5)
+        config.stub(:server_stop_timeout) { 5 }
+        @action = WaitForServerToStop.new(app, nil, 1)
         @action.call(env)
       end
       it 'timeout after one retry' do
         nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'ACTIVE' })
         expect(nova).to receive(:get_server_details).with(env, 'server_id').at_least(2).times
-        @action = WaitForServerToStop.new(app, nil, 1, 2)
+        config.stub(:server_stop_timeout) { 2 }
+        @action = WaitForServerToStop.new(app, nil, 1)
         expect { @action.call(env) }.to raise_error Errors::Timeout
       end
     end

data/spec/vagrant-openstack-provider/client/cinder_spec.rb

@@ -2,8 +2,24 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::CinderClient do
 
+  let(:http) do
+    double('http').tap do |http|
+      http.stub(:read_timeout) { 42 }
+      http.stub(:open_timeout) { 43 }
+    end
+  end
+
+  let(:config) do
+    double('config').tap do |config|
+      config.stub(:http) { http }
+    end
+  end
+
   let(:env) do
-    Hash.new
+    Hash.new.tap do |env|
+      env[:machine] = double('machine')
+      env[:machine].stub(:provider_config) { config }
+    end
   end
 
   let(:session) do

data/spec/vagrant-openstack-provider/client/glance_spec.rb

@@ -2,8 +2,24 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::GlanceClient do
 
+  let(:http) do
+    double('http').tap do |http|
+      http.stub(:read_timeout) { 42 }
+      http.stub(:open_timeout) { 43 }
+    end
+  end
+
+  let(:config) do
+    double('config').tap do |config|
+      config.stub(:http) { http }
+    end
+  end
+
   let(:env) do
-    Hash.new
+    Hash.new.tap do |env|
+      env[:machine] = double('machine')
+      env[:machine].stub(:provider_config) { config }
+    end
   end
 
   let(:session) do
@@ -120,7 +136,7 @@ describe VagrantPlugins::Openstack::GlanceClient do
             }
           ]}')
 
-      versions = @glance_client.get_api_version_list(:image)
+      versions = @glance_client.get_api_version_list(env)
 
       expect(versions.size).to eq(2)
     end

data/spec/vagrant-openstack-provider/client/heat_spec.rb

@@ -3,6 +3,13 @@ require 'vagrant-openstack-provider/spec_helper'
 describe VagrantPlugins::Openstack::NovaClient do
   include FakeFS::SpecHelpers::All
 
+  let(:http) do
+    double('http').tap do |http|
+      http.stub(:read_timeout) { 42 }
+      http.stub(:open_timeout) { 43 }
+    end
+  end
+
   let(:config) do
     double('config').tap do |config|
       config.stub(:openstack_auth_url) { 'http://heatAuthV2' }
@@ -10,6 +17,7 @@ describe VagrantPlugins::Openstack::NovaClient do
       config.stub(:tenant_name) { 'testTenant' }
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
+      config.stub(:http) { http }
     end
   end
 

data/spec/vagrant-openstack-provider/client/keystone_spec.rb

@@ -2,6 +2,13 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::KeystoneClient do
 
+  let(:http) do
+    double('http').tap do |http|
+      http.stub(:read_timeout) { 42 }
+      http.stub(:open_timeout) { 43 }
+    end
+  end
+
   let(:config) do
     double('config').tap do |config|
       config.stub(:openstack_auth_url) { 'http://keystoneAuthV2' }
@@ -10,6 +17,7 @@ describe VagrantPlugins::Openstack::KeystoneClient do
       config.stub(:tenant_name) { 'testTenant' }
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
+      config.stub(:http) { http }
     end
   end
 

data/spec/vagrant-openstack-provider/client/neutron_spec.rb

@@ -2,8 +2,24 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::NeutronClient do
 
+  let(:http) do
+    double('http').tap do |http|
+      http.stub(:read_timeout) { 42 }
+      http.stub(:open_timeout) { 43 }
+    end
+  end
+
+  let(:config) do
+    double('config').tap do |config|
+      config.stub(:http) { http }
+    end
+  end
+
   let(:env) do
-    Hash.new
+    Hash.new.tap do |env|
+      env[:machine] = double('machine')
+      env[:machine].stub(:provider_config) { config }
+    end
   end
 
   let(:session) do
@@ -150,7 +166,7 @@ describe VagrantPlugins::Openstack::NeutronClient do
               }
             ]}')
 
-        versions = @neutron_client.get_api_version_list(:network)
+        versions = @neutron_client.get_api_version_list(env, :network)
 
         expect(versions.size).to eq(2)
       end

data/spec/vagrant-openstack-provider/client/nova_spec.rb

@@ -6,6 +6,13 @@ describe VagrantPlugins::Openstack::NovaClient do
   let(:filename) { 'key.pub' }
   let(:ssh_key_content) { 'my public key' }
 
+  let(:http) do
+    double('http').tap do |http|
+      http.stub(:read_timeout) { 42 }
+      http.stub(:open_timeout) { 43 }
+    end
+  end
+
   let(:config) do
     double('config').tap do |config|
       config.stub(:openstack_auth_url) { 'http://novaAuthV2' }
@@ -13,6 +20,7 @@ describe VagrantPlugins::Openstack::NovaClient do
       config.stub(:tenant_name) { 'testTenant' }
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }
+      config.stub(:http) { http }
     end
   end
 

data/spec/vagrant-openstack-provider/config_resolver_spec.rb

@@ -160,6 +160,16 @@ describe VagrantPlugins::Openstack::ConfigResolver do
         @action.resolve_flavor(env).should eq(Flavor.new('fl-002', 'flavor-02', 4, 2048, 50))
       end
     end
+    context 'with list' do
+      it 'returns the first matching flavor' do
+        config.stub(:flavor) { %w(not-existing flavor-02 flavor-01) }
+        nova.stub(:get_all_flavors).with(anything) do
+          [Flavor.new('fl-001', 'flavor-01', 2, 1024, 10),
+           Flavor.new('fl-002', 'flavor-02', 4, 2048, 50)]
+        end
+        @action.resolve_flavor(env).should eq(Flavor.new('fl-002', 'flavor-02', 4, 2048, 50))
+      end
+    end
     context 'with invalid identifier' do
       it 'raise an error' do
         config.stub(:flavor) { 'not-existing' }

data/spec/vagrant-openstack-provider/config_spec.rb

@@ -75,7 +75,7 @@ describe VagrantPlugins::Openstack::Config do
 
     subject { foo_class.new }
 
-    context 'with original network not empty' do
+    context 'with original network not empty array' do
       it 'should overidde the config' do
         one = foo_class.new
         one.networks = ['foo']
@@ -88,7 +88,7 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
-    context 'with original network empty' do
+    context 'with original network empty array' do
       it 'should add the network to the existing list' do
         one = foo_class.new
         one.networks = []
@@ -101,7 +101,7 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
-    context 'with original network not empty and new empty' do
+    context 'with original network not empty array and new empty array' do
       it 'should keep the original network' do
         one = foo_class.new
         one.networks = ['foo']
@@ -114,6 +114,32 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
+    context 'with original network is a string and new empty array' do
+      it 'should keep the original network and wrap it into an array' do
+        one = foo_class.new
+        one.networks = 'foo'
+
+        two = foo_class.new
+        two.networks = []
+
+        result = one.merge(two)
+        result.networks.should =~ ['foo']
+      end
+    end
+
+    context 'with original network is a string and new is a string' do
+      it 'should overidde the config and wrap it into an array' do
+        one = foo_class.new
+        one.networks = 'foo'
+
+        two = foo_class.new
+        two.networks = 'bar'
+
+        result = one.merge(two)
+        result.networks.should =~ ['bar']
+      end
+    end
+
     context 'with original floating_ip_pool as string' do
       context 'and new as empty array' do
         it 'should put original string in a single entry array' do
@@ -222,6 +248,7 @@ describe VagrantPlugins::Openstack::Config do
       machine.stub(:config) { config }
       subject.username = 'foo'
       subject.password = 'bar'
+      subject.tenant_name = 'tenant'
       subject.keypair_name = 'keypair'
     end
 
@@ -299,7 +326,7 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
-    context 'the API key' do
+    context 'the password' do
       it 'should error if not given' do
         subject.password = nil
         I18n.should_receive(:t).with('vagrant_openstack.config.password_required').and_return error_message
@@ -315,6 +342,14 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
+    context 'the tenant name' do
+      it 'should error if not given' do
+        subject.tenant_name = nil
+        I18n.should_receive(:t).with('vagrant_openstack.config.tenant_name_required').and_return error_message
+        validation_errors.first.should == error_message
+      end
+    end
+
     context 'the ssh_timeout' do
       it 'should error if do not represent an integer' do
         subject.ssh_timeout = 'timeout'