vagrant-openstack-provider 0.2.0 → 0.3.0

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

@@ -2,7 +2,7 @@ require 'vagrant-openstack-provider/spec_helper'
 
 include VagrantPlugins::Openstack
 
-describe VagrantPlugins::Openstack::Utils do
+describe VagrantPlugins::Openstack::HttpUtils do
 
   let(:keystone) do
     double('keystone').tap do |keystone|
@@ -20,8 +20,11 @@ describe VagrantPlugins::Openstack::Utils do
   end
 
   class TestUtils
-    include VagrantPlugins::Openstack::Utils
+    include VagrantPlugins::Openstack::HttpUtils
     include VagrantPlugins::Openstack::Errors
+
+    attr_writer :logger
+
     def target(env)
       authenticated(env) do
         env[:target].call
@@ -36,7 +39,12 @@ describe VagrantPlugins::Openstack::Utils do
   describe 'authenticated' do
 
     before :each do
+      TestUtils.send(:public, *TestUtils.private_instance_methods)
       @utils = TestUtils.new
+      @utils.logger = double.tap do |logger|
+        logger.stub(:debug)
+        logger.stub(:info)
+      end
     end
 
     context 'with two authentication errors' do
@@ -72,13 +80,21 @@ describe VagrantPlugins::Openstack::Utils do
 
   describe 'handle_response' do
     before :each do
+      TestUtils.send(:public, *TestUtils.private_instance_methods)
       @utils = TestUtils.new
+      @utils.logger = double.tap do |logger|
+        logger.stub(:debug)
+        logger.stub(:info)
+      end
     end
 
     [200, 201, 202, 204].each do |code|
       context "response code is #{code}" do
         it 'should return the response' do
-          mock_resp = double.tap { |mock| mock.stub(:code).and_return(code) }
+          mock_resp = double.tap do |mock|
+            mock.stub(:code).and_return(code)
+            mock.stub(:headers)
+          end
           resp = @utils.handle_response(mock_resp)
           expect(resp.code).to eq(code)
         end
@@ -87,15 +103,19 @@ describe VagrantPlugins::Openstack::Utils do
 
     context 'response code is 401' do
       it 'should return raise a AuthenticationRequired error' do
-        mock_resp = double.tap { |mock| mock.stub(:code).and_return(401) }
+        mock_resp = double.tap do |mock|
+          mock.stub(:code).and_return(401)
+          mock.stub(:headers)
+        end
         expect { @utils.handle_response(mock_resp) }.to raise_error Errors::AuthenticationRequired
       end
     end
 
     context 'response code is 400' do
-      it 'should return raise a VagrantOpenstackError error with error message' do
+      it 'should return raise a VagrantOpenstackError with bad request message' do
         mock_resp = double.tap do |mock|
           mock.stub(:code).and_return(400)
+          mock.stub(:headers)
           mock.stub(:to_s).and_return('{ "badRequest": { "message": "Error... Bad request" } }')
         end
         begin
@@ -107,10 +127,43 @@ describe VagrantPlugins::Openstack::Utils do
       end
     end
 
+    context 'response code is 404' do
+      it 'should return raise a VagrantOpenstackError with conflict message' do
+        mock_resp = double.tap do |mock|
+          mock.stub(:code).and_return(404)
+          mock.stub(:headers)
+          mock.stub(:to_s).and_return('{ "itemNotFound": { "message": "Error... Not found" } }')
+        end
+        begin
+          @utils.handle_response(mock_resp)
+          fail
+        rescue Errors::VagrantOpenstackError => e
+          expect(e.message).to eq('Error... Not found')
+        end
+      end
+    end
+
+    context 'response code is 409' do
+      it 'should return raise a VagrantOpenstackError with conflict message' do
+        mock_resp = double.tap do |mock|
+          mock.stub(:code).and_return(409)
+          mock.stub(:headers)
+          mock.stub(:to_s).and_return('{ "conflictingRequest": { "message": "Error... Conflict" } }')
+        end
+        begin
+          @utils.handle_response(mock_resp)
+          fail
+        rescue Errors::VagrantOpenstackError => e
+          expect(e.message).to eq('Error... Conflict')
+        end
+      end
+    end
+
     context 'response code is 500' do
       it 'should return raise a VagrantOpenstackError error with error message' do
         mock_resp = double.tap do |mock|
           mock.stub(:code).and_return(500)
+          mock.stub(:headers)
           mock.stub(:to_s).and_return('Internal server error')
         end
         begin

data/spec/vagrant-openstack-provider/command/floatingip_list_spec.rb

@@ -0,0 +1,67 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+describe VagrantPlugins::Openstack::Command::FloatingIpList do
+  describe 'cmd' do
+
+    let(:config) do
+      double('config').tap do |config|
+        config.stub(:openstack_auth_url) { 'http://keystoneAuthV2' }
+        config.stub(:openstack_compute_url) { nil }
+        config.stub(:openstack_network_url) { nil }
+        config.stub(:tenant_name) { 'testTenant' }
+        config.stub(:username) { 'username' }
+        config.stub(:password) { 'password' }
+      end
+    end
+
+    let(:nova) do
+      double('nova').tap do |nova|
+        nova.stub(:get_floating_ip_pools) do
+          [
+            {
+              'name' => 'pool1'
+            },
+            {
+              'name' => 'pool2'
+            }
+          ]
+        end
+        nova.stub(:get_floating_ips) do
+          [
+            {
+              'fixed_ip' => nil,
+              'id' => 1,
+              'instance_id' => nil,
+              'ip' => '10.10.10.1',
+              'pool' => 'pool1'
+            },
+            {
+              'fixed_ip' => nil,
+              'id' => 2,
+              'instance_id' => 'inst001',
+              'ip' => '10.10.10.2',
+              'pool' => 'pool2'
+            }
+          ]
+        end
+      end
+    end
+
+    let(:env) do
+      Hash.new.tap do |env|
+        env[:ui] = double('ui')
+        env[:ui].stub(:info).with(anything)
+        env[:openstack_client] = double
+        env[:openstack_client].stub(:nova) { nova }
+      end
+    end
+
+    before :each do
+      @floating_ip_list_cmd = VagrantPlugins::Openstack::Command::FloatingIpList.new(nil, env)
+    end
+
+    it 'should get floating ip and floating ip pool from server' do
+      @floating_ip_list_cmd.cmd('floatingip-list', ['--'], env)
+    end
+  end
+end

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

@@ -19,6 +19,8 @@ describe VagrantPlugins::Openstack::Config do
     its(:username) { should be_nil }
     its(:rsync_includes) { should be_nil }
     its(:keypair_name) { should be_nil }
+    its(:public_key_path) { should be_nil }
+    its(:availability_zone) { should be_nil }
     its(:ssh_username) { should be_nil }
   end
 
@@ -32,7 +34,9 @@ describe VagrantPlugins::Openstack::Config do
       :server_name,
       :username,
       :keypair_name,
-      :ssh_username].each do |attribute|
+      :ssh_username,
+      :availability_zone,
+      :public_key_path].each do |attribute|
       it "should not default #{attribute} if overridden" do
         subject.send("#{attribute}=".to_sym, 'foo')
         subject.finalize!
@@ -53,8 +57,15 @@ describe VagrantPlugins::Openstack::Config do
     let(:validation_errors) { subject.validate(machine)['Openstack Provider'] }
     let(:error_message) { double('error message') }
 
+    let(:config) { double('config') }
+    let(:ssh) { double('ssh') }
+
     before(:each) do
+      error_message.stub(:yellow) { 'Yellowed Error message ' }
       machine.stub_chain(:env, :root_path).and_return '/'
+      ssh.stub(:private_key_path) { 'private key path' }
+      config.stub(:ssh) { ssh }
+      machine.stub(:config) { config }
       subject.username = 'foo'
       subject.password = 'bar'
       subject.keypair_name = 'keypair'
@@ -74,17 +85,21 @@ describe VagrantPlugins::Openstack::Config do
         validation_errors.first.should == error_message
       end
     end
+
     context 'with good values' do
       it 'should validate' do
         validation_errors.should be_empty
       end
     end
 
-    context 'the keypair name' do
-      it 'should error if not given' do
-        subject.keypair_name = nil
-        I18n.should_receive(:t).with('vagrant_openstack.config.keypair_name_required').and_return error_message
-        validation_errors.first.should == error_message
+    context 'private_key_path is not set' do
+      context 'keypair_name or public_key_path is set' do
+        it 'should error if not given' do
+          ssh.stub(:private_key_path) { nil }
+          subject.public_key_path = 'public_key'
+          I18n.should_receive(:t).with('vagrant_openstack.config.private_key_missing').and_return error_message
+          validation_errors.first.should == error_message
+        end
       end
     end
 

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

@@ -16,8 +16,15 @@ Dir[
   '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 'webmock/rspec'
+require 'fakefs/safe'
+require 'fakefs/spec_helpers'
+
+RSpec.configure do |config|
+  config.include FakeFS::SpecHelpers, fakefs: true
+end
 
 I18n.load_path << File.expand_path('locales/en.yml', Pathname.new(File.expand_path('../../../', __FILE__)))

data/{numergyrc → stackrc}

@@ -1,7 +1,10 @@
 #!/bin/bash
 
+#Provider examples:
+#Numergy
 export OS_AUTH_URL=https://cloud.numergy.com/identity/v2.0/tokens
-export OS_COMPUTE_URL=https://cloud.numergy.com/compute/v2
+export OS_NETWORK_URL=https://cloud.numergy.com/network/v2.0
+#....
 
 if [ -z "$OS_USERNAME" ]; then
   echo "Please enter your OpenStack tenant name: "

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-openstack-provider
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Guillaume Giamarchi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,6 +73,10 @@ files:
 - dummy.box
 - example_box/README.md
 - example_box/metadata.json
+- functional_tests/Vagrantfile
+- functional_tests/keys/vagrant-openstack
+- functional_tests/keys/vagrant-openstack.pub
+- functional_tests/run_tests.sh
 - gemfiles/latest_stable.gemfile
 - gemfiles/oldest_current.gemfile
 - gemfiles/previous_release.gemfile
@@ -89,27 +93,40 @@ 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_active.rb
 - lib/vagrant-openstack-provider/action/wait_stop.rb
+- lib/vagrant-openstack-provider/client/domain.rb
+- lib/vagrant-openstack-provider/client/http_utils.rb
 - lib/vagrant-openstack-provider/client/keystone.rb
 - lib/vagrant-openstack-provider/client/neutron.rb
 - lib/vagrant-openstack-provider/client/nova.rb
 - lib/vagrant-openstack-provider/client/openstack.rb
-- lib/vagrant-openstack-provider/client/utils.rb
+- lib/vagrant-openstack-provider/client/request_logger.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/utils.rb
 - lib/vagrant-openstack-provider/config.rb
 - lib/vagrant-openstack-provider/errors.rb
 - lib/vagrant-openstack-provider/plugin.rb
 - lib/vagrant-openstack-provider/provider.rb
 - lib/vagrant-openstack-provider/version.rb
 - locales/en.yml
-- numergyrc
+- spec/vagrant-openstack-provider/action/connect_openstack_spec.rb
 - spec/vagrant-openstack-provider/action/create_server_spec.rb
+- spec/vagrant-openstack-provider/action/read_ssh_info_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/floatingip_list_spec.rb
 - spec/vagrant-openstack-provider/config_spec.rb
 - spec/vagrant-openstack-provider/provider_spec.rb
 - spec/vagrant-openstack-provider/spec_helper.rb
+- stackrc
 - vagrant-openstack-provider.gemspec
 homepage: https://github.com/ggiamarchi/vagrant-openstack
 licenses: []
@@ -135,11 +152,14 @@ signing_key:
 specification_version: 4
 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/read_ssh_info_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/floatingip_list_spec.rb
 - spec/vagrant-openstack-provider/config_spec.rb
 - spec/vagrant-openstack-provider/provider_spec.rb
 - spec/vagrant-openstack-provider/spec_helper.rb

data/lib/vagrant-openstack-provider/client/utils.rb

@@ -1,38 +0,0 @@
-require 'log4r'
-require 'restclient'
-require 'json'
-
-require 'vagrant-openstack-provider/client/keystone'
-
-module VagrantPlugins
-  module Openstack
-    module Utils
-      def handle_response(response)
-        case response.code
-        when 200, 201, 202, 204
-          response
-        when 401
-          fail Errors::AuthenticationRequired
-        when 400
-          fail Errors::VagrantOpenstackError, message: JSON.parse(response.to_s)['badRequest']['message']
-        else
-          fail Errors::VagrantOpenstackError, message: response.to_s
-        end
-      end
-
-      def authenticated(env)
-        nb_retry = 0
-        begin
-          return yield
-        rescue Errors::AuthenticationRequired => e
-          nb_retry += 1
-          env[:ui].warn(e)
-          env[:ui].warn(I18n.t('vagrant_openstack.trying_authentication'))
-          env[:openstack_client].keystone.authenticate(env)
-          retry if nb_retry < 3
-          raise e
-        end
-      end
-    end
-  end
-end