vagrant-openstack-provider 0.3.4.pre → 0.4.0

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

@@ -51,10 +51,17 @@ module VagrantPlugins
       def create_server(env, options)
         server = {}.tap do |s|
           s['name'] = options[:name]
-          s['imageRef'] = options[:image_ref]
+          if options[:image_ref].nil?
+            s['block_device_mapping'] = [{ volume_id: options[:volume_boot][:id], device_name: options[:volume_boot][:device] }]
+          else
+            s['imageRef'] = options[:image_ref]
+          end
           s['flavorRef'] = options[:flavor_ref]
           s['key_name'] = options[:keypair]
           s['availability_zone'] = options[:availability_zone] unless options[:availability_zone].nil?
+          s['security_groups'] = options[:security_groups] unless options[:security_groups].nil?
+          s['user_data'] = options[:user_data] unless options[:user_data].nil?
+          s['metadata'] = options[:metadata] unless options[:metadata].nil?
           unless options[:networks].nil? || options[:networks].empty?
             s['networks'] = []
             options[:networks].each do |uuid|
@@ -62,7 +69,9 @@ module VagrantPlugins
             end
           end
         end
-        server = post(env, "#{@session.endpoints[:compute]}/servers", { server: server }.to_json)
+        object = { server: server }
+        object[:scheduler_hints] = options[:scheduler_hints] unless options[:scheduler_hints].nil?
+        server = post(env, "#{@session.endpoints[:compute]}/servers", object.to_json)
         JSON.parse(server)['server']['id']
       end
 
@@ -133,6 +142,17 @@ module VagrantPlugins
         JSON.parse(floating_ips)['floating_ips']
       end
 
+      def attach_volume(env, server_id, volume_id, device = nil)
+        attachment = post(env, "#{@session.endpoints[:compute]}/servers/#{server_id}/os-volume_attachments",
+                          {
+                            volumeAttachment: {
+                              volumeId: volume_id,
+                              device: device
+                            }
+                          }.to_json)
+        JSON.parse(attachment)['volumeAttachment']
+      end
+
       private
 
       VM_STATES =

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

@@ -5,6 +5,7 @@ require 'json'
 require 'vagrant-openstack-provider/client/keystone'
 require 'vagrant-openstack-provider/client/nova'
 require 'vagrant-openstack-provider/client/neutron'
+require 'vagrant-openstack-provider/client/cinder'
 
 module VagrantPlugins
   module Openstack
@@ -41,5 +42,9 @@ module VagrantPlugins
     def self.neutron
       Openstack::NeutronClient.instance
     end
+
+    def self.cinder
+      Openstack::CinderClient.instance
+    end
   end
 end

data/lib/vagrant-openstack-provider/command/main.rb

@@ -5,7 +5,8 @@ module VagrantPlugins
         { name: :'image-list', file: 'image_list' , clazz: 'ImageList' },
         { name: :'flavor-list', file: 'flavor_list', clazz: 'FlavorList' },
         { name: :'network-list', file: 'network_list', clazz: 'NetworkList' },
-        { name: :'floatingip-list', file: 'floatingip_list', clazz: 'FloatingIpList' }
+        { name: :'floatingip-list', file: 'floatingip_list', clazz: 'FloatingIpList' },
+        { name: :'volume-list', file: 'volume_list', clazz: 'VolumeList' }
       ]
 
       class Main < Vagrant.plugin('2', :command)

data/lib/vagrant-openstack-provider/command/volume_list.rb

@@ -0,0 +1,27 @@
+require 'vagrant-openstack-provider/command/utils'
+require 'vagrant-openstack-provider/command/abstract_command'
+
+module VagrantPlugins
+  module Openstack
+    module Command
+      class VolumeList < AbstractCommand
+        include VagrantPlugins::Openstack::Command::Utils
+
+        def self.synopsis
+          I18n.t('vagrant_openstack.command.volume_list_synopsis')
+        end
+        def cmd(name, argv, env)
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0 || argv == ['--']
+          volumes = env[:openstack_client].cinder.get_all_volumes(env)
+
+          rows = []
+          volumes.each do |v|
+            attachment = "#{v.instance_id} (#{v.device})" unless v.instance_id.nil?
+            rows << [v.id, v.name, v.size, v.status, attachment]
+          end
+          display_table(env, ['Id', 'Name', 'Size (Go)', 'Status', 'Attachment (instance id and device)'], rows)
+        end
+      end
+    end
+  end
+end

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

@@ -18,6 +18,11 @@ module VagrantPlugins
       #
       attr_accessor :openstack_network_url
 
+      # The block storage service url to access Openstack. If nil, it will read from
+      # hypermedia catalog form REST API
+      #
+      attr_accessor :openstack_volume_url
+
       # The authentication endpoint. This defaults to Openstack's global authentication endpoint.
       attr_accessor :openstack_auth_url
 
@@ -29,6 +34,10 @@ module VagrantPlugins
       # expression to partially match a name.
       attr_accessor :image
 
+      # Volume to boot the vm from
+      #
+      attr_accessor :volume_boot
+
       #
       # The name of the openstack project on witch the vm will be created.
       #
@@ -76,6 +85,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :floating_ip_pool
 
+      # if set to true, vagrant will always allocate floating ip instead of trying to reuse unassigned ones
+      # default to false
+      #
+      # @return [Boolean]
+      attr_accessor :floating_ip_pool_always_allocate
+
       # Sync folder method. Can be either "rsync" or "none"
       #
       # @return [String]
@@ -86,6 +101,11 @@ module VagrantPlugins
       # @return [Array]
       attr_accessor :networks
 
+      # Volumes list that will be attached to the VM
+      #
+      # @return [Array]
+      attr_accessor :volumes
+
       # Public key path to create OpenStack keypair
       #
       # @return [Array]
@@ -96,13 +116,35 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :availability_zone
 
+      # Pass hints to the OpenStack scheduler, e.g. { "cell": "some cell name" }
+      attr_accessor :scheduler_hints
+
+      # List of strings representing the security groups to apply.
+      # e.g. ['ssh', 'http']
+      #
+      # @return [Array[String]]
+      attr_accessor :security_groups
+
+      # User data to be sent to the newly created OpenStack instance. Use this
+      # e.g. to inject a script at boot time.
+      #
+      # @return [String]
+      attr_accessor :user_data
+
+      # A Hash of metadata that will be sent to the instance for configuration
+      #
+      # @return [Hash]
+      attr_accessor :metadata
+
       def initialize
         @password = UNSET_VALUE
         @openstack_compute_url = UNSET_VALUE
         @openstack_network_url = UNSET_VALUE
+        @openstack_volume_url = UNSET_VALUE
         @openstack_auth_url = UNSET_VALUE
         @flavor = UNSET_VALUE
         @image = UNSET_VALUE
+        @volume_boot = UNSET_VALUE
         @tenant_name = UNSET_VALUE
         @server_name = UNSET_VALUE
         @username = UNSET_VALUE
@@ -112,10 +154,16 @@ module VagrantPlugins
         @ssh_timeout = UNSET_VALUE
         @floating_ip = UNSET_VALUE
         @floating_ip_pool = UNSET_VALUE
+        @floating_ip_pool_always_allocate = UNSET_VALUE
         @sync_method = UNSET_VALUE
         @availability_zone = UNSET_VALUE
         @networks = []
+        @volumes = []
         @public_key_path = UNSET_VALUE
+        @scheduler_hints = UNSET_VALUE
+        @security_groups = UNSET_VALUE
+        @user_data = UNSET_VALUE
+        @metadata = UNSET_VALUE
       end
 
       # rubocop:disable Style/CyclomaticComplexity
@@ -123,25 +171,33 @@ module VagrantPlugins
         @password = nil if @password == UNSET_VALUE
         @openstack_compute_url = nil if @openstack_compute_url == UNSET_VALUE
         @openstack_network_url = nil if @openstack_network_url == UNSET_VALUE
+        @openstack_volume_url = nil if @openstack_volume_url == UNSET_VALUE
         @openstack_auth_url = nil if @openstack_auth_url == UNSET_VALUE
         @flavor = nil if @flavor == UNSET_VALUE
         @image = nil if @image == UNSET_VALUE
+        @volume_boot = nil if @volume_boot == UNSET_VALUE
         @tenant_name = nil if @tenant_name == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
         @rsync_includes = nil if @rsync_includes.empty?
         @floating_ip = nil if @floating_ip == UNSET_VALUE
         @floating_ip_pool = nil if @floating_ip_pool == UNSET_VALUE
+        @floating_ip_pool_always_allocate = false if floating_ip_pool_always_allocate == UNSET_VALUE
         @sync_method = 'rsync' if @sync_method == UNSET_VALUE
         @keypair_name = nil if @keypair_name == UNSET_VALUE
         @public_key_path = nil if @public_key_path == UNSET_VALUE
         @availability_zone = nil if @availability_zone == UNSET_VALUE
+        @scheduler_hints = nil if @scheduler_hints == UNSET_VALUE
+        @security_groups = nil if @security_groups == UNSET_VALUE
+        @user_data = nil if @user_data == UNSET_VALUE
+        @metadata = nil if @metadata == UNSET_VALUE
 
         # The SSH values by default are nil, and the top-level config
         # `config.ssh` values are used.
         @ssh_username = nil if @ssh_username == UNSET_VALUE
         @ssh_timeout = 180 if @ssh_timeout == UNSET_VALUE
         @networks = nil if @networks.empty?
+        @volumes = nil if @volumes.empty?
       end
       # rubocop:enable Style/CyclomaticComplexity
 
@@ -155,8 +211,9 @@ module VagrantPlugins
         errors << I18n.t('vagrant_openstack.config.password_required') unless @password
         errors << I18n.t('vagrant_openstack.config.username_required') unless @username
 
+        validate_ssh_username(machine, errors)
+
         if machine.config.ssh.private_key_path
-          # Waiting for https://github.com/mitchellh/vagrant/issues/4388 to improve this
           puts I18n.t('vagrant_openstack.config.keypair_name_required').yellow unless @keypair_name || @public_key_path
         else
           errors << I18n.t('vagrant_openstack.config.private_key_missing') if @keypair_name || @public_key_path
@@ -165,6 +222,7 @@ module VagrantPlugins
         {
           openstack_compute_url: @openstack_compute_url,
           openstack_network_url: @openstack_network_url,
+          openstack_volume_url: @openstack_volume_url,
           openstack_auth_url: @openstack_auth_url
         }.each_pair do |key, value|
           errors << I18n.t('vagrant_openstack.config.invalid_uri', key: key, uri: value) unless value.nil? || valid_uri?(value)
@@ -173,6 +231,11 @@ module VagrantPlugins
         { 'Openstack Provider' => errors }
       end
 
+      def validate_ssh_username(machine, errors)
+        puts I18n.t('vagrant_openstack.config.ssh_username_deprecated').yellow if @ssh_username
+        errors << I18n.t('vagrant_openstack.config.ssh_username_required') unless @ssh_username || machine.config.ssh.username
+      end
+
       private
 
       def valid_uri?(value)

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

@@ -63,6 +63,42 @@ module VagrantPlugins
       class UnableToResolveSSHKey < VagrantOpenstackError
         error_key(:unable_to_resolve_ssh_key)
       end
+
+      class InvalidVolumeObject < VagrantOpenstackError
+        error_key(:invalid_volume_format)
+      end
+
+      class UnresolvedVolume < VagrantOpenstackError
+        error_key(:unresolved_volume)
+      end
+
+      class UnresolvedVolumeId < VagrantOpenstackError
+        error_key(:unresolved_volume_id)
+      end
+
+      class UnresolvedVolumeName < VagrantOpenstackError
+        error_key(:unresolved_volume_name)
+      end
+
+      class ConflictVolumeNameId < VagrantOpenstackError
+        error_key(:conflict_volume_name_id)
+      end
+
+      class MultipleVolumeName < VagrantOpenstackError
+        error_key(:multiple_volume_name)
+      end
+
+      class MissingBootOption < VagrantOpenstackError
+        error_key(:missing_boot_option)
+      end
+
+      class ConflictBootOption < VagrantOpenstackError
+        error_key(:conflict_boot_option)
+      end
+
+      class NoMatchingSshUsername < VagrantOpenstackError
+        error_key(:ssh_username_missing)
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Openstack
-    VERSION = '0.3.4.pre'
+    VERSION = '0.4.0'
   end
 end

data/locales/en.yml

@@ -12,6 +12,8 @@ en:
       Finding image for server...
     finding_networks: |-
       Finding network(s) for server...
+    finding_volumes: |-
+      Finding volume(s) to attach on server...
     launching_server: |-
       Launching a server with the following settings...
     not_created: |-
@@ -60,6 +62,12 @@ en:
       private_key_missing: |-
         config.ssh.private_key_path is required when either keypair_name or
         public_key_path is set in Vagrantfile
+      ssh_username_deprecated: |-
+        ssh_username provider config is deprecated for vagrant-openstack provider.
+        If you are using it, it will continue to work but we recommend to switch to the
+        standard vagrant configuration option `config.ssh.username` instead
+      ssh_username_required: |-
+        vagrant standard configuration option `ssh.username` is required
 
     errors:
       default: |-
@@ -106,6 +114,24 @@ en:
         Vagrant was unable to resolve a valid ip to ssh on your OpenStack instance.
       unable_to_resolve_ssh_key: |-
         Vagrant was unable to resolve a valid ssh key to connect to your OpenStack instance. Please specify in your Vagrantfile either `public_key_path` or `keypair_name`.
+      invalid_volume_format: |-
+        Volume '%{volume}' is not valid.
+      unresolved_volume: |-
+        No matching volume with id or name '%{volume}'
+      unresolved_volume_id: |-
+        No matching volume with id '%{id}'
+      unresolved_volume_name: |-
+        No matching volume with name '%{name}'
+      conflict_volume_name_id: |-
+        One (and only one) of 'id' or 'name' must be specified in volume definition : %{volume}
+      multiple_volume_name: |-
+        More than one volume exists with name '%{name}'. In the case you can't use name in volume definition. Please, use id instead.
+      missing_boot_option: |-
+        Either 'image' or 'volume_boot' configuration must be provided
+      conflict_boot_option: |-
+        Only one of 'image' and 'volume_boot' configuration must be provided
+      ssh_username_missing: |-
+        Vagrant was unable to resolve which ssh username to use to connect to the machine. Please provide config parameter `ssh.username`
 
     states:
       short_active: |-
@@ -205,3 +231,5 @@ en:
         List private networks in project
       flaotingip_list_synopsis : |-
         List floating IP and floating IP pools
+      volume_list_synopsis : |-
+        List existing volumes

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

@@ -16,6 +16,7 @@ describe VagrantPlugins::Openstack::Action::ConnectOpenstack do
       config.stub(:openstack_auth_url) { 'http://keystoneAuthV2' }
       config.stub(:openstack_compute_url) { nil }
       config.stub(:openstack_network_url) { nil }
+      config.stub(:openstack_volume_url) { nil }
       config.stub(:tenant_name) { 'testTenant' }
       config.stub(:username) { 'username' }
       config.stub(:password) { 'password' }

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

@@ -20,9 +20,11 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
       config.stub(:availability_zone) { 'AZ-01' }
       config.stub(:floating_ip) { nil }
       config.stub(:floating_ip_pool) { nil }
+      config.stub(:floating_ip_pool_always_allocate) { false }
       config.stub(:keypair_name) { nil }
       config.stub(:public_key_path) { nil }
       config.stub(:networks) { nil }
+      config.stub(:volumes) { nil }
     end
   end
 
@@ -63,6 +65,22 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
     end
   end
 
+  let(:cinder) do
+    double('cinder').tap do |cinder|
+      cinder.stub(:get_all_volumes).with(anything) do
+        [Volume.new('001', 'vol-01', '1', 'available', 'true', nil, nil),
+         Volume.new('002', 'vol-02', '2', 'available', 'true', nil, nil),
+         Volume.new('003', 'vol-03', '3', 'available', 'true', nil, nil),
+         Volume.new('004', 'vol-04', '4', 'available', 'false', nil, nil),
+         Volume.new('005', 'vol-05', '5', 'available', 'false', nil, nil),
+         Volume.new('006', 'vol-06', '6', 'available', 'false', nil, nil),
+         Volume.new('007', 'vol-07-08', '6', 'available', 'false', nil, nil),
+         Volume.new('008', 'vol-07-08', '6', 'available', 'false', nil, nil)]
+
+      end
+    end
+  end
+
   let(:env) do
     Hash.new.tap do |env|
       env[:ui] = double('ui')
@@ -73,6 +91,7 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
       env[:openstack_client] = double('openstack_client')
       env[:openstack_client].stub(:neutron) { neutron }
       env[:openstack_client].stub(:nova) { nova }
+      env[:openstack_client].stub(:cinder) { cinder }
     end
   end
 
@@ -81,6 +100,23 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
     @action = CreateServer.new(nil, nil)
   end
 
+  describe 'call' do
+    context 'with both image and volume_boot specified' do
+      it 'should raise an error' do
+        config.stub(:image) { 'linux-image' }
+        config.stub(:volume_boot) { 'linux-volume' }
+        expect { @action.call(env) }.to raise_error Errors::ConflictBootOption
+      end
+    end
+    context 'with neither image nor volume_boot specified' do
+      it 'should raise an error' do
+        config.stub(:image) { nil }
+        config.stub(:volume_boot) { nil }
+        expect { @action.call(env) }.to raise_error Errors::MissingBootOption
+      end
+    end
+  end
+
   describe 'create_server' do
     context 'with all options specified' do
       it 'calls nova with all the options' do
@@ -89,18 +125,29 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
         name: 'testName',
         flavor_ref: flavor.id,
         image_ref: image.id,
+        volume_boot: nil,
         networks: ['test-networks'],
         keypair: 'test-keypair',
-        availability_zone: 'test-az') do '1234'
+        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 = {
           flavor: flavor,
           image: image,
           networks: ['test-networks'],
+          volumes: [{ id: '001', device: :auto }, { id: '002', device: '/dev/vdc' }],
           keypair_name: 'test-keypair',
-          availability_zone: 'test-az'
+          availability_zone: 'test-az',
+          scheduler_hints: 'test-sched-hints',
+          security_groups: ['test-sec-groups'],
+          user_data: 'test-user_data',
+          metadata: 'test-metadata'
         }
+
         expect(@action.create_server(env, options)).to eq '1234'
       end
     end
@@ -116,13 +163,31 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
 
     context 'with config.floating_pool specified' do
       context 'if any ip in the same pool is available' do
-        it 'return one of the available ips' do
-          nova.stub(:get_all_floating_ips).with(anything) do
-            [FloatingIP.new('80.81.82.84', 'pool-1', '1234'),
-             FloatingIP.new('80.81.82.83', 'pool-1', nil)]
+        context 'with config.floating_pool_always_allocate true' do
+          it 'allocate a new floating_ip from the pool' do
+            config.stub(:floating_ip_pool_always_allocate) { true }
+            nova.stub(:get_all_floating_ips).with(anything) do
+              [FloatingIP.new('80.81.82.84', 'pool-1', '1234'),
+               FloatingIP.new('80.81.82.83', 'pool-1', nil)]
+            end
+            nova.stub(:allocate_floating_ip).with(env, 'pool-1') do
+              FloatingIP.new('80.81.82.84', 'pool-1', nil)
+            end
+            config.stub(:floating_ip_pool) { 'pool-1' }
+            @action.resolve_floating_ip(env).should eq('80.81.82.84')
+          end
+        end
+
+        context 'with config.floating_pool_always_allocate false' do
+          it 'return one of the available ips' do
+            config.stub(:floating_ip_pool_always_allocate) { false }
+            nova.stub(:get_all_floating_ips).with(anything) do
+              [FloatingIP.new('80.81.82.84', 'pool-1', '1234'),
+               FloatingIP.new('80.81.82.83', 'pool-1', nil)]
+            end
+            config.stub(:floating_ip_pool) { 'pool-1' }
+            @action.resolve_floating_ip(env).should eq('80.81.82.83')
           end
-          config.stub(:floating_ip_pool) { 'pool-1' }
-          @action.resolve_floating_ip(env).should eq('80.81.82.83')
         end
       end
 
@@ -200,7 +265,6 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
       nova.stub(:import_keypair) { 'my-keypair-imported' }
       SSHKey.stub(:generate) { ssh_key }
       File.should_receive(:write).with('/data/dir/my-keypair-imported', 'private key')
-      File.should_receive(:chmod).with(0600, '/data/dir/my-keypair-imported')
       @action.generate_keypair(env).should eq('my-keypair-imported')
     end
   end
@@ -252,4 +316,181 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
     end
 
   end
+
+  describe 'resolve_volume_boot' do
+    context 'with string volume id' do
+      it 'returns normalized volume' do
+        config.stub(:volume_boot) { '001' }
+        expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vda'
+      end
+    end
+
+    context 'with string volume name' do
+      it 'returns normalized volume' do
+        config.stub(:volume_boot) { 'vol-01' }
+        expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vda'
+      end
+    end
+
+    context 'with hash volume id' do
+      it 'returns normalized volume' do
+        config.stub(:volume_boot) { { id: '001' } }
+        expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vda'
+      end
+    end
+
+    context 'with hash volume name' do
+      it 'returns normalized volume' do
+        config.stub(:volume_boot) { { name: 'vol-01' } }
+        expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vda'
+      end
+    end
+
+    context 'with hash volume id and device' do
+      it 'returns normalized volume' do
+        config.stub(:volume_boot) { { id: '001', device: 'vdb' } }
+        expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vdb'
+      end
+    end
+
+    context 'with hash volume name and device' do
+      it 'returns normalized volume' do
+        config.stub(:volume_boot) { { name: 'vol-01', device: 'vdb' } }
+        expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vdb'
+      end
+    end
+
+    context 'with empty hash' do
+      it 'raises an error' do
+        config.stub(:volume_boot) { {} }
+        expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictVolumeNameId)
+      end
+    end
+
+    context 'with invalid volume object' do
+      it 'raises an error' do
+        config.stub(:volume_boot) { 1 }
+        expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::InvalidVolumeObject)
+      end
+    end
+
+    context 'with hash containing a bad id' do
+      it 'raises an error' do
+        config.stub(:volume_boot) { { id: 'not-exist' } }
+        expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::UnresolvedVolumeId)
+      end
+    end
+
+    context 'with hash containing a bad name' do
+      it 'raises an error' do
+        config.stub(:volume_boot) { { name: 'not-exist' } }
+        expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::UnresolvedVolumeName)
+      end
+    end
+
+    context 'with hash containing both id and name' do
+      it 'raises an error' do
+        config.stub(:volume_boot) { { id: '001', name: 'vol-01' } }
+        expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictVolumeNameId)
+      end
+    end
+
+    context 'with hash containing a name matching more than one volume' do
+      it 'raises an error' do
+        config.stub(:volume_boot) { { name: 'vol-07-08' } }
+        expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::MultipleVolumeName)
+      end
+    end
+  end
+
+  describe 'resolve_volumes' do
+    context 'with volume attached in all possible ways' do
+      it 'returns normalized volume list' do
+
+        config.stub(:volumes) do
+          ['001',
+           'vol-02',
+           { id: '003', device: '/dev/vdz' },
+           { name: 'vol-04', device: '/dev/vdy' },
+           { name: 'vol-05' },
+           { id: '006' }]
+        end
+
+        expect(@action.resolve_volumes(env)).to eq [{ id: '001', device: nil },
+                                                    { id: '002', device: nil },
+                                                    { id: '003', device: '/dev/vdz' },
+                                                    { id: '004', device: '/dev/vdy' },
+                                                    { id: '005', device: nil },
+                                                    { id: '006', device: nil }]
+      end
+    end
+
+    context 'with invalid volume object' do
+      it 'raises an error' do
+        config.stub(:volumes) { [1] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::InvalidVolumeObject)
+      end
+    end
+
+    context 'with string that is neither an id nor name matching a volume' do
+      it 'raises an error' do
+        config.stub(:volumes) { ['not-exist'] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::UnresolvedVolume)
+      end
+    end
+
+    context 'with hash containing a bad id' do
+      it 'raises an error' do
+        config.stub(:volumes) { [{ id: 'not-exist' }] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::UnresolvedVolumeId)
+      end
+    end
+
+    context 'with hash containing a bad name' do
+      it 'raises an error' do
+        config.stub(:volumes) { [{ name: 'not-exist' }] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::UnresolvedVolumeName)
+      end
+    end
+
+    context 'with empty hash' do
+      it 'raises an error' do
+        config.stub(:volumes) { [{}] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::ConflictVolumeNameId)
+      end
+    end
+
+    context 'with hash containing both id and name' do
+      it 'raises an error' do
+        config.stub(:volumes) { [{ id: '001', name: 'vol-01' }] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::ConflictVolumeNameId)
+      end
+    end
+
+    context 'with hash containing both id and name' do
+      it 'raises an error' do
+        config.stub(:volumes) { [{ id: '001', name: 'vol-01' }] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::ConflictVolumeNameId)
+      end
+    end
+
+    context 'with hash containing a name matching more than one volume' do
+      it 'raises an error' do
+        config.stub(:volumes) { [{ name: 'vol-07-08' }] }
+        expect { @action.resolve_volumes(env) }.to raise_error(Errors::MultipleVolumeName)
+      end
+    end
+  end
+
+  describe 'attach_volumes' do
+    context 'with volume attached in all possible ways' do
+      it 'returns normalized volume list' do
+        nova.stub(:attach_volume).with(anything, anything, anything, anything) {}
+        nova.should_receive(:attach_volume).with(env, 'server-01', '001', nil)
+        nova.should_receive(:attach_volume).with(env, 'server-01', '002', '/dev/vdb')
+
+        @action.attach_volumes(env, 'server-01', [{ id: '001', device: nil }, { id: '002', device: '/dev/vdb' }])
+      end
+    end
+  end
 end