vagrant-vsphere 0.7.0 → 0.7.1

data/example_box/metadata.json

@@ -1,3 +1,3 @@
-{
-  "provider": "vSphere"
+{
+  "provider": "vSphere"
 }

data/lib/vSphere/action.rb

@@ -1,172 +1,172 @@
-require 'vagrant'
-require 'vagrant/action/builder'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      include Vagrant::Action::Builtin
-
-      #Vagrant commands
-      def self.action_destroy
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use Call, IsRunning do |env, b2|
-            if [:result]
-                b2.use PowerOff
-                next
-            end
-          end
-          b.use Destroy
-        end
-      end
-
-      def self.action_provision
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-            
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next       
-              end
-              
-              b3.use Provision
-              b3.use SyncFolders 
-            end        
-          end
-        end
-      end
-
-      def self.action_ssh
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-            
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next
-              end
-              
-              b3.use SSHExec
-            end
-          end
-        end
-      end
-      
-      def self.action_ssh_run
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next
-              end
-              
-              b3.use SSHRun
-            end
-          end
-        end
-      end
-
-      def self.action_up
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use Call, IsCreated do |env, b2|
-            if env[:result]
-              b2.use MessageAlreadyCreated
-              next
-            end
-
-            b2.use Clone 
-          end
-          b.use Call, IsRunning do |env, b2|
-            if !env[:result]
-              b2.use PowerOn
-            end
-          end
-          b.use CloseVSphere 
-          b.use Provision          
-          b.use SyncFolders          
-        end
-      end
-
-      def self.action_halt
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
-            end
-            
-            b2.use Call, IsRunning do |env, b3|
-              if !env[:result]
-                b3.use MessageNotRunning
-                next
-              end
-              
-              b3.use PowerOff
-            end
-          end
-          b.use CloseVSphere
-        end
-      end
-
-      #vSphere specific actions
-      def self.action_get_state
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use GetState
-          b.use CloseVSphere
-        end
-      end
-
-      def self.action_get_ssh_info
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectVSphere
-          b.use GetSshInfo
-          b.use CloseVSphere
-        end
-      end
-
-      #autoload
-      action_root = Pathname.new(File.expand_path('../action', __FILE__))
-      autoload :Clone, action_root.join('clone')
-      autoload :CloseVSphere, action_root.join('close_vsphere')
-      autoload :ConnectVSphere, action_root.join('connect_vsphere')
-      autoload :Destroy, action_root.join('destroy')
-      autoload :GetSshInfo, action_root.join('get_ssh_info')
-      autoload :GetState, action_root.join('get_state')
-      autoload :IsCreated, action_root.join('is_created')
-      autoload :IsRunning, action_root.join('is_running')
-      autoload :MessageAlreadyCreated, action_root.join('message_already_created')
-      autoload :MessageNotCreated, action_root.join('message_not_created')
-      autoload :MessageNotRunning, action_root.join('message_not_running')
-      autoload :PowerOff, action_root.join('power_off')
-      autoload :PowerOn, action_root.join('power_on')
-      autoload :SyncFolders, action_root.join('sync_folders')
-    end
-  end
-end
-
+require 'vagrant'
+require 'vagrant/action/builder'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      include Vagrant::Action::Builtin
+
+      #Vagrant commands
+      def self.action_destroy
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use Call, IsRunning do |env, b2|
+            if [:result]
+                b2.use PowerOff
+                next
+            end
+          end
+          b.use Destroy
+        end
+      end
+
+      def self.action_provision
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+            
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next       
+              end
+              
+              b3.use Provision
+              b3.use SyncFolders 
+            end        
+          end
+        end
+      end
+
+      def self.action_ssh
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+            
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next
+              end
+              
+              b3.use SSHExec
+            end
+          end
+        end
+      end
+      
+      def self.action_ssh_run
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next
+              end
+              
+              b3.use SSHRun
+            end
+          end
+        end
+      end
+
+      def self.action_up
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use Call, IsCreated do |env, b2|
+            if env[:result]
+              b2.use MessageAlreadyCreated
+              next
+            end
+
+            b2.use Clone 
+          end
+          b.use Call, IsRunning do |env, b2|
+            if !env[:result]
+              b2.use PowerOn
+            end
+          end
+          b.use CloseVSphere 
+          b.use Provision          
+          b.use SyncFolders          
+        end
+      end
+
+      def self.action_halt
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+            
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                b3.use MessageNotRunning
+                next
+              end
+              
+              b3.use PowerOff
+            end
+          end
+          b.use CloseVSphere
+        end
+      end
+
+      #vSphere specific actions
+      def self.action_get_state
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use GetState
+          b.use CloseVSphere
+        end
+      end
+
+      def self.action_get_ssh_info
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectVSphere
+          b.use GetSshInfo
+          b.use CloseVSphere
+        end
+      end
+
+      #autoload
+      action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :Clone, action_root.join('clone')
+      autoload :CloseVSphere, action_root.join('close_vsphere')
+      autoload :ConnectVSphere, action_root.join('connect_vsphere')
+      autoload :Destroy, action_root.join('destroy')
+      autoload :GetSshInfo, action_root.join('get_ssh_info')
+      autoload :GetState, action_root.join('get_state')
+      autoload :IsCreated, action_root.join('is_created')
+      autoload :IsRunning, action_root.join('is_running')
+      autoload :MessageAlreadyCreated, action_root.join('message_already_created')
+      autoload :MessageNotCreated, action_root.join('message_not_created')
+      autoload :MessageNotRunning, action_root.join('message_not_running')
+      autoload :PowerOff, action_root.join('power_off')
+      autoload :PowerOn, action_root.join('power_on')
+      autoload :SyncFolders, action_root.join('sync_folders')
+    end
+  end
+end
+

data/lib/vSphere/action/clone.rb

@@ -1,127 +1,131 @@
-require 'rbvmomi'
-require 'i18n'
-require 'vSphere/util/vim_helpers'
-require 'vSphere/util/machine_helpers'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class Clone
-        include Util::VimHelpers
-        include Util::MachineHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          machine = env[:machine]
-          config = machine.provider_config          
-          connection = env[:vSphere_connection]
-          name = get_name machine, config
-          
-          dc = get_datacenter connection, machine
-          template = dc.find_vm config.template_name
-
-          raise Error::VSphereError, :message => I18n.t('errors.missing_template') if template.nil?
-
-          begin
-            if config.linked_clone
-              # The API for linked clones is quite strange. We can't create a linked
-              # straight from any VM. The disks of the VM for which we can create a
-              # linked clone need to be read-only and thus VC demands that the VM we
-              # are cloning from uses delta-disks. Only then it will allow us to
-              # share the base disk.
-              #
-              # Thus, this code first create a delta disk on top of the base disk for
-              # the to-be-cloned VM, if delta disks aren't used already.
-              disks = template.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
-              disks.select { |disk| disk.backing.parent == nil }.each do |disk|
-                spec = {
-                    :deviceChange => [
-                        {
-                            :operation => :remove,
-                            :device => disk
-                        },
-                        {
-                            :operation => :add,
-                            :fileOperation => :create,
-                            :device => disk.dup.tap { |new_disk|
-                              new_disk.backing = new_disk.backing.dup
-                              new_disk.backing.fileName = "[#{disk.backing.datastore.name}]"
-                              new_disk.backing.parent = disk.backing
-                            },
-                        }
-                    ]
-                }
-                template.ReconfigVM_Task(:spec => spec).wait_for_completion
-              end
-
-              location = RbVmomi::VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
-            else
-              location = RbVmomi::VIM.VirtualMachineRelocateSpec
-              location[:pool] = get_resource_pool(connection, machine) unless config.clone_from_vm
-              
-              datastore = get_datastore connection, machine
-              location[:datastore] = datastore unless datastore.nil?
-            end
-
-            spec = RbVmomi::VIM.VirtualMachineCloneSpec :location => location, :powerOn => true, :template => false
-            
-            customization = get_customization_spec_info_by_name connection, machine
-            spec[:customization] = configure_networks(customization.spec, machine) unless customization.nil?
-            
-            env[:ui].info I18n.t('vsphere.creating_cloned_vm')
-            env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{config.template_name}"
-            env[:ui].info " -- Name: #{name}"
-
-            new_vm = template.CloneVM_Task(:folder => template.parent, :name => name, :spec => spec).wait_for_completion
-          rescue Exception => e
-            puts e.message
-            raise Errors::VSphereError, :message => e.message
-          end
-
-          #TODO: handle interrupted status in the environment, should the vm be destroyed?
-
-          machine.id = new_vm.config.uuid
-          
-          # wait for SSH to be available 
-          wait_for_ssh env
-          
-          env[:ui].info I18n.t('vsphere.vm_clone_success')          
-            
-          @app.call env
-        end
-        
-        private
-        
-        def configure_networks(spec, machine)
-          customization_spec = spec.clone
-          
-          # find all the configured private networks
-          private_networks = machine.config.vm.networks.find_all { |n| n[0].eql? :private_network }
-          return customization_spec if private_networks.nil?
-          
-          # make sure we have enough NIC settings to override with the private network settings
-          raise Error::VSphereError, :message => I18n.t('errors.too_many_private_networks') if private_networks.length > customization_spec.nicSettingMap.length
-          
-          # assign the private network IP to the NIC
-          private_networks.each_index do |idx|
-            customization_spec.nicSettingMap[idx].adapter.ip.ipAddress = private_networks[idx][1][:ip]  
-          end
-          
-          customization_spec
-        end
-        
-        def get_name(machine, config)
-          return config.name unless config.name.nil?
-          
-          prefix = "#{machine.name}"
-          prefix.gsub!(/[^-a-z0-9_]/i, "")
-          # milliseconds + random number suffix to allow for simultaneous `vagrant up` of the same box in different dirs
-          prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
-        end
-      end
-    end
-  end
-end
+require 'rbvmomi'
+require 'i18n'
+require 'vSphere/util/vim_helpers'
+require 'vSphere/util/machine_helpers'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class Clone
+        include Util::VimHelpers
+        include Util::MachineHelpers
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          machine = env[:machine]
+          config = machine.provider_config
+          connection = env[:vSphere_connection]
+          name = get_name machine, config
+          dc = get_datacenter connection, machine
+          template = dc.find_vm config.template_name
+
+          raise Error::VSphereError, :message => I18n.t('vsphere.errors.missing_template') if template.nil?
+
+          begin
+            location = get_location connection, machine, config
+            spec = RbVmomi::VIM.VirtualMachineCloneSpec :location => location, :powerOn => true, :template => false
+            customization_info = get_customization_spec_info_by_name connection, machine
+
+            spec[:customization] = get_customization_spec(machine, customization_info) unless customization_info.nil?
+
+            env[:ui].info I18n.t('vsphere.creating_cloned_vm')
+            env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{config.template_name}"
+            env[:ui].info " -- Name: #{name}"
+
+            new_vm = template.CloneVM_Task(:folder => template.parent, :name => name, :spec => spec).wait_for_completion
+          rescue Exception => e
+            puts e.message
+            raise Errors::VSphereError, :message => e.message
+          end
+
+          #TODO: handle interrupted status in the environment, should the vm be destroyed?
+
+          machine.id = new_vm.config.uuid
+
+          # wait for SSH to be available
+          wait_for_ssh env
+
+          env[:ui].info I18n.t('vsphere.vm_clone_success')
+
+          @app.call env
+        end
+
+        private
+
+        def get_customization_spec(machine, spec_info)
+          customization_spec = spec_info.spec.clone
+
+          # find all the configured private networks
+          private_networks = machine.config.vm.networks.find_all { |n| n[0].eql? :private_network }
+          return customization_spec if private_networks.nil?
+
+          # make sure we have enough NIC settings to override with the private network settings
+          raise Error::VSphereError, :message => I18n.t('vsphere.errors.too_many_private_networks') if private_networks.length > customization_spec.nicSettingMap.length
+
+          # assign the private network IP to the NIC
+          private_networks.each_index do |idx|
+            customization_spec.nicSettingMap[idx].adapter.ip.ipAddress = private_networks[idx][1][:ip]
+          end
+
+          customization_spec
+        end
+
+        def get_location(connection, machine, config)
+          if config.linked_clone
+            # The API for linked clones is quite strange. We can't create a linked
+            # straight from any VM. The disks of the VM for which we can create a
+            # linked clone need to be read-only and thus VC demands that the VM we
+            # are cloning from uses delta-disks. Only then it will allow us to
+            # share the base disk.
+            #
+            # Thus, this code first create a delta disk on top of the base disk for
+            # the to-be-cloned VM, if delta disks aren't used already.
+            disks = template.config.hardware.device.grep(RbVmomi::VIM::VirtualDisk)
+            disks.select { |disk| disk.backing.parent == nil }.each do |disk|
+              spec = {
+                  :deviceChange => [
+                      {
+                          :operation => :remove,
+                          :device => disk
+                      },
+                      {
+                          :operation => :add,
+                          :fileOperation => :create,
+                          :device => disk.dup.tap { |new_disk|
+                            new_disk.backing = new_disk.backing.dup
+                            new_disk.backing.fileName = "[#{disk.backing.datastore.name}]"
+                            new_disk.backing.parent = disk.backing
+                          },
+                      }
+                  ]
+              }
+              template.ReconfigVM_Task(:spec => spec).wait_for_completion
+            end
+
+            RbVmomi::VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
+          else
+            location = RbVmomi::VIM.VirtualMachineRelocateSpec
+            location[:pool] = get_resource_pool(connection, machine) unless config.clone_from_vm
+
+            datastore = get_datastore connection, machine
+            location[:datastore] = datastore unless datastore.nil?
+
+            location
+          end
+        end
+
+        def get_name(machine, config)
+          return config.name unless config.name.nil?
+
+          prefix = "#{machine.name}"
+          prefix.gsub!(/[^-a-z0-9_]/i, "")
+          # milliseconds + random number suffix to allow for simultaneous `vagrant up` of the same box in different dirs
+          prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+        end
+      end
+    end
+  end
+end