vagrant-openstack-provider 0.6.1 → 0.7.0

data/lib/vagrant-openstack-provider/errors.rb

@@ -4,6 +4,17 @@ module VagrantPlugins
   module Openstack
     module Errors
       class VagrantOpenstackError < Vagrant::Errors::VagrantError
+        #
+        # Added for vagrant 1.4.x compatibility This attribute had been
+        # added in Vagrant::Errors::VagrantError form the version 1.5.0
+        #
+        attr_accessor :extra_data
+
+        def initialize(args = nil)
+          @extra_data = args
+          super(args)
+        end
+
         error_namespace('vagrant_openstack.errors')
         error_key(:default)
       end
@@ -40,6 +51,10 @@ module VagrantPlugins
         error_key(:no_matching_image)
       end
 
+      class ConflictBootVolume < VagrantOpenstackError
+        error_key(:conflict_boot_volume)
+      end
+
       class SyncMethodError < VagrantOpenstackError
         error_key(:sync_method_error)
       end

data/lib/vagrant-openstack-provider/plugin.rb

@@ -4,6 +4,8 @@ rescue LoadError
   raise 'The Openstack Cloud provider must be run within Vagrant.'
 end
 
+require 'vagrant-openstack-provider/version_checker'
+
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
 if Vagrant::VERSION < '1.4.0'
@@ -24,9 +26,9 @@ module VagrantPlugins
       end
 
       provider(:openstack, box_optional: true) do
-        # Setup some things
         Openstack.init_i18n
         Openstack.init_logging
+        VagrantPlugins::Openstack.check_version
 
         # Load the actual provider
         require_relative 'provider'
@@ -34,6 +36,10 @@ module VagrantPlugins
       end
 
       command('openstack') do
+        Openstack.init_i18n
+        Openstack.init_logging
+        VagrantPlugins::Openstack.check_version
+
         require_relative 'command/main'
         Command::Main
       end

data/lib/vagrant-openstack-provider/version.rb

@@ -1,5 +1,15 @@
 module VagrantPlugins
   module Openstack
-    VERSION = '0.6.1'
+    #
+    # Stable versions must respect the pattern given
+    # by VagrantPlugins::Openstack::VERSION_PATTERN
+    #
+    VERSION = '0.7.0'
+
+    #
+    # Stable version must respect the naming convention 'x.y.z'
+    # where x, y and z are integers inside the range [0, 999]
+    #
+    VERSION_PATTERN = /^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/
   end
 end

data/lib/vagrant-openstack-provider/version_checker.rb

@@ -0,0 +1,76 @@
+require 'colorize'
+require 'singleton'
+require 'vagrant-openstack-provider/version'
+
+module VagrantPlugins
+  module Openstack
+    class VersionChecker
+      include Singleton
+
+      #
+      # :latest, :outdated or :unstable
+      #
+      # A version is considered unstable if it does not
+      # respect the pattern or if it is greater than the
+      # latest from rubygem
+      #
+      attr_accessor :status
+
+      def initialize
+        @status = nil
+      end
+
+      #
+      # Check the latest version from rubygem and set the status
+      #
+      def check
+        return @status unless @status.nil?
+        latest  = Gem.latest_spec_for('vagrant-openstack-provider').version.version
+        current = VagrantPlugins::Openstack::VERSION
+
+        unless current =~ VERSION_PATTERN
+          @status = :unstable
+          print I18n.t('vagrant_openstack.version_unstable')
+          return
+        end
+
+        if latest.eql? current
+          @status = :latest
+          return
+        end
+
+        v_latest = latest.split('.').map(&:to_i)
+        v_current = current.split('.').map(&:to_i)
+
+        i_latest = v_latest[2] + v_latest[1] * 1000 + v_latest[0] * 1_000_000
+        i_current = v_current[2] + v_current[1] * 1000 + v_current[0] * 1_000_000
+
+        if i_current > i_latest
+          @status = :unstable
+          print I18n.t('vagrant_openstack.version_unstable')
+          return
+        end
+
+        @status = :outdated
+        print I18n.t('vagrant_openstack.version_outdated', latest: latest, current: current)
+      end
+
+      private
+
+      def print(message)
+        puts message.yellow
+        puts ''
+      end
+    end
+
+    # rubocop:disable Lint/HandleExceptions
+    def self.check_version
+      timeout(3, Errors::Timeout) do
+        VersionChecker.instance.check
+      end
+    rescue
+      # Do nothing whatever the failure cause
+    end
+    # rubocop:enable Lint/HandleExceptions
+  end
+end

data/locales/en.yml

@@ -1,7 +1,7 @@
 en:
   vagrant_openstack:
     global_error: |-
-      An unknow error happened in Vagrant OpenStack provider
+      An unknown error happened in Vagrant OpenStack provider
 
       To easily debug what happened, we recommend to set the environment
       variable VAGRANT_OPENSTACK_LOG to debug
@@ -15,6 +15,20 @@ en:
 
       We are looking for feedback, so feel free to ask questions or
       describe features you would like to see in this provider.
+    version_outdated: |-
+      You're not using the latest version of the 'vagrant-openstack-provider' plugin.
+      The latest version is %{latest}, yours is %{current}. You should update to the latest
+      version running the command :
+
+          $ vagrant plugin update vagrant-openstack-provider
+    version_unstable: |-
+      You're not running a stable version of the 'vagrant-openstack-provider' plugin.
+      Unless you are either developing on vagrant or have deliberatly installed a not
+      stable version, you should uninstall it an install the latest stable version
+      running commands :
+
+          $ vagrant plugin uninstall vagrant-openstack-provider
+          $ vagrant plugin install vagrant-openstack-provider
     already_created: |-
       The server is already created.
     create_stack: |-
@@ -70,7 +84,7 @@ en:
     waiting_for_stack_deleted: |-
       Waiting for Heat Stack to be created...
     warn_networks: |-
-      Warning! The Openstack provider doesn't support any of the Vagrant
+      Warning! The OpenStack provider doesn't support any of the Vagrant
       high-level network configurations (`config.vm.network`). They
       will be silently ignored.
     warn_network_identifier_is_assumed_to_be_an_id: |-
@@ -106,7 +120,7 @@ en:
         Metadata must be a hash.
       keypair_name_required: |-
         Warning! You have specified ssh.private_key_path in your Vagrant configuration.
-        but nor keypair_name neither public_key_path are present. The openstack provider
+        but nor keypair_name neither public_key_path are present. The OpenStack provider
         will automatically generate a new keypair and your configuration option
         ssh.private_key_path will be overriden
       private_key_missing: |-
@@ -153,6 +167,9 @@ en:
       no_matching_image: |-
         No matching image was found! Please check your image setting to
         make sure you have a valid image chosen.
+      conflict_boot_volume: |-
+        When booting from an existing volume it is not authorized to specify in your Vagrantfile either 'image' or 'size' or 'delete_on_destroy'.
+        When booting from a newly creating volume it is not authorized to specify in your Vagrantfile either 'id' or 'name'.
       sync_method_error: |-
         Value '%{sync_method_value}' is not allowed for 'sync_method' configuration parameter. Valid values are 'rsync' and 'none'
       rsync_error: |-
@@ -355,7 +372,7 @@ en:
 
     command:
       main_synopsis: |-
-        Openstack provider specific commands
+        OpenStack provider specific commands
       main_usage : |-
         Usage: vagrant openstack command
       available_subcommands: |-

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

@@ -4,7 +4,6 @@ include VagrantPlugins::Openstack::Action
 include VagrantPlugins::Openstack::HttpUtils
 
 describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
-
   let(:app) do
     double.tap do |app|
       app.stub(:call)
@@ -160,7 +159,7 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double
       env[:ui].stub(:info).with(anything)
       env[:ui].stub(:warn).with(anything)
@@ -309,9 +308,9 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
         @action.call(env)
 
         expect(env[:openstack_client].session.endpoints)
-        .to eq(compute: 'http://france.nova/v2/projectId',
-               network: 'http://france.neutron/v2.0',
-               image:   'http://france.glance/v2.0')
+          .to eq(compute: 'http://france.nova/v2/projectId',
+                 network: 'http://france.neutron/v2.0',
+                 image:   'http://france.glance/v2.0')
       end
     end
 
@@ -417,10 +416,10 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
           @action.call(env)
 
           expect(env[:openstack_client].session.endpoints)
-          .to eq(compute: 'http://nova/v2/projectId/admin',
-                 network: 'http://neutron/v2.0/admin',
-                 volume:  'http://cinder/v2/projectId/admin',
-                 image:   'http://glance/v2.0/admin')
+            .to eq(compute: 'http://nova/v2/projectId/admin',
+                   network: 'http://neutron/v2.0/admin',
+                   volume:  'http://cinder/v2/projectId/admin',
+                   image:   'http://glance/v2.0/admin')
         end
       end
     end
@@ -464,8 +463,8 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
           @action.call(env)
 
           expect(env[:openstack_client].session.endpoints)
-          .to eq(compute: 'http://nova/v2/projectId/internal',
-                 volume:  'http://cinder/v2/projectId/internal')
+            .to eq(compute: 'http://nova/v2/projectId/internal',
+                   volume:  'http://cinder/v2/projectId/internal')
         end
       end
     end
@@ -531,10 +530,10 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
           @action.call(env)
 
           expect(env[:openstack_client].session.endpoints)
-          .to eq(compute: 'http://nova/v2/projectId',
-                 network: 'http://neutron/v2.0',
-                 volume:  'http://cinder/v2/projectId',
-                 image:   'http://glance/v2.0')
+            .to eq(compute: 'http://nova/v2/projectId',
+                   network: 'http://neutron/v2.0',
+                   volume:  'http://cinder/v2/projectId',
+                   image:   'http://glance/v2.0')
         end
       end
     end
@@ -573,8 +572,8 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
         @action.call(env)
 
         expect(env[:openstack_client].session.endpoints)
-        .to eq(compute: 'http://nova/v2/projectId',
-               image:   'http://glance/v1')
+          .to eq(compute: 'http://nova/v2/projectId',
+                 image:   'http://glance/v1')
       end
     end
 
@@ -603,7 +602,6 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
     end
 
     context 'with no matching versions for network service' do
-
       let(:neutron) do
         double.tap do |neutron|
           neutron.stub(:get_api_version_list).with(anything, anything) do
@@ -690,7 +688,7 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
         @action.call(env)
 
         expect(env[:openstack_client].session.endpoints)
-        .to eq(compute: 'http://nova/v2/projectId', identity: 'http://keystone/v2.0')
+          .to eq(compute: 'http://nova/v2/projectId', identity: 'http://keystone/v2.0')
       end
     end
   end

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

@@ -7,7 +7,6 @@ include VagrantPlugins::Openstack::HttpUtils
 include VagrantPlugins::Openstack::Domain
 
 describe VagrantPlugins::Openstack::Action::CreateServer do
-
   let(:config) do
     double('config').tap do |config|
       config.stub(:tenant_name) { 'testTenant' }
@@ -41,7 +40,7 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:machine] = double('machine')
@@ -124,18 +123,19 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
     context 'with all options specified' do
       it 'calls nova with all the options' do
         nova.stub(:create_server).with(
-        env,
-        name: 'testName',
-        flavor_ref: flavor.id,
-        image_ref: image.id,
-        volume_boot: nil,
-        networks: [{ uuid: 'test-networks-1' }, { uuid: 'test-networks-2', fixed_ip: '1.2.3.4' }],
-        keypair: 'test-keypair',
-        availability_zone: 'test-az',
-        scheduler_hints: 'test-sched-hints',
-        security_groups: ['test-sec-groups'],
-        user_data: 'test-user_data',
-        metadata: 'test-metadata') do '1234'
+          env,
+          name: 'testName',
+          flavor_ref: flavor.id,
+          image_ref: image.id,
+          volume_boot: nil,
+          networks: [{ uuid: 'test-networks-1' }, { uuid: 'test-networks-2', fixed_ip: '1.2.3.4' }],
+          keypair: 'test-keypair',
+          availability_zone: 'test-az',
+          scheduler_hints: 'test-sched-hints',
+          security_groups: ['test-sec-groups'],
+          user_data: 'test-user_data',
+          metadata: 'test-metadata') do
+          '1234'
         end
 
         options = {
@@ -169,7 +169,8 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
           scheduler_hints: nil,
           security_groups: [],
           user_data: nil,
-          metadata: nil) do '1234'
+          metadata: nil) do
+          '1234'
         end
 
         options = {
@@ -193,19 +194,19 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
   describe 'waiting_for_server_to_be_built' do
     context 'when server is not yet active' do
       it 'become active after one retry' do
-        nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'ACTIVE' })
+        nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, 'status' => 'ACTIVE')
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
         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.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, 'status' => 'BUILD')
         nova.should_receive(:get_server_details).with(env, 'server-01').at_least(2).times
         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.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, 'status' => 'ERROR')
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
         config.stub(:server_create_timeout) { 3 }
         expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1) }.to raise_error Errors::ServerStatusError

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

@@ -7,7 +7,6 @@ include VagrantPlugins::Openstack::HttpUtils
 include VagrantPlugins::Openstack::Domain
 
 describe VagrantPlugins::Openstack::Action::CreateStack do
-
   let(:config) do
     double('config').tap do |config|
       config.stub(:stacks) do
@@ -31,7 +30,7 @@ describe VagrantPlugins::Openstack::Action::CreateStack do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:machine] = double('machine')
@@ -61,7 +60,6 @@ describe VagrantPlugins::Openstack::Action::CreateStack do
             image: CoreOS
             flavor: 1_vCPU_RAM_512M_HD_10G
     '))
-
   end
 
   describe 'call' do
@@ -79,19 +77,19 @@ describe VagrantPlugins::Openstack::Action::CreateStack do
   describe 'waiting_for_server_to_be_built' do
     context 'when server is not yet active' 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.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
         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.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
         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.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
         config.stub(:stack_create_timeout) { 3 }
         expect { @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1) }.to raise_error Errors::StackStatusError

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::DeleteServer do
-
   let(:nova) do
     double('nova').tap do |app|
       app.stub(:delete_server)
@@ -20,7 +19,7 @@ describe VagrantPlugins::Openstack::Action::DeleteServer do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:ui].stub(:error).with(anything)
@@ -68,24 +67,23 @@ describe VagrantPlugins::Openstack::Action::DeleteServer do
         @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.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, 'status' => 'DELETED')
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
         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.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, 'status' => 'ACTIVE')
         nova.should_receive(:get_server_details).with(env, 'server-01').at_least(2).times
         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.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, 'status' => 'ERROR')
         nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
         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
-
 end