vagrant-openstack-provider 0.5.2 → 0.6.0

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

@@ -87,6 +87,38 @@ describe VagrantPlugins::Openstack::NeutronClient do
     end
   end
 
+  describe 'get_subnets' do
+    context 'with token' do
+      it 'returns all available subnets' do
+
+        stub_request(:get, 'http://neutron/subnets')
+        .with(
+          headers:
+            {
+              'Accept' => 'application/json',
+              'X-Auth-Token' => '123456'
+            })
+        .to_return(
+          status: 200,
+          body: '
+                {
+                  "subnets": [
+                    { "id": "subnet-01", "name": "Subnet 1", "cidr": "192.168.1.0/24", "enable_dhcp": true, "network_id": "net-01" },
+                    { "id": "subnet-02", "name": "Subnet 2", "cidr": "192.168.2.0/24", "enable_dhcp": false, "network_id": "net-01" },
+                    { "id": "subnet-03", "name": "Subnet 3", "cidr": "192.168.100.0/24", "enable_dhcp": true, "network_id": "net-02" }
+                  ]
+                }
+                ')
+
+        networks = @neutron_client.get_subnets(env)
+
+        expect(networks).to eq [Subnet.new('subnet-01', 'Subnet 1', '192.168.1.0/24', true, 'net-01'),
+                                Subnet.new('subnet-02', 'Subnet 2', '192.168.2.0/24', false, 'net-01'),
+                                Subnet.new('subnet-03', 'Subnet 3', '192.168.100.0/24', true, 'net-02')]
+      end
+    end
+  end
+
   describe 'get_api_version_list' do
     context 'basic' do
       it 'returns version list' do
@@ -118,7 +150,7 @@ describe VagrantPlugins::Openstack::NeutronClient do
               }
             ]}')
 
-        versions = @neutron_client.get_api_version_list(env)
+        versions = @neutron_client.get_api_version_list(:network)
 
         expect(versions.size).to eq(2)
       end

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

@@ -590,7 +590,7 @@ describe VagrantPlugins::Openstack::NovaClient do
                   ]
               }')
 
-        expect { @nova_client.add_floating_ip(env, 'o1o2o3', '1.2.3.4') }.to raise_error(RuntimeError)
+        expect { @nova_client.add_floating_ip(env, 'o1o2o3', '1.2.3.4') }.to raise_error(Errors::FloatingIPAlreadyAssigned)
       end
     end
 
@@ -616,7 +616,7 @@ describe VagrantPlugins::Openstack::NovaClient do
                   ]
               }')
 
-        expect { @nova_client.add_floating_ip(env, 'o1o2o3', '1.2.3.4') }.to raise_error(RuntimeError)
+        expect { @nova_client.add_floating_ip(env, 'o1o2o3', '1.2.3.4') }.to raise_error(Errors::FloatingIPNotAvailable)
       end
     end
   end

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

@@ -1,40 +1,61 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Command::ImageList do
-  describe 'cmd' do
 
-    let(:nova) do
-      double('nova').tap do |nova|
-        nova.stub(:get_all_images) do
-          [
-            Item.new('0001', 'ubuntu'),
-            Item.new('0002', 'centos'),
-            Item.new('0003', 'debian')
-          ]
-        end
+  let(:nova) do
+    double('nova').tap do |nova|
+      nova.stub(:get_all_images) do
+        [
+          Image.new('0001', 'ubuntu'),
+          Image.new('0002', 'centos'),
+          Image.new('0003', 'debian')
+        ]
       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 }
+  let(:glance) do
+    double('nova').tap do |nova|
+      nova.stub(:get_all_images) do
+        [
+          Image.new('0001', 'ubuntu', 'public',  700 * 1024 * 1024, 1, 10),
+          Image.new('0002', 'centos', 'private', 800 * 1024 * 1024, 2, 20),
+          Image.new('0003', 'debian', 'shared',  900 * 1024 * 1024, 4, 30)
+        ]
       end
     end
+  end
 
-    before :each do
-      @image_list_cmd = VagrantPlugins::Openstack::Command::ImageList.new(['--'], env)
+  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 }
+      env[:openstack_client].stub(:glance) { glance }
     end
+  end
 
-    it 'prints image list from server' do
+  before :each do
+    @image_list_cmd = VagrantPlugins::Openstack::Command::ImageList.new(['--'], env)
+  end
+
+  describe 'cmd' do
+    context 'when glance is not available' do
+
+      let(:session) do
+        double('session').tap do |s|
+          s.stub(:endpoints) { {} }
+        end
+      end
 
-      allow(@image_list_cmd).to receive(:with_target_vms).and_return(nil)
+      it 'prints image list with only the id and the name' do
 
-      nova.should_receive(:get_all_images).with(env)
+        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)
 
-      expect(env[:ui]).to receive(:info).with('
+        expect(env[:ui]).to receive(:info).with('
 +------+--------+
 | Id   | Name   |
 +------+--------+
@@ -42,7 +63,38 @@ describe VagrantPlugins::Openstack::Command::ImageList do
 | 0002 | centos |
 | 0003 | debian |
 +------+--------+')
-      @image_list_cmd.cmd('image-list', [], env)
+        @image_list_cmd.cmd('image-list', [], env)
+      end
+    end
+
+    context 'when glance is available' do
+
+      let(:session) do
+        double('session').tap do |s|
+          s.stub(:endpoints) do
+            {
+              image: 'http://glance'
+            }
+          end
+        end
+      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)
+
+        expect(env[:ui]).to receive(:info).with('
++------+--------+------------+-----------+--------------+---------------+
+| Id   | Name   | Visibility | Size (Mo) | Min RAM (Go) | Min Disk (Go) |
++------+--------+------------+-----------+--------------+---------------+
+| 0001 | ubuntu | public     | 700       | 1            | 10            |
+| 0002 | centos | private    | 800       | 2            | 20            |
+| 0003 | debian | shared     | 900       | 4            | 30            |
++------+--------+------------+-----------+--------------+---------------+')
+        @image_list_cmd.cmd('image-list', [], env)
+      end
     end
   end
 end

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

@@ -0,0 +1,46 @@
+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
+          [
+            Subnet.new('subnet-01', 'Subnet 1', '192.168.1.0/24', true, 'net-01'),
+            Subnet.new('subnet-02', 'Subnet 2', '192.168.2.0/24', false, 'net-01'),
+            Subnet.new('subnet-03', 'Subnet 3', '192.168.100.0/24', true, 'net-02')
+          ]
+        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(:neutron) { neutron }
+      end
+    end
+
+    before :each do
+      @subnet_list_cmd = VagrantPlugins::Openstack::Command::SubnetList.new(nil, env)
+    end
+
+    it 'prints subnet list from server' do
+      neutron.should_receive(:get_subnets).with(env)
+
+      expect(env[:ui]).to receive(:info).with('
++-----------+----------+------------------+-------+------------+
+| Id        | Name     | CIDR             | DHCP  | Network Id |
++-----------+----------+------------------+-------+------------+
+| subnet-01 | Subnet 1 | 192.168.1.0/24   | true  | net-01     |
+| subnet-02 | Subnet 2 | 192.168.2.0/24   | false | net-01     |
+| subnet-03 | Subnet 3 | 192.168.100.0/24 | true  | net-02     |
++-----------+----------+------------------+-------+------------+')
+
+      @subnet_list_cmd.cmd('subnet-list', [], env)
+    end
+  end
+end

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

@@ -25,16 +25,6 @@ describe VagrantPlugins::Openstack::ConfigResolver do
 
   let(:neutron) do
     double('neutron').tap do |neutron|
-      neutron.stub(:get_private_networks).with(anything) do
-        [Item.new('001', 'net-01'),
-         Item.new('002', 'net-02'),
-         Item.new('003', 'net-03'),
-         Item.new('004', 'net-04'),
-         Item.new('005', 'net-05'),
-         Item.new('006', 'net-06'),
-         Item.new('007', 'net-07-08'),
-         Item.new('008', 'net-07-08')]
-      end
       neutron.stub(:get_all_networks).with(anything) do
         [Item.new('001', 'net-01'),
          Item.new('002', 'net-02'),
@@ -223,9 +213,9 @@ describe VagrantPlugins::Openstack::ConfigResolver do
       end
     end
 
-    context 'with config.floating_pool specified' do
-      context 'if any ip in the same pool is available' do
-        context 'with config.floating_pool_always_allocate true' do
+    context 'with only one config.floating_ip_pool specified' do
+      context 'if an ip in the same pool is available' do
+        context 'with config.floating_ip_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
@@ -233,21 +223,21 @@ describe VagrantPlugins::Openstack::ConfigResolver do
                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)
+              FloatingIP.new('80.81.82.85', 'pool-1', nil)
             end
-            config.stub(:floating_ip_pool) { 'pool-1' }
-            @action.resolve_floating_ip(env).should eq('80.81.82.84')
+            config.stub(:floating_ip_pool) { ['pool-1'] }
+            @action.resolve_floating_ip(env).should eq('80.81.82.85')
           end
         end
 
-        context 'with config.floating_pool_always_allocate false' do
+        context 'with config.floating_ip_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' }
+            config.stub(:floating_ip_pool) { ['pool-1'] }
             @action.resolve_floating_ip(env).should eq('80.81.82.83')
           end
         end
@@ -261,12 +251,88 @@ describe VagrantPlugins::Openstack::ConfigResolver do
           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' }
+          config.stub(:floating_ip_pool) { ['pool-1'] }
           @action.resolve_floating_ip(env).should eq('80.81.82.84')
         end
       end
     end
 
+    context 'with several floating_ip_pool defined' do
+      context 'if an ip in a pool is available' do
+        context 'with config.floating_ip_pool_always_allocate true' do
+          it 'allocate a new floating_ip from the first pool defined' 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),
+               FloatingIP.new('80.81.82.82', 'pool-2', '5678')]
+            end
+            nova.stub(:allocate_floating_ip).with(env, 'pool-1') do
+              FloatingIP.new('80.81.82.85', 'pool-1', nil)
+            end
+            config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            @action.resolve_floating_ip(env).should eq('80.81.82.85')
+          end
+        end
+
+        context 'with config.floating_ip_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-2', nil)]
+            end
+            config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            @action.resolve_floating_ip(env).should eq('80.81.82.83')
+          end
+        end
+      end
+
+      context 'if no ip in the pools is available' do
+        context 'if allocate an ip in first pool is possible' do
+          it 'allocate a new floating_ip from first pool' do
+            nova.stub(:get_all_floating_ips).with(anything) do
+              [FloatingIP.new('80.81.82.83', 'pool-1', '1234'),
+               FloatingIP.new('80.81.82.82', 'pool-2', '5678')]
+            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) { %w(pool-1 pool-2) }
+            @action.resolve_floating_ip(env).should eq('80.81.82.84')
+          end
+        end
+
+        context 'if allocate an ip in first pool is not possible' do
+          it 'allocate a new floating_ip from second pool' do
+            nova.stub(:get_all_floating_ips).with(anything) do
+              [FloatingIP.new('80.81.82.83', 'pool-1', '1234'),
+               FloatingIP.new('80.81.82.82', 'pool-2', '5678')]
+            end
+            nova.stub(:allocate_floating_ip).with(env, 'pool-1').and_raise Errors::VagrantOpenstackError, message: 'error', code: 404
+            nova.stub(:allocate_floating_ip).with(env, 'pool-2') do
+              FloatingIP.new('80.81.82.84', 'pool-2', nil)
+            end
+            config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            @action.resolve_floating_ip(env).should eq('80.81.82.84')
+          end
+        end
+
+        context 'if allocate an ip in either first and second pool is not possible' do
+          it 'shoud raise an error', :simon do
+            nova.stub(:get_all_floating_ips).with(anything) do
+              [FloatingIP.new('80.81.82.83', 'pool-1', '1234'),
+               FloatingIP.new('80.81.82.82', 'pool-2', '5678')]
+            end
+            nova.stub(:allocate_floating_ip).with(env, 'pool-1').and_raise Errors::VagrantOpenstackError, message: 'error', code: 404
+            nova.stub(:allocate_floating_ip).with(env, 'pool-2').and_raise Errors::VagrantOpenstackError, message: 'error', code: 404
+            config.stub(:floating_ip_pool) { %w(pool-1 pool-2) }
+            expect { @action.resolve_floating_ip(env) }.to raise_error(Errors::VagrantOpenstackError)
+          end
+        end
+      end
+    end
+
     context 'with neither floating_ip nor floating_ip_pool' do
       it 'fails with an UnableToResolveFloatingIP error' do
         config.stub(:floating_ip) { nil }

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

@@ -13,6 +13,7 @@ describe VagrantPlugins::Openstack::Config do
     its(:password)  { should be_nil }
     its(:openstack_compute_url) { should be_nil }
     its(:openstack_auth_url) { should be_nil }
+    its(:openstack_orchestration_url) { should be_nil }
     its(:flavor)   { should be_nil }
     its(:image)    { should be_nil }
     its(:server_name) { should be_nil }
@@ -43,6 +44,8 @@ describe VagrantPlugins::Openstack::Config do
       :floating_ip_pool_always_allocate,
       :scheduler_hints,
       :security_groups,
+      :openstack_orchestration_url,
+      :stacks,
       :user_data,
       :metadata,
       :availability_zone,
@@ -62,6 +65,146 @@ describe VagrantPlugins::Openstack::Config do
     end
   end
 
+  describe 'merge' do
+    let(:foo_class) do
+      Class.new(described_class) do
+        attr_accessor :networks
+        attr_accessor :floating_ip_pool
+      end
+    end
+
+    subject { foo_class.new }
+
+    context 'with original network not empty' do
+      it 'should overidde the config' do
+        one = foo_class.new
+        one.networks = ['foo']
+
+        two = foo_class.new
+        two.networks = ['bar']
+
+        result = one.merge(two)
+        result.networks.should =~ ['bar']
+      end
+    end
+
+    context 'with original network empty' do
+      it 'should add the network to the existing list' do
+        one = foo_class.new
+        one.networks = []
+
+        two = foo_class.new
+        two.networks = ['bar']
+
+        result = one.merge(two)
+        result.networks.should =~ ['bar']
+      end
+    end
+
+    context 'with original network not empty and new empty' do
+      it 'should keep the original network' do
+        one = foo_class.new
+        one.networks = ['foo']
+
+        two = foo_class.new
+        two.networks = []
+
+        result = one.merge(two)
+        result.networks.should =~ ['foo']
+      end
+    end
+
+    context 'with original floating_ip_pool as string' do
+      context 'and new as empty array' do
+        it 'should put original string in a single entry array' do
+          one = foo_class.new
+          one.floating_ip_pool = 'pool'
+
+          two = foo_class.new
+          two.floating_ip_pool = []
+
+          result = one.merge(two)
+          result.floating_ip_pool.should =~ ['pool']
+        end
+      end
+      context 'and new as empty string' do
+        it 'should put original string in a single entry array' do
+          one = foo_class.new
+          one.floating_ip_pool = 'pool'
+
+          two = foo_class.new
+          two.floating_ip_pool = ''
+
+          result = one.merge(two)
+          result.floating_ip_pool.should =~ ['']
+        end
+      end
+      context 'and new as string' do
+        it 'should put new string in a single entry array' do
+          one = foo_class.new
+          one.floating_ip_pool = 'pool'
+
+          two = foo_class.new
+          two.floating_ip_pool = 'new-pool'
+
+          result = one.merge(two)
+          result.floating_ip_pool.should =~ ['new-pool']
+        end
+      end
+      context 'and new as array' do
+        it 'should put new array' do
+          one = foo_class.new
+          one.floating_ip_pool = 'pool'
+
+          two = foo_class.new
+          two.floating_ip_pool = %w(pool-1 pool-2)
+
+          result = one.merge(two)
+          result.floating_ip_pool.should =~ %w(pool-1 pool-2)
+        end
+      end
+    end
+
+    context 'with original floating_ip_pool as array' do
+      context 'and new empty' do
+        it 'should put original array' do
+          one = foo_class.new
+          one.floating_ip_pool = %w(pool-1 pool-2)
+
+          two = foo_class.new
+          two.floating_ip_pool = []
+
+          result = one.merge(two)
+          result.floating_ip_pool.should =~ %w(pool-1 pool-2)
+        end
+      end
+      context 'and new as string' do
+        it 'should put new string in a single entry array' do
+          one = foo_class.new
+          one.floating_ip_pool = %w(pool-1 pool-2)
+
+          two = foo_class.new
+          two.floating_ip_pool = 'pool'
+
+          result = one.merge(two)
+          result.floating_ip_pool.should =~ ['pool']
+        end
+      end
+      context 'and new as array' do
+        it 'should put new array' do
+          one = foo_class.new
+          one.floating_ip_pool = %w(pool-1 pool-2)
+
+          two = foo_class.new
+          two.floating_ip_pool = %w(new-pool-1 new-pool-2)
+
+          result = one.merge(two)
+          result.floating_ip_pool.should =~ %w(new-pool-1 new-pool-2)
+        end
+      end
+    end
+  end
+
   describe 'validation' do
     let(:machine) { double('machine') }
     let(:validation_errors) { subject.validate(machine)['Openstack Provider'] }
@@ -88,6 +231,39 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
+    context 'with invalid stack' do
+      it 'should raise an error' do
+        subject.stacks = [
+          {
+            name: 'test1'
+          }
+        ]
+        I18n.should_receive(:t).with('vagrant_openstack.config.invalid_stack').and_return error_message
+        validation_errors.first.should == error_message
+      end
+
+      it 'should raise an error' do
+        subject.stacks = [
+          {
+            name: 'test1',
+            tempslate: 'tes1'
+          }
+        ]
+        I18n.should_receive(:t).with('vagrant_openstack.config.invalid_stack').and_return error_message
+        validation_errors.first.should == error_message
+      end
+
+      it 'should not raise an error' do
+        subject.stacks = [
+          {
+            name: 'test1',
+            template: 'tes1'
+          }
+        ]
+        expect(validation_errors).to be_empty
+      end
+    end
+
     context 'with invalid key' do
       it 'should raise an error' do
         subject.nonsense1 = true
@@ -153,7 +329,7 @@ describe VagrantPlugins::Openstack::Config do
       end
     end
 
-    [:openstack_compute_url, :openstack_auth_url].each do |url|
+    [:openstack_compute_url, :openstack_auth_url, :openstack_orchestration_url].each do |url|
       context "the #{url}" do
         it 'should not validate if the URL is invalid' do
           subject.send "#{url}=", 'baz'