vagrant-vsphere 0.6.0 → 0.7.0

data/lib/vSphere/action/clone.rb

@@ -1,83 +1,127 @@
-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)
-          config = env[:machine].provider_config          
-          connection = env[:vSphere_connection]
-          machine = env[:machine]
-          
-          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
-            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?
-            
-            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: #{config.name}"
-
-            new_vm = template.CloneVM_Task(:folder => template.parent, :name => config.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
-      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('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

data/lib/vSphere/action/close_vsphere.rb

@@ -1,24 +1,24 @@
-require 'rbvmomi'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class CloseVSphere
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          begin
-            env[:vSphere_connection].close
-            @app.call env
-          rescue Exception => e
-            puts e
-            #raise a properly namespaced error for Vagrant
-            raise Errors::VSphereError, :message => e.message
-          end
-        end
-      end
-    end
-  end
+require 'rbvmomi'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class CloseVSphere
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          begin
+            env[:vSphere_connection].close
+            @app.call env
+          rescue Exception => e
+            puts e
+            #raise a properly namespaced error for Vagrant
+            raise Errors::VSphereError, :message => e.message
+          end
+        end
+      end
+    end
+  end
 end

data/lib/vSphere/action/connect_vsphere.rb

@@ -1,25 +1,25 @@
-require 'rbvmomi'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class ConnectVSphere
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          config = env[:machine].provider_config
-
-          begin
-            env[:vSphere_connection] = RbVmomi::VIM.connect host: config.host, user: config.user, password: config.password, insecure: config.insecure
-            @app.call env
-          rescue Exception => e
-            puts e.backtrace
-            raise VagrantPlugins::VSphere::Errors::VSphereError, :message => e.message
-          end
-        end
-      end
-    end
-  end
-end
+require 'rbvmomi'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class ConnectVSphere
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          config = env[:machine].provider_config
+
+          begin
+            env[:vSphere_connection] = RbVmomi::VIM.connect host: config.host, user: config.user, password: config.password, insecure: config.insecure
+            @app.call env
+          rescue Exception => e
+            puts e.backtrace
+            raise VagrantPlugins::VSphere::Errors::VSphereError, :message => e.message
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vSphere/action/destroy.rb

@@ -1,38 +1,38 @@
-require 'rbvmomi'
-require 'i18n'
-require 'vSphere/util/vim_helpers'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class Destroy
-        include Util::VimHelpers
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          destroy_vm env
-          env[:machine].id = nil
-
-          @app.call env
-        end
-
-        private 
-        
-        def destroy_vm(env)
-          vm = get_vm_by_uuid env[:vSphere_connection], env[:machine]
-          return if vm.nil?
-
-          begin
-            env[:ui].info I18n.t('vsphere.destroy_vm')
-            vm.Destroy_Task.wait_for_completion
-          rescue Exception => e
-            raise Errors::VSphereError, :message => e.message
-          end
-        end
-      end
-    end
-  end
+require 'rbvmomi'
+require 'i18n'
+require 'vSphere/util/vim_helpers'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class Destroy
+        include Util::VimHelpers
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          destroy_vm env
+          env[:machine].id = nil
+
+          @app.call env
+        end
+
+        private 
+        
+        def destroy_vm(env)
+          vm = get_vm_by_uuid env[:vSphere_connection], env[:machine]
+          return if vm.nil?
+
+          begin
+            env[:ui].info I18n.t('vsphere.destroy_vm')
+            vm.Destroy_Task.wait_for_completion
+          rescue Exception => e
+            raise Errors::VSphereError, :message => e.message
+          end
+        end
+      end
+    end
+  end
 end

data/lib/vSphere/action/get_ssh_info.rb

@@ -1,38 +1,38 @@
-require 'rbvmomi'
-require 'vSphere/util/vim_helpers'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class GetSshInfo
-        include Util::VimHelpers
-
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:machine_ssh_info] = get_ssh_info(env[:vSphere_connection], env[:machine])
-
-          @app.call env
-        end
-
-        private
-
-        def get_ssh_info(connection, machine)
-          return nil if machine.id.nil?
-
-          vm = get_vm_by_uuid connection, machine
-
-          return nil if vm.nil?
-
-          return {
-              :host => vm.guest.ipAddress,
-              :port => 22
-          }
-        end
-      end
-    end
-  end
+require 'rbvmomi'
+require 'vSphere/util/vim_helpers'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class GetSshInfo
+        include Util::VimHelpers
+
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:machine_ssh_info] = get_ssh_info(env[:vSphere_connection], env[:machine])
+
+          @app.call env
+        end
+
+        private
+
+        def get_ssh_info(connection, machine)
+          return nil if machine.id.nil?
+
+          vm = get_vm_by_uuid connection, machine
+
+          return nil if vm.nil?
+
+          return {
+              :host => vm.guest.ipAddress,
+              :port => 22
+          }
+        end
+      end
+    end
+  end
 end

data/lib/vSphere/action/get_state.rb

@@ -1,46 +1,46 @@
-require 'rbvmomi'
-require 'vSphere/util/vim_helpers'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class GetState
-        include Util::VimHelpers
-
-        # the three possible values of a vSphere VM's power state
-        POWERED_ON = 'poweredOn'
-        POWERED_OFF = 'poweredOff'
-        SUSPENDED = 'suspended'
-
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:machine_state_id] = get_state(env[:vSphere_connection], env[:machine])
-
-          @app.call env
-        end
-
-        private
-
-        def get_state(connection, machine)
-          return :not_created  if machine.id.nil?
-
-          vm = get_vm_by_uuid connection, machine
-
-          if vm.nil?
-            return :not_created
-          end
-
-          if vm.runtime.powerState.eql?(POWERED_ON)
-            :running
-          else
-            # If the VM is powered off or suspended, we consider it to be powered off. A power on command will either turn on or resume the VM
-            :poweroff
-          end
-        end
-      end
-    end
-  end
+require 'rbvmomi'
+require 'vSphere/util/vim_helpers'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class GetState
+        include Util::VimHelpers
+
+        # the three possible values of a vSphere VM's power state
+        POWERED_ON = 'poweredOn'
+        POWERED_OFF = 'poweredOff'
+        SUSPENDED = 'suspended'
+
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:machine_state_id] = get_state(env[:vSphere_connection], env[:machine])
+
+          @app.call env
+        end
+
+        private
+
+        def get_state(connection, machine)
+          return :not_created  if machine.id.nil?
+
+          vm = get_vm_by_uuid connection, machine
+
+          if vm.nil?
+            return :not_created
+          end
+
+          if vm.runtime.powerState.eql?(POWERED_ON)
+            :running
+          else
+            # If the VM is powered off or suspended, we consider it to be powered off. A power on command will either turn on or resume the VM
+            :poweroff
+          end
+        end
+      end
+    end
+  end
 end

data/lib/vSphere/action/is_created.rb

@@ -1,16 +1,16 @@
-module VagrantPlugins
-  module VSphere
-    module Action
-      class IsCreated
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:result] = env[:machine].state.id != :not_created
-          @app.call env
-        end
-      end
-    end
-  end
+module VagrantPlugins
+  module VSphere
+    module Action
+      class IsCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = env[:machine].state.id != :not_created
+          @app.call env
+        end
+      end
+    end
+  end
 end

data/lib/vSphere/action/is_running.rb

@@ -1,20 +1,20 @@
-require 'vSphere/util/machine_helpers'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class IsRunning
-        include Util::MachineHelpers
-        
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:result] = env[:machine].state.id == :running
-          @app.call env
-        end
-      end
-    end
-  end
-end
+require 'vSphere/util/machine_helpers'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class IsRunning
+        include Util::MachineHelpers
+        
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:result] = env[:machine].state.id == :running
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vSphere/action/message_already_created.rb

@@ -1,18 +1,18 @@
-require 'i18n'
-
-module VagrantPlugins
-  module VSphere
-    module Action
-      class MessageAlreadyCreated
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          env[:ui].info I18n.t('vsphere.vm_already_created')
-          @app.call(env)
-        end
-      end
-    end
-  end
+require 'i18n'
+
+module VagrantPlugins
+  module VSphere
+    module Action
+      class MessageAlreadyCreated
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('vsphere.vm_already_created')
+          @app.call(env)
+        end
+      end
+    end
+  end
 end