vagrant-openstack-provider 0.6.1 → 0.7.0

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

@@ -3,7 +3,6 @@ require 'vagrant-openstack-provider/spec_helper'
 include VagrantPlugins::Openstack
 
 describe VagrantPlugins::Openstack::HttpUtils do
-
   let(:keystone) do
     double('keystone').tap do |keystone|
       keystone.stub(:authenticate).with(anything)
@@ -11,7 +10,7 @@ describe VagrantPlugins::Openstack::HttpUtils do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:warn).with(anything)
       env[:openstack_client] = double('openstack_client')
@@ -37,7 +36,6 @@ describe VagrantPlugins::Openstack::HttpUtils do
   end
 
   describe 'authenticated' do
-
     before :each do
       TestUtils.send(:public, *TestUtils.private_instance_methods)
       @utils = TestUtils.new

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

@@ -2,7 +2,6 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::FlavorList do
   describe 'cmd' do
-
     let(:nova) do
       double('nova').tap do |nova|
         nova.stub(:get_all_flavors) do
@@ -15,7 +14,7 @@ describe VagrantPlugins::Openstack::Command::FlavorList do
     end
 
     let(:env) do
-      Hash.new.tap do |env|
+      {}.tap do |env|
         env[:ui] = double('ui')
         env[:ui].stub(:info).with(anything)
         env[:openstack_client] = double

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

@@ -2,7 +2,6 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::FloatingIpList do
   describe 'cmd' do
-
     let(:nova) do
       double('nova').tap do |nova|
         nova.stub(:get_floating_ip_pools) do
@@ -37,7 +36,7 @@ describe VagrantPlugins::Openstack::Command::FloatingIpList do
     end
 
     let(:env) do
-      Hash.new.tap do |env|
+      {}.tap do |env|
         env[:ui] = double('ui')
         env[:ui].stub(:info).with(anything)
         env[:openstack_client] = double

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::ImageList do
-
   let(:nova) do
     double('nova').tap do |nova|
       nova.stub(:get_all_images) do
@@ -27,7 +26,7 @@ describe VagrantPlugins::Openstack::Command::ImageList do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui')
       env[:ui].stub(:info).with(anything)
       env[:openstack_client] = double
@@ -42,7 +41,6 @@ describe VagrantPlugins::Openstack::Command::ImageList do
 
   describe 'cmd' do
     context 'when glance is not available' do
-
       let(:session) do
         double('session').tap do |s|
           s.stub(:endpoints) { {} }
@@ -50,7 +48,6 @@ describe VagrantPlugins::Openstack::Command::ImageList do
       end
 
       it 'prints image list with only the id and the name' do
-
         env[:openstack_client].stub(:session) { session }
         allow(@image_list_cmd).to receive(:with_target_vms).and_return(nil)
         nova.should_receive(:get_all_images).with(env)
@@ -68,7 +65,6 @@ describe VagrantPlugins::Openstack::Command::ImageList do
     end
 
     context 'when glance is available' do
-
       let(:session) do
         double('session').tap do |s|
           s.stub(:endpoints) do
@@ -80,7 +76,6 @@ describe VagrantPlugins::Openstack::Command::ImageList do
       end
 
       it 'prints image list with id, name and details' do
-
         env[:openstack_client].stub(:session) { session }
         allow(@image_list_cmd).to receive(:with_target_vms).and_return(nil)
         glance.should_receive(:get_all_images).with(env)

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

@@ -2,7 +2,6 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::NetworkList do
   describe 'cmd' do
-
     let(:neutron) do
       double('neutron').tap do |neutron|
         neutron.stub(:get_private_networks) do
@@ -22,7 +21,7 @@ describe VagrantPlugins::Openstack::Command::NetworkList do
     end
 
     let(:env) do
-      Hash.new.tap do |env|
+      {}.tap do |env|
         env[:ui] = double('ui')
         env[:ui].stub(:info).with(anything)
         env[:openstack_client] = double
@@ -62,6 +61,5 @@ describe VagrantPlugins::Openstack::Command::NetworkList do
 
       @network_list_cmd.cmd('network-list', ['all'], env)
     end
-
   end
 end

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

@@ -2,9 +2,8 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::Reset do
   describe 'cmd' do
-
     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')

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

@@ -2,7 +2,6 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::SubnetList do
   describe 'cmd' do
-
     let(:neutron) do
       double('neutron').tap do |neutron|
         neutron.stub(:get_subnets) do
@@ -16,7 +15,7 @@ describe VagrantPlugins::Openstack::Command::SubnetList do
     end
 
     let(:env) do
-      Hash.new.tap do |env|
+      {}.tap do |env|
         env[:ui] = double('ui')
         env[:ui].stub(:info).with(anything)
         env[:openstack_client] = double

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

@@ -2,7 +2,6 @@ require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::VolumeList do
   describe 'cmd' do
-
     let(:cinder) do
       double('cinder').tap do |cinder|
         cinder.stub(:get_all_volumes) do
@@ -13,7 +12,7 @@ describe VagrantPlugins::Openstack::Command::VolumeList do
     end
 
     let(:env) do
-      Hash.new.tap do |env|
+      {}.tap do |env|
         env[:ui] = double('ui')
         env[:ui].stub(:info).with(anything)
         env[:openstack_client] = double

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::ConfigResolver do
-
   let(:config) do
     double('config').tap do |config|
       config.stub(:tenant_name) { 'testTenant' }
@@ -75,7 +74,7 @@ describe VagrantPlugins::Openstack::ConfigResolver 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')
@@ -186,6 +185,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
     context 'with id' do
       it 'returns the specified flavor' do
         config.stub(:image) { 'img-001' }
+        config.stub(:volume_boot) { nil }
         nova.stub(:get_all_images).with(anything) do
           [Item.new('img-001', 'image-01'),
            Item.new('img-002', 'image-02')]
@@ -196,6 +196,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
     context 'with name' do
       it 'returns the specified flavor' do
         config.stub(:image) { 'image-02' }
+        config.stub(:volume_boot) { nil }
         nova.stub(:get_all_images).with(anything) do
           [Item.new('img-001', 'image-01'),
            Item.new('img-002', 'image-02')]
@@ -206,6 +207,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
     context 'with invalid identifier' do
       it 'raise an error' do
         config.stub(:image) { 'not-existing' }
+        config.stub(:volume_boot) { nil }
         nova.stub(:get_all_images).with(anything) do
           [Item.new('img-001', 'image-01'),
            Item.new('img-002', 'image-02')]
@@ -213,6 +215,17 @@ describe VagrantPlugins::Openstack::ConfigResolver do
         expect { @action.resolve_image(env) }.to raise_error(Errors::NoMatchingImage)
       end
     end
+    context 'with no images in config' do
+      it 'return nil' do
+        config.stub(:image) { nil }
+        config.stub(:volume_boot) { nil }
+        nova.stub(:get_all_images).with(anything) do
+          [Item.new('img-001', 'image-01'),
+           Item.new('img-002', 'image-02')]
+        end
+        @action.resolve_image(env).should eq(nil)
+      end
+    end
   end
 
   describe 'resolve_floating_ip' do
@@ -400,7 +413,6 @@ describe VagrantPlugins::Openstack::ConfigResolver do
     context 'neutron service is available' do
       context 'with network configured in all possible ways' do
         it 'returns normalized network list' do
-
           config.stub(:networks) do
             ['001',
              'net-02',
@@ -515,6 +527,10 @@ describe VagrantPlugins::Openstack::ConfigResolver do
       context 'with string volume name' do
         it 'returns normalized volume' do
           config.stub(:volume_boot) { 'vol-01' }
+          nova.stub(:get_all_images).with(anything) do
+            [Item.new('img-001', 'image-01'),
+             Item.new('img-002', 'image-02')]
+          end
           expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vda'
         end
       end
@@ -529,6 +545,10 @@ describe VagrantPlugins::Openstack::ConfigResolver do
       context 'with hash volume name' do
         it 'returns normalized volume' do
           config.stub(:volume_boot) { { name: 'vol-01' } }
+          nova.stub(:get_all_images).with(anything) do
+            [Item.new('img-001', 'image-01'),
+             Item.new('img-002', 'image-02')]
+          end
           expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vda'
         end
       end
@@ -543,6 +563,10 @@ describe VagrantPlugins::Openstack::ConfigResolver do
       context 'with hash volume name and device' do
         it 'returns normalized volume' do
           config.stub(:volume_boot) { { name: 'vol-01', device: 'vdb' } }
+          nova.stub(:get_all_images).with(anything) do
+            [Item.new('img-001', 'image-01'),
+             Item.new('img-002', 'image-02')]
+          end
           expect(@action.resolve_volume_boot(env)).to eq id: '001', device: 'vdb'
         end
       end
@@ -550,7 +574,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
       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)
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictBootVolume)
         end
       end
 
@@ -588,6 +612,77 @@ describe VagrantPlugins::Openstack::ConfigResolver do
           expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::MultipleVolumeName)
         end
       end
+
+      context 'with hash containing a name and an image_name' do
+        it 'raises an error' do
+          config.stub(:volume_boot) { { name: 'vol-01', image: 'img_001' } }
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictBootVolume)
+        end
+      end
+
+      context 'with hash containing a name and a size' do
+        it 'raises an error' do
+          config.stub(:volume_boot) { { name: 'vol-01', size: '10' } }
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictBootVolume)
+        end
+      end
+
+      context 'with hash containing a name and a delete_on_destroy indication' do
+        it 'raises an error' do
+          config.stub(:volume_boot) { { name: 'vol-01', delete_on_destroy: 'true' } }
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictBootVolume)
+        end
+      end
+
+      context 'with hash containing a volume_id and an image_name' do
+        it 'raises an error' do
+          config.stub(:volume_boot) { { id: 'id', image: 'img_001' } }
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictBootVolume)
+        end
+      end
+
+      context 'with hash containing a volume_id and a size' do
+        it 'raises an error' do
+          config.stub(:volume_boot) { { id: 'id', size: '10' } }
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictBootVolume)
+        end
+      end
+
+      context 'with hash containing a volume_id and a delete_on_destroy indication' do
+        it 'raises an error' do
+          config.stub(:volume_boot) { { id: 'id', delete_on_destroy: 'true' } }
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::ConflictBootVolume)
+        end
+      end
+
+      context 'with hash containing an image_name without size' do
+        it 'raises an error' do
+          config.stub(:volume_boot) { { image: 'img-001' } }
+          expect { @action.resolve_volume_boot(env) }.to raise_error(Errors::UnresolvedVolume)
+        end
+      end
+
+      context 'with hash containing an image_name with a size' do
+        it 'return normalized volume' do
+          config.stub(:volume_boot) { { image: 'image-01', size: '10' } }
+          nova.stub(:get_all_images).with(anything) do
+            [Item.new('img-001', 'image-01'),
+             Item.new('img-002', 'image-02')]
+          end
+          expect(@action.resolve_volume_boot(env)).to eq image: 'img-001', device: 'vda', size: '10', delete_on_destroy: 'true'
+        end
+      end
+
+      context 'with hash containing an image_name, size, device and delete_on_destroy' do
+        it 'return normalized volume' do
+          config.stub(:volume_boot) { { image: 'image-01', size: '10', device: 'vdb', delete_on_destroy: 'false' } }
+          nova.stub(:get_all_images).with(anything) do
+            [Item.new('img-001', 'image-01'),
+             Item.new('img-002', 'image-02')]
+          end
+          expect(@action.resolve_volume_boot(env)).to eq image: 'img-001', device: 'vdb', size: '10', delete_on_destroy: 'false'
+        end
+      end
     end
 
     context 'cinder service is not available' do
@@ -653,7 +748,6 @@ describe VagrantPlugins::Openstack::ConfigResolver do
     context 'cinder service is available' do
       context 'with volume attached in all possible ways' do
         it 'returns normalized volume list' do
-
           config.stub(:volumes) do
             ['001',
              'vol-02',
@@ -703,7 +797,7 @@ describe VagrantPlugins::Openstack::ConfigResolver do
       context 'with empty hash' do
         it 'raises an error' do
           config.stub(:volumes) { [{}] }
-          expect { @action.resolve_volumes(env) }.to raise_error(Errors::ConflictVolumeNameId)
+          expect { @action.resolve_volumes(env) }.to raise_error(Errors::ConflictBootVolume)
         end
       end
 

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

@@ -5,9 +5,7 @@ describe VagrantPlugins::Openstack::Config do
     let(:vagrant_public_key) { Vagrant.source_root.join('keys/vagrant.pub') }
 
     subject do
-      super().tap do |o|
-        o.finalize!
-      end
+      super().tap(&:finalize!)
     end
 
     its(:password)  { should be_nil }
@@ -253,9 +251,7 @@ describe VagrantPlugins::Openstack::Config do
     end
 
     subject do
-      super().tap do |o|
-        o.finalize!
-      end
+      super().tap(&:finalize!)
     end
 
     context 'with invalid stack' do

data/spec/vagrant-openstack-provider/e2e_spec.rb.save

@@ -0,0 +1,27 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+require 'aruba'
+require 'aruba/api'
+
+include Aruba::Api
+
+# spec/template_spec.rb
+require 'pathname'
+
+root = Pathname.new(__FILE__).parent.parent
+
+# Allows us to run commands directly, without worrying about the CWD
+ENV['PATH'] = "#{root.join('bin').to_s}#{File::PATH_SEPARATOR}#{ENV['PATH']}"
+
+describe "genud" do
+  context "YAML templates" do
+    it "should emit valid YAML to STDOUT", :focus do
+
+      puts '#####################'
+      # Run the command with Aruba's run_simple helper
+      run_simple "bundle exec vagrant openstack", false, 10
+
+#      assert_exit_status(0)
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ if ENV['COVERAGE'] != 'false'
 end
 
 Dir[
+  'lib/vagrant-openstack-provider/version_checker.rb',
   'lib/vagrant-openstack-provider/logging.rb',
   'lib/vagrant-openstack-provider/config.rb',
   'lib/vagrant-openstack-provider/config_resolver.rb',

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Utils do
-
   let(:config) do
     double('config').tap do |config|
       config.stub(:tenant_name) { 'testTenant' }
@@ -19,7 +18,7 @@ describe VagrantPlugins::Openstack::Utils do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:machine] = double('machine')
       env[:machine].stub(:provider_config) { config }
       env[:machine].stub(:id) { '1234id' }