vagrant-openstack-provider 0.5.2 → 0.6.0

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

@@ -200,7 +200,12 @@ describe VagrantPlugins::Openstack::Action::CreateServer do
       it 'timeout before the server become active' do
         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
-        expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1, 3) }.to raise_error Timeout::Error
+        expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1, 3) }.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.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
+        expect { @action.waiting_for_server_to_be_built(env, 'server-01', 1, 3) }.to raise_error Errors::ServerStatusError
       end
     end
   end

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

@@ -0,0 +1,97 @@
+require 'vagrant-openstack-provider/spec_helper'
+require 'ostruct'
+require 'sshkey'
+
+include VagrantPlugins::Openstack::Action
+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
+        [
+          {
+            name: 'stack1',
+            template: 'template.yml'
+          },
+          {
+            name: 'stack2',
+            template: 'template.yml'
+          }
+        ]
+      end
+    end
+  end
+
+  let(:heat) do
+    double('heat')
+  end
+
+  let(:env) do
+    Hash.new.tap do |env|
+      env[:ui] = double('ui')
+      env[:ui].stub(:info).with(anything)
+      env[:machine] = double('machine')
+      env[:machine] = OpenStruct.new.tap do |m|
+        m.provider_config = config
+        m.id = nil
+      end
+      env[:openstack_client] = double('openstack_client')
+      env[:openstack_client].stub(:heat) { heat }
+    end
+  end
+  before :each do
+    CreateStack.send(:public, *CreateStack.private_instance_methods)
+    app = double('app')
+    app.stub(:call).with(anything)
+    @action = CreateStack.new(app, nil)
+    YAML.stub(:load_file).with('template.yml').and_return(YAML.load('
+      heat_template_version: 2013-05-23
+
+      description: Simple template to deploy a single compute instance
+
+      resources:
+        my_instance:
+          type: OS::Nova::Server
+          properties:
+            key_name: julien-mac
+            image: CoreOS
+            flavor: 1_vCPU_RAM_512M_HD_10G
+    '))
+
+  end
+
+  describe 'call' do
+    it 'should create stacks on heat twice' do
+      heat.stub(:create_stack).and_return('idstack')
+      File.should_receive(:write).with('/stack_stack1_id', 'idstack')
+      File.should_receive(:write).with('/stack_stack2_id', 'idstack')
+      # TODO(julienvey) assert content of create call is correct
+      heat.should_receive(:create_stack).exactly(2).times
+      heat.stub(:get_stack_details).and_return('stack_status' => 'CREATE_COMPLETE')
+      @action.call(env)
+    end
+  end
+
+  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.should_receive(:get_stack_details).with(env, 'stack1', 'id-01').exactly(2).times
+        @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1, 5)
+      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.should_receive(:get_stack_details).with(env, 'stack1', 'id-01').at_least(2).times
+        expect { @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1, 3) }.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.should_receive(:get_stack_details).with(env, 'stack1', 'id-01').exactly(2).times
+        expect { @action.waiting_for_stack_to_be_created(env, 'stack1', 'id-01', 1, 3) }.to raise_error Errors::StackStatusError
+      end
+    end
+  end
+end

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

@@ -27,10 +27,11 @@ describe VagrantPlugins::Openstack::Action::DeleteServer do
     end
   end
 
-  let(:app) do
-    double('app').tap do |app|
-      app.stub(:call).with(anything)
-    end
+  before :each do
+    DeleteServer.send(:public, *DeleteServer.private_instance_methods)
+    app = double('app')
+    app.stub(:call).with(anything)
+    @action = DeleteServer.new(app, nil)
   end
 
   describe 'call' do
@@ -38,17 +39,44 @@ describe VagrantPlugins::Openstack::Action::DeleteServer do
       it 'delete server' do
         expect(nova).to receive(:delete_server).with(env, 'server_id')
         expect(nova).to receive(:delete_keypair_if_vagrant).with(env, 'server_id')
-        @action = DeleteServer.new(app, nil)
+        expect(@action).to receive(:waiting_for_instance_to_be_deleted).with(env, 'server_id')
         @action.call(env)
       end
     end
     context 'when id is not present' do
       it 'delete server' do
+        env[:machine].id = nil
         expect(nova).should_not_receive(:delete_server)
         expect(nova).should_not_receive(:delete_keypair_if_vagrant)
-        @action = DeleteServer.new(app, nil)
         @action.call(env)
       end
     end
   end
+
+  describe 'waiting_for_instance_to_be_deleted' do
+    context 'when server is not yet active' do
+      it 'become deleted after one retry' do
+        nova.stub(:get_server_details).once.and_return('status' => 'ACTIVE')
+        nova.stub(:get_server_details).once.and_raise(Errors::InstanceNotFound)
+        nova.should_receive(:get_server_details).with(env, 'server-01').exactly(1).times
+        @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 5)
+      end
+      it 'become deleted after one retry' do
+        nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'DELETED' })
+        nova.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
+        @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 5)
+      end
+      it 'timeout before the server become active' do
+        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
+        expect { @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 3) }.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.should_receive(:get_server_details).with(env, 'server-01').exactly(2).times
+        expect { @action.waiting_for_instance_to_be_deleted(env, 'server-01', 1, 3) }.to raise_error Errors::ServerStatusError
+      end
+    end
+  end
+
 end

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

@@ -0,0 +1,64 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+describe VagrantPlugins::Openstack::Action::DeleteStack do
+
+  let(:heat) do
+    double('heat').tap do |app|
+      app.stub(:delete_stack)
+    end
+  end
+
+  let(:openstack_client) do
+    double('openstack_client').tap do |os|
+      os.stub(:heat) { heat }
+    end
+  end
+
+  let(:env) do
+    Hash.new.tap do |env|
+      env[:ui] = double('ui')
+      env[:ui].stub(:info).with(anything)
+      env[:ui].stub(:error).with(anything)
+      env[:openstack_client] = openstack_client
+      env[:machine] = OpenStruct.new.tap do |m|
+        m.id = 'server_id'
+        m.data_dir = '/test'
+      end
+    end
+  end
+
+  before :each do
+    DeleteStack.send(:public, *DeleteStack.private_instance_methods)
+    app = double('app')
+    app.stub(:call).with(anything)
+    @action = DeleteStack.new(app, nil)
+  end
+
+  describe 'call' do
+    context 'when id is present' do
+      it 'delete stack' do
+        expect(heat).to receive(:delete_stack).with(env, 'test1', '1234')
+        expect(heat).to receive(:delete_stack).with(env, 'test2', '2345')
+        @action.stub(:list_stack_files).with(env).and_return([
+          {
+            name: 'test1',
+            id: '1234'
+          }, {
+            name: 'test2',
+            id: '2345'
+          }])
+        expect(@action).to receive(:waiting_for_stack_to_be_deleted).with(env, 'test1', '1234')
+        expect(@action).to receive(:waiting_for_stack_to_be_deleted).with(env, 'test2', '2345')
+        @action.call(env)
+      end
+    end
+    context 'when id is not present' do
+      it 'delete stack' do
+        @action.stub(:list_stack_files).with(env).and_return([])
+        expect(heat).should_not_receive(:delete_stack)
+        expect(heat).should_not_receive(:waiting_for_stack_to_be_deleted)
+        @action.call(env)
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ describe VagrantPlugins::Openstack::Action::ReadState do
 
   describe 'call' do
     context 'when server id is present' do
-      it 'set the state to the one returned by nova' do
+      it 'set the state to the vm_state returned by nova' do
         env[:machine].id = 'server_id'
         nova.stub(:get_server_details).and_return('status' => 'ACTIVE')
 
@@ -39,6 +39,18 @@ describe VagrantPlugins::Openstack::Action::ReadState do
 
         expect(env[:machine_state_id]).to eq(:active)
       end
+      it 'set the state to the task_state returned by nova extension' do
+        env[:machine].id = 'server_id'
+        nova.stub(:get_server_details).and_return('OS-EXT-STS:task_state' => 'SUSPENDING')
+
+        expect(nova).to receive(:get_server_details).with(env, 'server_id')
+        expect(app).to receive(:call)
+
+        @action = ReadState.new(app, nil)
+        @action.call(env)
+
+        expect(env[:machine_state_id]).to eq(:suspending)
+      end
     end
     context 'when server id is not present' do
       it 'set the state to :not_created' do

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

@@ -23,6 +23,7 @@ describe VagrantPlugins::Openstack::Action::SyncFolders do
     double('provider_config').tap do |c|
       c.stub(:rsync_includes) { nil }
       c.stub(:ssh_disabled) { false }
+      c.stub(:rsync_ignore_files) { ['.gitignore'] }
     end
   end
 

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

@@ -40,7 +40,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
         nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'BUILD' })
         expect(nova).to receive(:get_server_details).with(env, 'server_id').at_least(2).times
         @action = WaitForServerToBeActive.new(app, nil, 1, 2)
-        expect { @action.call(env) }.to raise_error Timeout::Error
+        expect { @action.call(env) }.to raise_error Errors::Timeout
       end
     end
   end

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

@@ -40,7 +40,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
         nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'ACTIVE' })
         expect(nova).to receive(:get_server_details).with(env, 'server_id').at_least(2).times
         @action = WaitForServerToStop.new(app, nil, 1, 2)
-        expect { @action.call(env) }.to raise_error Timeout::Error
+        expect { @action.call(env) }.to raise_error Errors::Timeout
       end
     end
   end

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

@@ -0,0 +1,128 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+describe VagrantPlugins::Openstack::GlanceClient do
+
+  let(:env) do
+    Hash.new
+  end
+
+  let(:session) do
+    VagrantPlugins::Openstack.session
+  end
+
+  before :each do
+    session.token = '123456'
+    session.project_id = 'a1b2c3'
+    session.endpoints = { image: 'http://glance' }
+    @glance_client = VagrantPlugins::Openstack.glance
+  end
+
+  describe 'get_all_images' do
+    context 'with token and project_id acquainted' do
+      context 'and api version is v2' do
+        it 'returns all images with details' do
+          stub_request(:get, 'http://glance/images')
+          .with(
+            headers:
+              {
+                'Accept' => 'application/json',
+                'X-Auth-Token' => '123456'
+              })
+          .to_return(
+            status: 200,
+            body: '
+            {
+              "images": [
+                { "id": "i1", "name": "image1", "visibility": "public",  "size": "1024", "min_ram": "1", "min_disk": "10" },
+                { "id": "i2", "name": "image2", "visibility": "private", "size": "2048", "min_ram": "2", "min_disk": "20" }
+              ]
+            }')
+
+          images = @glance_client.get_all_images(env)
+
+          expect(images).to eq [Image.new('i1', 'image1', 'public',  '1024', '1', '10'),
+                                Image.new('i2', 'image2', 'private', '2048', '2', '20')]
+        end
+      end
+
+      context 'and api version is v1' do
+        it 'returns all images with details' do
+          stub_request(:get, 'http://glance/images')
+          .with(
+            headers:
+              {
+                'Accept' => 'application/json',
+                'X-Auth-Token' => '123456'
+              })
+          .to_return(
+            status: 200,
+            body: '
+            {
+              "images": [
+                { "id": "i1", "name": "image1", "is_public": true  },
+                { "id": "i2", "name": "image2", "is_public": false }
+              ]
+            }')
+
+          stub_request(:get, 'http://glance/images/detail')
+          .with(
+            headers:
+              {
+                'Accept' => 'application/json',
+                'X-Auth-Token' => '123456'
+              })
+          .to_return(
+            status: 200,
+            body: '
+            {
+              "images": [
+                { "id": "i1", "name": "image1", "is_public": true,  "size": "1024", "min_ram": "1", "min_disk": "10" },
+                { "id": "i2", "name": "image2", "is_public": false, "size": "2048", "min_ram": "2", "min_disk": "20" }
+              ]
+            }')
+
+          images = @glance_client.get_all_images(env)
+
+          expect(images).to eq [Image.new('i1', 'image1', 'public',  '1024', '1', '10'),
+                                Image.new('i2', 'image2', 'private', '2048', '2', '20')]
+        end
+      end
+    end
+  end
+
+  describe 'get_api_version_list' do
+    it 'returns version list' do
+      stub_request(:get, 'http://glance/')
+      .with(header: { 'Accept' => 'application/json' })
+      .to_return(
+        status: 200,
+        body: '{
+          "versions": [
+            {
+              "status": "...",
+              "id": "v1.0",
+              "links": [
+                {
+                  "href": "http://glance/v1.0",
+                  "rel": "self"
+                }
+              ]
+            },
+            {
+              "status": "CURRENT",
+              "id": "v2.0",
+              "links": [
+                {
+                  "href": "http://glance/v2.0",
+                  "rel": "self"
+                }
+              ]
+            }
+          ]}')
+
+      versions = @glance_client.get_api_version_list(:image)
+
+      expect(versions.size).to eq(2)
+    end
+  end
+end

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

@@ -0,0 +1,124 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+describe VagrantPlugins::Openstack::NovaClient do
+  include FakeFS::SpecHelpers::All
+
+  let(:config) do
+    double('config').tap do |config|
+      config.stub(:openstack_auth_url) { 'http://heatAuthV2' }
+      config.stub(:openstack_orchestration_url) { nil }
+      config.stub(:tenant_name) { 'testTenant' }
+      config.stub(:username) { 'username' }
+      config.stub(:password) { 'password' }
+    end
+  end
+
+  let(:env) do
+    Hash.new.tap do |env|
+      env[:ui] = double('ui')
+      env[:ui].stub(:info).with(anything)
+      env[:machine] = double('machine')
+      env[:machine].stub(:provider_config) { config }
+    end
+  end
+
+  let(:session) do
+    VagrantPlugins::Openstack.session
+  end
+
+  before :each do
+    session.token = '123456'
+    session.project_id = 'a1b2c3'
+    session.endpoints = { orchestration: 'http://heat/a1b2c3' }
+    @heat_client = VagrantPlugins::Openstack.heat
+  end
+
+  describe 'stack_exists' do
+    context 'stack not found' do
+      it 'raise an StackNotFound error' do
+        stub_request(:get, 'http://heat/a1b2c3/stacks/stack_name/stack_id')
+            .with(
+              headers:
+              {
+                'Accept' => 'application/json',
+                'Accept-Encoding' => 'gzip, deflate',
+                'X-Auth-Token' => '123456'
+              })
+            .to_return(
+              status: 404,
+              body: '{"itemNotFound": {"message": "Stack could not be found", "code": 404}}')
+
+        expect { @heat_client.get_stack_details(env, 'stack_name', 'stack_id') }.to raise_error(VagrantPlugins::Openstack::Errors::StackNotFound)
+
+      end
+    end
+  end
+
+  describe 'create_stack' do
+    context 'with token and project_id acquainted' do
+      it 'returns new stack id' do
+
+        stub_request(:post, 'http://heat/a1b2c3/stacks')
+            .with(
+              body: '{"stack_name":"stck","template":"toto"}',
+              headers:
+              {
+                'Accept' => 'application/json',
+                'Content-Type' => 'application/json',
+                'X-Auth-Token' => '123456'
+              })
+            .to_return(status: 202, body: '{ "stack": { "id": "o1o2o3" } }')
+
+        stack_id = @heat_client.create_stack(env, name: 'stck', template: 'toto')
+
+        expect(stack_id).to eq('o1o2o3')
+      end
+    end
+  end
+
+  describe 'get_stack_details' do
+    context 'with token and project_id acquainted' do
+      it 'returns stack details' do
+
+        stub_request(:get, 'http://heat/a1b2c3/stacks/stack_id/stack_name')
+            .with(headers:
+              {
+                'Accept' => 'application/json',
+                'X-Auth-Token' => '123456'
+              })
+            .to_return(status: 200, body: '
+            {
+                "stack": {
+                    "description": "sample stack",
+                    "disable_rollback": "True",
+                    "id": "stack_id",
+                    "stack_name": "stack_name",
+                    "stack_status": "CREATE_COMPLETE"
+                }
+            }')
+
+        stack = @heat_client.get_stack_details(env, 'stack_id', 'stack_name')
+
+        expect(stack['id']).to eq('stack_id')
+        expect(stack['stack_name']).to eq('stack_name')
+      end
+    end
+  end
+
+  describe 'delete_stack' do
+    context 'with token and project_id acquainted' do
+      it 'deletes the stack' do
+
+        stub_request(:delete, 'http://heat/a1b2c3/stacks/stack_id/stack_name')
+            .with(headers:
+              {
+                'Accept' => 'application/json',
+                'X-Auth-Token' => '123456'
+              })
+            .to_return(status: 204)
+
+        @heat_client.delete_stack(env, 'stack_id', 'stack_name')
+      end
+    end
+  end
+end