vagrant-vsphere 0.6.0 → 0.7.0

data/lib/vSphere/util/vim_helpers.rb

@@ -1,37 +1,37 @@
-require 'rbvmomi'
-
-module VagrantPlugins
-  module VSphere
-    module Util
-      module VimHelpers
-        def get_datacenter(connection, machine)
-          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_datacenter')
-        end
-
-        def get_vm_by_uuid(connection, machine)
-          get_datacenter(connection, machine).vmFolder.findByUuid machine.id
-        end
-
-        def get_resource_pool(connection, machine)
-          cr = get_datacenter(connection, machine).find_compute_resource(machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_compute_resource')
-          cr.resourcePool.find(machine.provider_config.resource_pool_name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_resource_pool')
-        end
-        
-        def get_customization_spec_info_by_name(connection, machine)
-          name = machine.provider_config.customization_spec_name
-          return if name.nil? || name.empty?
-          
-          manager = connection.serviceContent.customizationSpecManager or fail Errors::VSphereError, :message => I18n.t('errors.null_configuration_spec_manager') if manager.nil?            
-          spec = manager.GetCustomizationSpec(:name => name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_configuration_spec') if spec.nil?
-        end
-        
-        def get_datastore(connection, machine)
-          name = machine.provider_config.data_store_name
-          return if name.nil? || name.empty?
-          
-          get_datacenter(connection, machine).find_datastore name or fail Errors::VSphereError, :message => I18n.t('errors.missing_datastore')
-        end
-      end
-    end
-  end
+require 'rbvmomi'
+
+module VagrantPlugins
+  module VSphere
+    module Util
+      module VimHelpers
+        def get_datacenter(connection, machine)
+          connection.serviceInstance.find_datacenter(machine.provider_config.data_center_name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_datacenter')
+        end
+
+        def get_vm_by_uuid(connection, machine)
+          get_datacenter(connection, machine).vmFolder.findByUuid machine.id
+        end
+
+        def get_resource_pool(connection, machine)
+          cr = get_datacenter(connection, machine).find_compute_resource(machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_compute_resource')
+          cr.resourcePool.find(machine.provider_config.resource_pool_name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_resource_pool')
+        end
+        
+        def get_customization_spec_info_by_name(connection, machine)
+          name = machine.provider_config.customization_spec_name
+          return if name.nil? || name.empty?
+          
+          manager = connection.serviceContent.customizationSpecManager or fail Errors::VSphereError, :message => I18n.t('errors.null_configuration_spec_manager') if manager.nil?            
+          spec = manager.GetCustomizationSpec(:name => name) or fail Errors::VSphereError, :message => I18n.t('errors.missing_configuration_spec') if spec.nil?
+        end
+        
+        def get_datastore(connection, machine)
+          name = machine.provider_config.data_store_name
+          return if name.nil? || name.empty?
+          
+          get_datacenter(connection, machine).find_datastore name or fail Errors::VSphereError, :message => I18n.t('errors.missing_datastore')
+        end
+      end
+    end
+  end
 end

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
-module VagrantPlugins
-  module VSphere
-    VERSION = '0.6.0'
-  end
+module VagrantPlugins
+  module VSphere
+    VERSION = '0.7.0'
+  end
 end

data/lib/vagrant-vsphere.rb

@@ -1,18 +1,18 @@
-require 'pathname'
-
-require 'vSphere/plugin'
-
-module VagrantPlugins
-  module VSphere
-    lib_path = Pathname.new(File.expand_path('../vSphere', __FILE__))
-    autoload :Action, lib_path.join('action')
-    autoload :Errors, lib_path.join('errors')
-
-    # This returns the path to the source of this plugin.
-    #
-    # @return [Pathname]
-    def self.source_root
-      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
-    end
-  end
+require 'pathname'
+
+require 'vSphere/plugin'
+
+module VagrantPlugins
+  module VSphere
+    lib_path = Pathname.new(File.expand_path('../vSphere', __FILE__))
+    autoload :Action, lib_path.join('action')
+    autoload :Errors, lib_path.join('errors')
+
+    # This returns the path to the source of this plugin.
+    #
+    # @return [Pathname]
+    def self.source_root
+      @source_root ||= Pathname.new(File.expand_path('../../', __FILE__))
+    end
+  end
 end

data/locales/en.yml

@@ -1,65 +1,65 @@
-en:
-  vsphere:
-    creating_cloned_vm: |-
-      Calling vSphere CloneVM with the following settings:
-    vm_clone_success: |-
-      New virtual machine successfully cloned and started
-    destroy_vm: |-
-      Calling vShpere Destroy
-    power_off_vm: |-
-      Calling vSphere PowerOff
-    power_on_vm: |-
-      Calling vSphere PowerOn
-    vm_already_created: |-
-      The VM is already created
-    vm_not_created: |-
-      The VM has not been created
-    vm_not_running: |-
-      The VM is not running
-    waiting_for_ssh: |-
-      Waiting for SSH to become available...
-    rsync_folder: |-
-      Rsyncing folder: %{hostpath} => %{guestpath}
-  errors:
-    missing_template: |-
-      Configured template/source VM could not be found
-    missing_datacenter: |-
-      Configured data center not found
-    missing_compute_resource: |-
-      Configured compute resource not found
-    missing_resource_pool: |-
-      Configured resource pool not found
-    null_configuration_spec_manager: |-
-      Configuration spec manager not configured in the ServiceInstance
-    missing_configuration_spec: |-
-      Configured configuration spec not found
-    missing_datastore: |-
-      Configured data store not found 
-    rsync_error: |-
-      There was an error when attemping to rsync a share folder.
-      Please inspect the error message below for more info.
-
-      Host path: %{hostpath}
-      Guest path: %{guestpath}
-      Error: %{stderr}
-    too_many_private_networks: |-
-      There a more private networks configured than can be assigned to the customization spec
-    rsync_not_found: |-
-      Warning! Folder sync disabled because the rsync binary is
-      missing. Make sure rsync is installed and the binary can
-      be found in PATH.
-  config:
-    host: |-
-      Configuration must specify a vSphere host
-    user: |-
-      Configuration must specify a vSphere user
-    password: |-
-      Configuration must specify a vSphere password
-    name: |-
-      Configuration must specify a VM name
-    template: |-
-      Configuration must specify a template name
-    compute_resource: |-
-      Configuration must specify a compute resource name
-    resource_pool: |-
-      Configuration must specify a resource pool name
+en:
+  vsphere:
+    creating_cloned_vm: |-
+      Calling vSphere CloneVM with the following settings:
+    vm_clone_success: |-
+      New virtual machine successfully cloned and started
+    destroy_vm: |-
+      Calling vShpere Destroy
+    power_off_vm: |-
+      Calling vSphere PowerOff
+    power_on_vm: |-
+      Calling vSphere PowerOn
+    vm_already_created: |-
+      The VM is already created
+    vm_not_created: |-
+      The VM has not been created
+    vm_not_running: |-
+      The VM is not running
+    waiting_for_ssh: |-
+      Waiting for SSH to become available...
+    rsync_folder: |-
+      Rsyncing folder: %{hostpath} => %{guestpath}
+  errors:
+    missing_template: |-
+      Configured template/source VM could not be found
+    missing_datacenter: |-
+      Configured data center not found
+    missing_compute_resource: |-
+      Configured compute resource not found
+    missing_resource_pool: |-
+      Configured resource pool not found
+    null_configuration_spec_manager: |-
+      Configuration spec manager not configured in the ServiceInstance
+    missing_configuration_spec: |-
+      Configured configuration spec not found
+    missing_datastore: |-
+      Configured data store not found 
+    rsync_error: |-
+      There was an error when attemping to rsync a share folder.
+      Please inspect the error message below for more info.
+
+      Host path: %{hostpath}
+      Guest path: %{guestpath}
+      Error: %{stderr}
+    too_many_private_networks: |-
+      There a more private networks configured than can be assigned to the customization spec
+    rsync_not_found: |-
+      Warning! Folder sync disabled because the rsync binary is
+      missing. Make sure rsync is installed and the binary can
+      be found in PATH.
+  config:
+    host: |-
+      Configuration must specify a vSphere host
+    user: |-
+      Configuration must specify a vSphere user
+    password: |-
+      Configuration must specify a vSphere password
+    name: |-
+      Configuration must specify a VM name
+    template: |-
+      Configuration must specify a template name
+    compute_resource: |-
+      Configuration must specify a compute resource name
+    resource_pool: |-
+      Configuration must specify a resource pool name

data/spec/action_spec.rb

@@ -1,116 +1,116 @@
-require 'spec_helper'
-require 'vagrant'
-
-describe VagrantPlugins::VSphere::Action do
-  def run(action)
-    Vagrant::Action::Runner.new.run described_class.send("action_#{action}"), @env
-  end
-  
-  before :each do
-    @machine.stub(:id).and_return(EXISTING_UUID)
-  end
-
-  describe 'up' do
-    def run_up
-      run :up
-    end
-
-    it 'should connect to vSphere' do
-      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
-
-      run_up
-    end
-
-    it 'should check if the VM exits' do
-      VagrantPlugins::VSphere::Action::IsCreated.any_instance.should_receive(:call)
-
-      run_up
-    end
-
-    it 'should create the VM when the VM does already not exist' do
-      @machine.state.stub(:id).and_return(:not_created)
-
-      VagrantPlugins::VSphere::Action::Clone.any_instance.should_receive(:call)
-
-      run_up
-    end
-
-    it 'should not create the VM when the VM already exists' do
-      @machine.state.stub(:id).and_return(:running)
-
-      VagrantPlugins::VSphere::Action::Clone.any_instance.should_not_receive(:call)
-
-      run_up
-    end
-  end
-
-  describe 'destroy' do
-    def run_destroy
-      run :destroy
-    end
-
-    it 'should connect to vSphere' do
-      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
-
-      run_destroy
-    end
-
-    it 'should power off the VM' do
-      VagrantPlugins::VSphere::Action::PowerOff.any_instance.should_receive(:call)
-
-      run_destroy
-    end
-
-    it 'should destroy the VM' do
-      VagrantPlugins::VSphere::Action::Destroy.any_instance.should_receive(:call)
-
-      run_destroy
-    end
-  end
-
-  describe 'halt' do
-    it 'should power off the VM' do
-      @machine.state.stub(:id).and_return(:running)
-      
-      VagrantPlugins::VSphere::Action::PowerOff.any_instance.should_receive(:call)
-
-      run :halt
-    end
-  end
-
-  describe 'get state' do
-    def run_get_state
-      run :get_state
-    end
-
-    it 'should connect to vSphere' do
-      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
-
-      run_get_state
-    end
-
-    it 'should get the power state' do
-      VagrantPlugins::VSphere::Action::GetState.any_instance.should_receive(:call)
-
-      run_get_state
-    end
-  end
-
-  describe 'get ssh info' do
-    def run_get_ssh_info
-      run :get_ssh_info
-    end
-
-    it 'should connect to vSphere' do
-      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
-
-      run_get_ssh_info
-    end
-
-    it 'should get the power state' do
-      VagrantPlugins::VSphere::Action::GetSshInfo.any_instance.should_receive(:call)
-
-      run_get_ssh_info
-    end
-  end
-end
+require 'spec_helper'
+require 'vagrant'
+
+describe VagrantPlugins::VSphere::Action do
+  def run(action)
+    Vagrant::Action::Runner.new.run described_class.send("action_#{action}"), @env
+  end
+  
+  before :each do
+    @machine.stub(:id).and_return(EXISTING_UUID)
+  end
+
+  describe 'up' do
+    def run_up
+      run :up
+    end
+
+    it 'should connect to vSphere' do
+      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
+
+      run_up
+    end
+
+    it 'should check if the VM exits' do
+      VagrantPlugins::VSphere::Action::IsCreated.any_instance.should_receive(:call)
+
+      run_up
+    end
+
+    it 'should create the VM when the VM does already not exist' do
+      @machine.state.stub(:id).and_return(:not_created)
+
+      VagrantPlugins::VSphere::Action::Clone.any_instance.should_receive(:call)
+
+      run_up
+    end
+
+    it 'should not create the VM when the VM already exists' do
+      @machine.state.stub(:id).and_return(:running)
+
+      VagrantPlugins::VSphere::Action::Clone.any_instance.should_not_receive(:call)
+
+      run_up
+    end
+  end
+
+  describe 'destroy' do
+    def run_destroy
+      run :destroy
+    end
+
+    it 'should connect to vSphere' do
+      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
+
+      run_destroy
+    end
+
+    it 'should power off the VM' do
+      VagrantPlugins::VSphere::Action::PowerOff.any_instance.should_receive(:call)
+
+      run_destroy
+    end
+
+    it 'should destroy the VM' do
+      VagrantPlugins::VSphere::Action::Destroy.any_instance.should_receive(:call)
+
+      run_destroy
+    end
+  end
+
+  describe 'halt' do
+    it 'should power off the VM' do
+      @machine.state.stub(:id).and_return(:running)
+      
+      VagrantPlugins::VSphere::Action::PowerOff.any_instance.should_receive(:call)
+
+      run :halt
+    end
+  end
+
+  describe 'get state' do
+    def run_get_state
+      run :get_state
+    end
+
+    it 'should connect to vSphere' do
+      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
+
+      run_get_state
+    end
+
+    it 'should get the power state' do
+      VagrantPlugins::VSphere::Action::GetState.any_instance.should_receive(:call)
+
+      run_get_state
+    end
+  end
+
+  describe 'get ssh info' do
+    def run_get_ssh_info
+      run :get_ssh_info
+    end
+
+    it 'should connect to vSphere' do
+      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
+
+      run_get_ssh_info
+    end
+
+    it 'should get the power state' do
+      VagrantPlugins::VSphere::Action::GetSshInfo.any_instance.should_receive(:call)
+
+      run_get_ssh_info
+    end
+  end
+end

data/spec/clone_spec.rb

@@ -1,32 +1,32 @@
-require 'spec_helper'
-
-describe VagrantPlugins::VSphere::Action::Clone do
-  before :each do
-    @env[:vSphere_connection] = @vim
-  end
-
-  it 'should create a CloneVM task' do
-    call    
-    @template.should have_received(:CloneVM_Task).with({
-      :folder => @data_center,
-      :name => NAME,
-      :spec => {}
-    })
-  end
-
-  it 'should set the machine id to be the new UUID' do
-    call
-    @machine.should have_received(:id=).with(NEW_UUID)
-  end
-
-  it 'should call the next item in the middleware stack' do
-    call
-    @app.should have_received :call
-  end
-  
-  it 'should set static IP when given config spec' do
-    @machine.provider_config.stub(:customization_spec_name).and_return('spec')
-    call
-    @ip.should have_received(:ipAddress=).with('0.0.0.0')
-  end
+require 'spec_helper'
+
+describe VagrantPlugins::VSphere::Action::Clone do
+  before :each do
+    @env[:vSphere_connection] = @vim
+  end
+
+  it 'should create a CloneVM task' do
+    call    
+    @template.should have_received(:CloneVM_Task).with({
+      :folder => @data_center,
+      :name => NAME,
+      :spec => {}
+    })
+  end
+
+  it 'should set the machine id to be the new UUID' do
+    call
+    @machine.should have_received(:id=).with(NEW_UUID)
+  end
+
+  it 'should call the next item in the middleware stack' do
+    call
+    @app.should have_received :call
+  end
+  
+  it 'should set static IP when given config spec' do
+    @machine.provider_config.stub(:customization_spec_name).and_return('spec')
+    call
+    @ip.should have_received(:ipAddress=).with('0.0.0.0')
+  end
 end

data/spec/connect_vsphere_spec.rb

@@ -1,24 +1,24 @@
-require 'spec_helper'
-
-describe VagrantPlugins::VSphere::Action::ConnectVSphere do
-  before :each do
-    described_class.new(@app, @env).call(@env)
-  end
-
-  it 'should connect to vSphere' do
-    VIM.should have_received(:connect).with({
-      :host => @env[:machine].provider_config.host,
-      :user => @env[:machine].provider_config.user,
-      :password => @env[:machine].provider_config.password,
-      :insecure => @env[:machine].provider_config.insecure,
-    })
-  end
-
-  it 'should add the vSphere connection to the environment' do
-    @env[:vSphere_connection].should be @vim
-  end
-
-  it 'should call the next item in the middleware stack' do
-    @app.should have_received :call
-  end
+require 'spec_helper'
+
+describe VagrantPlugins::VSphere::Action::ConnectVSphere do
+  before :each do
+    described_class.new(@app, @env).call(@env)
+  end
+
+  it 'should connect to vSphere' do
+    VIM.should have_received(:connect).with({
+      :host => @env[:machine].provider_config.host,
+      :user => @env[:machine].provider_config.user,
+      :password => @env[:machine].provider_config.password,
+      :insecure => @env[:machine].provider_config.insecure,
+    })
+  end
+
+  it 'should add the vSphere connection to the environment' do
+    @env[:vSphere_connection].should be @vim
+  end
+
+  it 'should call the next item in the middleware stack' do
+    @app.should have_received :call
+  end
 end

data/spec/destroy_spec.rb

@@ -1,31 +1,31 @@
-require 'spec_helper'
-
-describe VagrantPlugins::VSphere::Action::Destroy do
-  before :each do
-    @env[:vSphere_connection] = @vim
-  end
-
-  it 'should set the machine id to nil' do
-    @env[:machine].stub(:id).and_return(MISSING_UUID)
-
-    call
-
-    @env[:machine].should have_received(:id=).with(nil)
-  end
-
-  it 'should not create a Destroy task if VM is not found' do
-    @env[:machine].stub(:id).and_return(MISSING_UUID)
-
-    call
-
-    @vm.should_not have_received :Destroy_Task
-  end
-
-  it 'should create a VM Destroy task if the VM exists' do
-    @env[:machine].stub(:id).and_return(EXISTING_UUID)
-
-    call
-
-    @vm.should have_received :Destroy_Task
-  end
+require 'spec_helper'
+
+describe VagrantPlugins::VSphere::Action::Destroy do
+  before :each do
+    @env[:vSphere_connection] = @vim
+  end
+
+  it 'should set the machine id to nil' do
+    @env[:machine].stub(:id).and_return(MISSING_UUID)
+
+    call
+
+    @env[:machine].should have_received(:id=).with(nil)
+  end
+
+  it 'should not create a Destroy task if VM is not found' do
+    @env[:machine].stub(:id).and_return(MISSING_UUID)
+
+    call
+
+    @vm.should_not have_received :Destroy_Task
+  end
+
+  it 'should create a VM Destroy task if the VM exists' do
+    @env[:machine].stub(:id).and_return(EXISTING_UUID)
+
+    call
+
+    @vm.should have_received :Destroy_Task
+  end
 end