Return first adress when multiple are found

Fix #155
ggiamarchi · Nov 6, 2014 · c444e2e · c444e2e
1 parent 7b40f3f
commit c444e2e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/source/lib/vagrant-openstack-provider/utils.rb b/source/lib/vagrant-openstack-provider/utils.rb
@@ -13,7 +13,7 @@ def get_ip_address(env)
             return network_detail['addr'] if network_detail['OS-EXT-IPS:type'] == 'floating'
           end
         end
-        return details['addresses'].first[1][0]['addr'] if details['addresses'].size == 1 && details['addresses'].first[1].size == 1
+        return details['addresses'].first[1][0]['addr'] if details['addresses'].size >= 1 && details['addresses'].first[1].size >= 1
         fail Errors::UnableToResolveIP
       end
     end

diff --git a/source/spec/vagrant-openstack-provider/utils_spec.rb b/source/spec/vagrant-openstack-provider/utils_spec.rb
@@ -87,6 +87,32 @@
                 }
               }
             end
+            expect(@action.get_ip_address(env)).to eq('13.13.13.13')
+          end
+        end
+
+        context 'with networks but no ips' do
+          it 'fails' do
+            config.stub(:floating_ip) { nil }
+            nova.stub(:get_server_details).with(env, '1234id') do
+              {
+                'addresses' => {
+                  'toto' => []
+                }
+              }
+            end
+            expect { @action.get_ip_address(env) }.to raise_error(Errors::UnableToResolveIP)
+          end
+        end
+
+        context 'with no networks ' do
+          it 'fails' do
+            config.stub(:floating_ip) { nil }
+            nova.stub(:get_server_details).with(env, '1234id') do
+              {
+                'addresses' => {}
+              }
+            end
             expect { @action.get_ip_address(env) }.to raise_error(Errors::UnableToResolveIP)
           end
         end