vagrant-openstack-provider 0.6.0 → 0.6.1

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

@@ -41,7 +41,7 @@ describe VagrantPlugins::Openstack::Utils do
           nova.stub(:get_server_details).with(env, '1234id') do
             {
               'addresses' => {
-                'toto' => [{
+                'net' => [{
                   'addr' => '13.13.13.13'
                 }, {
                   'addr' => '12.12.12.12',
@@ -55,13 +55,13 @@ describe VagrantPlugins::Openstack::Utils do
       end
 
       context 'without floating ip in nova details' do
-        context 'with on single ip in nova details' do
+        context 'with a 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' => [{
+                  'net' => [{
                     'addr' => '13.13.13.13',
                     'OS-EXT-IPS:type' => 'fixed'
                   }]
@@ -73,21 +73,28 @@ describe VagrantPlugins::Openstack::Utils do
         end
 
         context 'with multiple ips in nova details' do
-          it 'fails' do
+          it 'return the one corresponding to the first network in the Vagrantfile' do
             config.stub(:floating_ip) { nil }
+            config.stub(:networks) { %w(net-2 net-1 net-3) }
             nova.stub(:get_server_details).with(env, '1234id') do
               {
                 'addresses' => {
-                  'toto' => [{
-                    'addr' => '13.13.13.13'
-                  }, {
+                  'net-1' => [{
+                    'addr' => '11.11.11.11',
+                    'OS-EXT-IPS:type' => 'fixed'
+                  }],
+                  'net-2' => [{
                     'addr' => '12.12.12.12',
-                    'OS-EXT-IPS:type' => 'private'
+                    'OS-EXT-IPS:type' => 'fixed'
+                  }],
+                  'net-3' => [{
+                    'addr' => '13.13.13.13',
+                    'OS-EXT-IPS:type' => 'fixed'
                   }]
                 }
               }
             end
-            expect(@action.get_ip_address(env)).to eq('13.13.13.13')
+            expect(@action.get_ip_address(env)).to eq('12.12.12.12')
           end
         end
 
@@ -97,7 +104,7 @@ describe VagrantPlugins::Openstack::Utils do
             nova.stub(:get_server_details).with(env, '1234id') do
               {
                 'addresses' => {
-                  'toto' => []
+                  'net' => []
                 }
               }
             end
@@ -118,12 +125,5 @@ describe VagrantPlugins::Openstack::Utils do
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -207,17 +207,20 @@ files:
 - lib/vagrant-openstack-provider/client/nova.rb
 - lib/vagrant-openstack-provider/client/openstack.rb
 - lib/vagrant-openstack-provider/client/request_logger.rb
+- lib/vagrant-openstack-provider/client/rest_utils.rb
 - lib/vagrant-openstack-provider/command/abstract_command.rb
 - lib/vagrant-openstack-provider/command/flavor_list.rb
 - lib/vagrant-openstack-provider/command/floatingip_list.rb
 - 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/openstack_command.rb
 - lib/vagrant-openstack-provider/command/reset.rb
 - lib/vagrant-openstack-provider/command/subnet_list.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/http.rb
 - lib/vagrant-openstack-provider/config_resolver.rb
 - lib/vagrant-openstack-provider/errors.rb
 - lib/vagrant-openstack-provider/logging.rb