RubyGems - vagrant-openstack-provider - Versions diffs - 0.4.1 → 0.5.0 - Mend

vagrant-openstack-provider 0.4.1 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (68) hide show

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

@@ -22,7 +22,7 @@ describe VagrantPlugins::Openstack::Config do
     its(:public_key_path) { should be_nil }
     its(:availability_zone) { should be_nil }
     its(:ssh_username) { should be_nil }
-    its(:floating_ip_pool_always_allocate) { should be_false }
+    its(:floating_ip_pool_always_allocate) { should eq(false) }
     its(:scheduler_hints) { should be_nil }
     its(:security_groups) { should be_nil }
     its(:user_data) { should be_nil }
@@ -139,6 +139,20 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
+    context 'the ssh_timeout' do
+      it 'should error if do not represent an integer' do
+        subject.ssh_timeout = 'timeout'
+        I18n.should_receive(:t).with('vagrant_openstack.config.invalid_value_for_parameter',
+                                     parameter: 'ssh_timeout', value: 'timeout').and_return error_message
+        validation_errors.first.should == error_message
+      end
+      it 'should be parsed as integer if is a string that represent an integer' do
+        subject.ssh_timeout = '100'
+        validation_errors.size.should eq(0)
+        expect(subject.ssh_timeout).to eq(100)
+      end
+    end
     [:openstack_compute_url, :openstack_auth_url].each do |url|
       context "the #{url}" do
         it 'should not validate if the URL is invalid' do

data/spec/vagrant-openstack-provider/spec_helper.rb CHANGED Viewed

@@ -13,12 +13,15 @@ end
 Dir[
   'lib/vagrant-openstack-provider/config.rb',
+  'lib/vagrant-openstack-provider/config_resolver.rb',
+  'lib/vagrant-openstack-provider/utils.rb',
   'lib/vagrant-openstack-provider/errors.rb',
   'lib/vagrant-openstack-provider/provider.rb',
   'lib/vagrant-openstack-provider/client/*.rb',
   'lib/vagrant-openstack-provider/command/*.rb',
   'lib/vagrant-openstack-provider/action/*.rb'].each { |file| require file[4, file.length - 1] }
+require 'rspec/its'
 require 'webmock/rspec'
 require 'fakefs/safe'
 require 'fakefs/spec_helpers'

data/spec/vagrant-openstack-provider/utils_spec.rb ADDED Viewed

@@ -0,0 +1,103 @@
+require 'vagrant-openstack-provider/spec_helper'
+describe VagrantPlugins::Openstack::Utils do
+  let(:config) do
+    double('config').tap do |config|
+      config.stub(:tenant_name) { 'testTenant' }
+      config.stub(:server_name) { 'testName' }
+      config.stub(:floating_ip) { nil }
+    end
+  end
+  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')]
+      end
+    end
+  end
+  let(:env) do
+    Hash.new.tap do |env|
+      env[:machine] = double('machine')
+      env[:machine].stub(:provider_config) { config }
+      env[:machine].stub(:id) { '1234id' }
+      env[:openstack_client] = double('openstack_client')
+      env[:openstack_client].stub(:nova) { nova }
+    end
+  end
+  before :each do
+    Utils.send(:public, *Utils.private_instance_methods)
+    @action = Utils.new
+  end
+  describe 'get_ip_address' do
+    context 'without config.floating_ip' do
+      context 'with floating ip in nova details' do
+        it 'returns floating_ip from nova details' do
+          config.stub(:floating_ip) { nil }
+          nova.stub(:get_server_details).with(env, '1234id') do
+            {
+              'addresses' => {
+                'toto' => [{
+                  'addr' => '13.13.13.13'
+                }, {
+                  'addr' => '12.12.12.12',
+                  'OS-EXT-IPS:type' => 'floating'
+                }]
+              }
+            }
+          end
+          @action.get_ip_address(env).should eq('12.12.12.12')
+        end
+      end
+      context 'without floating ip in nova details' do
+        context 'with on single ip in nova details' do
+          it 'returns the single ip' do
+            config.stub(:floating_ip) { nil }
+            nova.stub(:get_server_details).with(env, '1234id') do
+              {
+                'addresses' => {
+                  'toto' => [{
+                    'addr' => '13.13.13.13',
+                    'OS-EXT-IPS:type' => 'fixed'
+                  }]
+                }
+              }
+            end
+            expect(@action.get_ip_address(env)).to eq('13.13.13.13')
+          end
+        end
+        context 'with multiple ips in nova details' do
+          it 'fails' do
+            config.stub(:floating_ip) { nil }
+            nova.stub(:get_server_details).with(env, '1234id') do
+              {
+                'addresses' => {
+                  'toto' => [{
+                    'addr' => '13.13.13.13'
+                  }, {
+                    'addr' => '12.12.12.12',
+                    'OS-EXT-IPS:type' => 'private'
+                  }]
+                }
+              }
+            end
+            expect { @action.get_ip_address(env) }.to raise_error(Errors::UnableToResolveIP)
+          end
+        end
+      end
+    end
+    context 'with config.floating_ip' do
+      it 'returns floating_ip' do
+        config.stub(:floating_ip) { '1.2.3.4' }
+        @action.get_ip_address(env).should eq('1.2.3.4')
+      end
+    end
+  end
+end

data/vagrant-openstack-provider.gemspec CHANGED Viewed

@@ -18,8 +18,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'colorize', '0.7.3'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec', '~> 2.13.0'
-  gem.add_development_dependency 'aruba'
+  gem.add_development_dependency 'rspec', '~> 3.1.0'
+  gem.add_development_dependency 'rspec-its', '~> 1.0.1'
+  gem.add_development_dependency 'webmock', '~> 1.18.0'
+  gem.add_development_dependency 'fakefs', '~> 0.5.2'
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -101,28 +101,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.18.0
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.2
 description: Enables Vagrant to manage machines in Openstack Cloud.
 email:
 - guillaume.giamarchi@gmail.com
@@ -133,7 +161,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rubocop.yml
-- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -148,7 +175,7 @@ files:
 - functional_tests/keys/vagrant-openstack.pub
 - functional_tests/run_tests.sh
 - gemfiles/latest_stable.gemfile
-- gemfiles/oldest_current.gemfile
+- gemfiles/minimal_release.gemfile
 - gemfiles/previous_release.gemfile
 - lib/vagrant-openstack-provider.rb
 - lib/vagrant-openstack-provider/action.rb
@@ -163,6 +190,7 @@ files:
 - lib/vagrant-openstack-provider/action/stop_server.rb
 - lib/vagrant-openstack-provider/action/suspend.rb
 - lib/vagrant-openstack-provider/action/sync_folders.rb
+- lib/vagrant-openstack-provider/action/wait_accessible.rb
 - lib/vagrant-openstack-provider/action/wait_active.rb
 - lib/vagrant-openstack-provider/action/wait_stop.rb
 - lib/vagrant-openstack-provider/client/cinder.rb
@@ -179,27 +207,48 @@ files:
 - lib/vagrant-openstack-provider/command/image_list.rb
 - lib/vagrant-openstack-provider/command/main.rb
 - lib/vagrant-openstack-provider/command/network_list.rb
+- lib/vagrant-openstack-provider/command/reset.rb
 - lib/vagrant-openstack-provider/command/utils.rb
 - lib/vagrant-openstack-provider/command/volume_list.rb
 - lib/vagrant-openstack-provider/config.rb
+- lib/vagrant-openstack-provider/config_resolver.rb
 - lib/vagrant-openstack-provider/errors.rb
 - lib/vagrant-openstack-provider/plugin.rb
 - lib/vagrant-openstack-provider/provider.rb
+- lib/vagrant-openstack-provider/utils.rb
 - lib/vagrant-openstack-provider/version.rb
 - locales/en.yml
 - spec/vagrant-openstack-provider/action/connect_openstack_spec.rb
 - spec/vagrant-openstack-provider/action/create_server_spec.rb
+- spec/vagrant-openstack-provider/action/delete_server_spec.rb
+- spec/vagrant-openstack-provider/action/message_spec.rb
 - spec/vagrant-openstack-provider/action/read_ssh_info_spec.rb
+- spec/vagrant-openstack-provider/action/read_state_spec.rb
+- spec/vagrant-openstack-provider/action/resume_server_spec.rb
+- spec/vagrant-openstack-provider/action/start_server_spec.rb
+- spec/vagrant-openstack-provider/action/stop_server_spec.rb
+- spec/vagrant-openstack-provider/action/suspend_server_spec.rb
+- spec/vagrant-openstack-provider/action/sync_folders_spec.rb
+- spec/vagrant-openstack-provider/action/wait_accessible_spec.rb
+- spec/vagrant-openstack-provider/action/wait_active_spec.rb
+- spec/vagrant-openstack-provider/action/wait_stop_spec.rb
+- spec/vagrant-openstack-provider/action_spec.rb
 - spec/vagrant-openstack-provider/client/cinder_spec.rb
 - spec/vagrant-openstack-provider/client/keystone_spec.rb
 - spec/vagrant-openstack-provider/client/neutron_spec.rb
 - spec/vagrant-openstack-provider/client/nova_spec.rb
 - spec/vagrant-openstack-provider/client/utils_spec.rb
+- spec/vagrant-openstack-provider/command/flavor_list_spec.rb
 - spec/vagrant-openstack-provider/command/floatingip_list_spec.rb
+- spec/vagrant-openstack-provider/command/image_list_spec.rb
+- spec/vagrant-openstack-provider/command/network_list_spec.rb
+- spec/vagrant-openstack-provider/command/reset_spec.rb
 - spec/vagrant-openstack-provider/command/volume_list_spec.rb
+- spec/vagrant-openstack-provider/config_resolver_spec.rb
 - spec/vagrant-openstack-provider/config_spec.rb
 - spec/vagrant-openstack-provider/provider_spec.rb
 - spec/vagrant-openstack-provider/spec_helper.rb
+- spec/vagrant-openstack-provider/utils_spec.rb
 - stackrc
 - vagrant-openstack-provider.gemspec
 homepage: https://github.com/ggiamarchi/vagrant-openstack-provider
@@ -228,14 +277,32 @@ summary: Enables Vagrant to manage machines in Openstack Cloud.
 test_files:
 - spec/vagrant-openstack-provider/action/connect_openstack_spec.rb
 - spec/vagrant-openstack-provider/action/create_server_spec.rb
+- spec/vagrant-openstack-provider/action/delete_server_spec.rb
+- spec/vagrant-openstack-provider/action/message_spec.rb
 - spec/vagrant-openstack-provider/action/read_ssh_info_spec.rb
+- spec/vagrant-openstack-provider/action/read_state_spec.rb
+- spec/vagrant-openstack-provider/action/resume_server_spec.rb
+- spec/vagrant-openstack-provider/action/start_server_spec.rb
+- spec/vagrant-openstack-provider/action/stop_server_spec.rb
+- spec/vagrant-openstack-provider/action/suspend_server_spec.rb
+- spec/vagrant-openstack-provider/action/sync_folders_spec.rb
+- spec/vagrant-openstack-provider/action/wait_accessible_spec.rb
+- spec/vagrant-openstack-provider/action/wait_active_spec.rb
+- spec/vagrant-openstack-provider/action/wait_stop_spec.rb
+- spec/vagrant-openstack-provider/action_spec.rb
 - spec/vagrant-openstack-provider/client/cinder_spec.rb
 - spec/vagrant-openstack-provider/client/keystone_spec.rb
 - spec/vagrant-openstack-provider/client/neutron_spec.rb
 - spec/vagrant-openstack-provider/client/nova_spec.rb
 - spec/vagrant-openstack-provider/client/utils_spec.rb
+- spec/vagrant-openstack-provider/command/flavor_list_spec.rb
 - spec/vagrant-openstack-provider/command/floatingip_list_spec.rb
+- spec/vagrant-openstack-provider/command/image_list_spec.rb
+- spec/vagrant-openstack-provider/command/network_list_spec.rb
+- spec/vagrant-openstack-provider/command/reset_spec.rb
 - spec/vagrant-openstack-provider/command/volume_list_spec.rb
+- spec/vagrant-openstack-provider/config_resolver_spec.rb
 - spec/vagrant-openstack-provider/config_spec.rb
 - spec/vagrant-openstack-provider/provider_spec.rb
 - spec/vagrant-openstack-provider/spec_helper.rb
+- spec/vagrant-openstack-provider/utils_spec.rb

data/Appraisals DELETED Viewed

@@ -1,13 +0,0 @@
-appraise 'latest-stable' do
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.6.3'
-end
-# Oldest (current release)
-appraise 'oldest-current' do
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.5.4'
-end
-# Latest patch (previous release)
-appraise 'previous-release' do
-  gem 'vagrant', git: 'git://github.com/mitchellh/vagrant.git', tag: 'v1.4.3'
-end

data/gemfiles/oldest_current.gemfile DELETED Viewed

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-source "https://rubygems.org"
-gem "appraisal", "1.0.0"
-gem "restclient", "0.10.0"
-gem "terminal-table", "1.4.5"
-gem "webmock", "~> 1.18.0", :group => [:test]
-gem "rubocop", "0.23.0", :require => false
-gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => "v1.4.3"
-gem "fakefs", "~> 0.5.2", :group => [:test]
-gem "sshkey", "~> 1.6.1"
-gem "colorize", "~> 0.7.3"
-group :development do
-  gem "coveralls", :require => false
-  gem "debugger"
-end
-gemspec :path => "../"