vagrant-openstack-provider 0.6.1 → 0.7.0

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::DeleteStack do
-
   let(:heat) do
     double('heat').tap do |app|
       app.stub(:delete_stack)
@@ -15,7 +14,7 @@ describe VagrantPlugins::Openstack::Action::DeleteStack 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)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::Message do
-
   let(:ui) do
     double('ui').tap do |ui|
       ui.stub(:info).with(anything)
@@ -10,7 +9,7 @@ describe VagrantPlugins::Openstack::Action::Message do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = ui
     end
   end

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

@@ -0,0 +1,104 @@
+require 'vagrant-openstack-provider/spec_helper'
+
+#
+# Stubing all the interactions using the real
+# provisioner classes is somehow complicated...
+#
+class FakeProvisioner
+  def provision
+  end
+end
+
+class FakeShellProvisioner < FakeProvisioner
+  attr_accessor :config
+
+  def initialize(config)
+    @config = config
+  end
+end
+
+#
+# Monkeypatch the VagrantPlugins::Shell module
+# to enabled using an FakeShellProvisioner in
+# place of a the real shell provisioner class
+#
+module VagrantPlugins
+  module Shell
+    Provisioner = FakeShellProvisioner
+  end
+end
+
+describe VagrantPlugins::Openstack::Action::ProvisionWrapper do
+  let(:app) do
+    double
+  end
+
+  let(:internal_provision_wrapper) do
+    double
+  end
+
+  before :each do
+    @action = ProvisionWrapper.new(app, nil)
+  end
+
+  describe 'execute' do
+    it 'call InternalProvisionWrapper and conitnue the middleware chain' do
+      expect(internal_provision_wrapper).to receive(:call)
+      InternalProvisionWrapper.stub(:new) { internal_provision_wrapper }
+      app.stub(:call) {}
+      @action.execute nil
+    end
+  end
+end
+
+describe VagrantPlugins::Openstack::Action::InternalProvisionWrapper do
+  let(:env) do
+    {}
+  end
+
+  before :each do
+    @action = InternalProvisionWrapper.new(nil, env)
+  end
+
+  describe 'run_provisioner' do
+    context 'when running a shell provisioner' do
+      context 'without meta-arg' do
+        it 'does not change the provisioner config' do
+          env[:provisioner] = FakeShellProvisioner.new(OpenStruct.new.tap do |c|
+            c.args = %w(arg1 arg2)
+          end)
+
+          expect(env[:provisioner]).to receive(:provision)
+          expect(@action).to receive(:handle_shell_meta_args)
+
+          @action.run_provisioner(env)
+          expect(env[:provisioner].config.args).to eq(%w(arg1 arg2))
+        end
+      end
+
+      context 'with @@ssh_ip@@ meta-arg' do
+        it 'replace the meta-args in the provisioner config' do
+          env[:provisioner] = FakeShellProvisioner.new(OpenStruct.new.tap do |c|
+            c.args = ['arg1', '@@ssh_ip@@', 'arg3']
+          end)
+
+          VagrantPlugins::Openstack::Action.stub(:get_ssh_info).and_return host: '192.168.0.1'
+          expect(env[:provisioner]).to receive(:provision)
+
+          @action.run_provisioner(env)
+          expect(env[:provisioner].config.args).to eq(%w(arg1 192.168.0.1 arg3))
+        end
+      end
+    end
+
+    context 'when running a provisioner other that the shell provisioner' do
+      it 'does not call handle_shell_meta_args' do
+        env[:provisioner] = FakeProvisioner.new
+        expect(@action).should_not_receive(:handle_shell_meta_args)
+        expect(env[:provisioner]).to receive(:provision)
+
+        @action.run_provisioner(env)
+      end
+    end
+  end
+end

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

@@ -5,7 +5,6 @@ include VagrantPlugins::Openstack::HttpUtils
 include VagrantPlugins::Openstack::Domain
 
 describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
-
   let(:config) do
     double('config').tap do |config|
       config.stub(:openstack_auth_url) { 'http://keystoneAuthV2' }
@@ -54,7 +53,7 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo 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')
@@ -188,5 +187,4 @@ describe VagrantPlugins::Openstack::Action::ReadSSHInfo do
       end
     end
   end
-
 end

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

@@ -1,13 +1,12 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::ReadState do
-
   let(:nova) do
     double('nova')
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::Resume do
-
   let(:nova) do
     double('nova').tap do |nova|
       nova.stub(:resume_server)
@@ -9,7 +8,7 @@ describe VagrantPlugins::Openstack::Action::Resume do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::StartServer do
-
   let(:nova) do
     double('nova').tap do |nova|
       nova.stub(:start_server)
@@ -9,7 +8,7 @@ describe VagrantPlugins::Openstack::Action::StartServer do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::StopServer do
-
   let(:nova) do
     double('nova').tap do |nova|
       nova.stub(:stop_server)
@@ -9,7 +8,7 @@ describe VagrantPlugins::Openstack::Action::StopServer do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::Suspend do
-
   let(:nova) do
     double('nova').tap do |nova|
       nova.stub(:suspend_server)
@@ -9,7 +8,7 @@ describe VagrantPlugins::Openstack::Action::Suspend do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)

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

@@ -6,7 +6,6 @@ require 'vagrant/util/subprocess'
 include VagrantPlugins::Openstack::Action
 
 describe VagrantPlugins::Openstack::Action::SyncFolders do
-
   let(:app) do
     double('app').tap do |app|
       app.stub(:call).with(anything)
@@ -34,7 +33,7 @@ describe VagrantPlugins::Openstack::Action::SyncFolders do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)

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

@@ -1,13 +1,12 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::WaitForServerToBeAccessible do
-
   let(:config) do
     double('config')
   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)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
-
   let(:nova) do
     double('nova')
   end
@@ -11,7 +10,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)
@@ -35,7 +34,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
   describe 'call' 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')
         expect(nova).to receive(:get_server_details).with(env, 'server_id').exactly(2).times
         expect(app).to receive(:call)
         config.stub(:server_active_timeout) { 5 }
@@ -43,7 +42,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToBeActive do
         @action.call(env)
       end
       it 'timeout after one retry' do
-        nova.stub(:get_server_details).and_return({ 'status' => 'BUILD' }, { 'status' => 'BUILD' })
+        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
         config.stub(:server_active_timeout) { 2 }
         @action = WaitForServerToBeActive.new(app, nil, 1)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
-
   let(:nova) do
     double('nova')
   end
@@ -11,7 +10,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:ui] = double('ui').tap do |ui|
         ui.stub(:info).with(anything)
         ui.stub(:error).with(anything)
@@ -35,7 +34,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
   describe 'call' do
     context 'when server is active' do
       it 'become shutoff after one retry' do
-        nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'SHUTOFF' })
+        nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, 'status' => 'SHUTOFF')
         expect(nova).to receive(:get_server_details).with(env, 'server_id').exactly(2).times
         expect(app).to receive(:call)
         config.stub(:server_stop_timeout) { 5 }
@@ -43,7 +42,7 @@ describe VagrantPlugins::Openstack::Action::WaitForServerToStop do
         @action.call(env)
       end
       it 'timeout after one retry' do
-        nova.stub(:get_server_details).and_return({ 'status' => 'ACTIVE' }, { 'status' => 'ACTIVE' })
+        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
         config.stub(:server_stop_timeout) { 2 }
         @action = WaitForServerToStop.new(app, nil, 1)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::Action do
-
   let(:builder) do
     double('builder').tap do |builder|
       builder.stub(:use)

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::CinderClient do
-
   let(:http) do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
@@ -16,7 +15,7 @@ describe VagrantPlugins::Openstack::CinderClient do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:machine] = double('machine')
       env[:machine].stub(:provider_config) { config }
     end
@@ -36,15 +35,14 @@ describe VagrantPlugins::Openstack::CinderClient do
   describe 'get_all_volumes' do
     context 'on api v1' do
       it 'returns volumes with details' do
-
         stub_request(:get, 'http://cinder/volumes/detail')
-        .with(
+          .with(
             headers:
                 {
                   'Accept' => 'application/json',
                   'X-Auth-Token' => '123456'
                 })
-        .to_return(
+          .to_return(
             status: 200,
             body: '
                 {
@@ -83,15 +81,14 @@ describe VagrantPlugins::Openstack::CinderClient do
 
     context 'on api v2' do
       it 'returns volumes with details' do
-
         stub_request(:get, 'http://cinder/volumes/detail')
-        .with(
+          .with(
             headers:
                 {
                   'Accept' => 'application/json',
                   'X-Auth-Token' => '123456'
                 })
-        .to_return(
+          .to_return(
             status: 200,
             body: '
                 {

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

@@ -1,7 +1,6 @@
 require 'vagrant-openstack-provider/spec_helper'
 
 describe VagrantPlugins::Openstack::GlanceClient do
-
   let(:http) do
     double('http').tap do |http|
       http.stub(:read_timeout) { 42 }
@@ -16,7 +15,7 @@ describe VagrantPlugins::Openstack::GlanceClient do
   end
 
   let(:env) do
-    Hash.new.tap do |env|
+    {}.tap do |env|
       env[:machine] = double('machine')
       env[:machine].stub(:provider_config) { config }
     end
@@ -38,21 +37,21 @@ describe VagrantPlugins::Openstack::GlanceClient do
       context 'and api version is v2' do
         it 'returns all images with details' do
           stub_request(:get, 'http://glance/images')
-          .with(
-            headers:
+            .with(
+              headers:
+                {
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+            .to_return(
+              status: 200,
+              body: '
               {
-                '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": [
+                  { "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)
 
@@ -64,38 +63,38 @@ describe VagrantPlugins::Openstack::GlanceClient do
       context 'and api version is v1' do
         it 'returns all images with details' do
           stub_request(:get, 'http://glance/images')
-          .with(
-            headers:
+            .with(
+              headers:
+                {
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+            .to_return(
+              status: 200,
+              body: '
               {
-                '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 }
-              ]
-            }')
+                "images": [
+                  { "id": "i1", "name": "image1", "is_public": true  },
+                  { "id": "i2", "name": "image2", "is_public": false }
+                ]
+              }')
 
           stub_request(:get, 'http://glance/images/detail')
-          .with(
-            headers:
+            .with(
+              headers:
+                {
+                  'Accept' => 'application/json',
+                  'X-Auth-Token' => '123456'
+                })
+            .to_return(
+              status: 200,
+              body: '
               {
-                '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": [
+                  { "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)
 
@@ -109,32 +108,32 @@ describe VagrantPlugins::Openstack::GlanceClient do
   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"
-                }
-              ]
-            }
-          ]}')
+        .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(env)