vagrant-vcenter 0.3.2 → 0.3.3

data/lib/vagrant-vcenter/action/connect_vcenter.rb

@@ -1,6 +1,3 @@
-require 'rbvmomi'
-require 'log4r'
-
 module VagrantPlugins
   module VCenter
     module Action
@@ -9,25 +6,29 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new(
-                      'vagrant_vcenter::action::connect_vCenter')
+            'vagrant_vcenter::action::connect_vcenter'
+          )
         end
 
         def call(env)
-          config = env[:machine].provider_config
+          cfg = env[:machine].provider_config
+
           # Avoid recreating a new session each time.
-          unless config.vcenter_cnx
+          unless cfg.vcenter_cnx
             @logger.info('Connecting to vCenter...')
 
-            @logger.debug("config.hostname: #{config.hostname}")
-            @logger.debug("config.username: #{config.username}")
-            @logger.debug('config.password: <hidden>')
+            @logger.debug("hostname: #{cfg.hostname}")
+            @logger.debug("username: #{cfg.username}")
+            @logger.debug('password: <hidden>')
 
             # FIXME: fix the insecure flag, catch the exception
-            config.vcenter_cnx = RbVmomi::VIM.connect(
-                                  host: config.hostname,
-                                  user: config.username,
-                                  password: config.password,
-                                  insecure: true)
+            cfg.vcenter_cnx = RbVmomi::VIM.connect(
+              host: cfg.hostname,
+              user: cfg.username,
+              password: cfg.password,
+              insecure: true
+            )
+
           end
           @app.call env
         end

data/lib/vagrant-vcenter/action/destroy.rb

@@ -1,5 +1,3 @@
-require 'i18n'
-
 module VagrantPlugins
   module VCenter
     module Action
@@ -11,12 +9,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          config = env[:machine].provider_config
-          # FIXME: Raise a correct exception
-          dc = config.vcenter_cnx.serviceInstance.find_datacenter(
-               config.datacenter_name) or abort 'datacenter not found'
-          root_vm_folder = dc.vmFolder
-          vm = root_vm_folder.findByUuid(env[:machine].id)
+          cfg = env[:machine].provider_config
+
+          vm = cfg.vmfolder.findByUuid(env[:machine].id) or
+               fail Errors::VMNotFound,
+                    :vm_name => env[:machine].name
 
           # Poweron VM
           env[:ui].info('Destroying VM...')

data/lib/vagrant-vcenter/action/disconnect_vcenter.rb

@@ -6,18 +6,19 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new(
-                    'vagrant_vcenter::action::disconnect_vcenter')
+            'vagrant_vcenter::action::disconnect_vcenter'
+          )
         end
 
         def call(env)
           @logger.info('Disconnecting from vCenter ...')
 
-          config = env[:machine].provider_config
+          cfg = env[:machine].provider_config
 
-          if !config.vcenter_cnx
-            @logger.info('Session not open, impossible to disconnect')
+          if !cfg.vcenter_cnx
+            @logger.info('No session active')
           else
-            config.vcenter_cnx.close
+            cfg.vcenter_cnx.close
             @logger.info('Succesfully disconnected from vCenter...')
           end
 

data/lib/vagrant-vcenter/action/inventory_check.rb

@@ -14,7 +14,8 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new(
-                    'vagrant_vcenter::action::inventory_check')
+            'vagrant_vcenter::action::inventory_check'
+          )
         end
 
         def call(env)
@@ -23,106 +24,110 @@ module VagrantPlugins
         end
 
         def vcenter_upload_box(env)
-          config = env[:machine].provider_config
-
-          box_dir = env[:machine].box.directory.to_s
+          cfg = env[:machine].provider_config
 
-          if env[:machine].box.name.to_s.include? '/'
-            box_file = env[:machine].box.name.rpartition('/').last.to_s
-            box_name = env[:machine].box.name.to_s.gsub(/\//, '-')
+          if env[:machine].box.name.include? '/'
+            box_file = env[:machine].box.name.rpartition('/').last
+            box_name = env[:machine].box.name.gsub(/\//, '-')
           else
-            box_file = env[:machine].box.name.to_s
+            box_file = env[:machine].box.name
             box_name = box_file
           end
 
-          box_ovf = "file://#{box_dir}/#{box_file}.ovf"
-
-          @logger.debug("OVF File: #{box_ovf}")
-
-          env[:ui].info("Adding [#{box_name}]")
-
-          # FIXME: Raise a correct exception
-          dc = config.vcenter_cnx.serviceInstance.find_datacenter(
-               config.datacenter_name) or fail 'datacenter not found'
-
-          root_vm_folder = dc.vmFolder
-          vm_folder = root_vm_folder
-          if config.template_folder_name.nil?
-            template_folder = root_vm_folder
+          if cfg.template_folder_name.nil?
+            box_to_search = box_name
+            cfg.template_folder = cfg.vmfolder
           else
-            template_folder = root_vm_folder.traverse!(
-                              config.template_folder_name, RbVmomi::VIM::Folder)
+            box_to_search = cfg.template_folder_name + '/' + box_name
+            cfg.template_folder = cfg.vmfolder.traverse!(
+              cfg.template_folder_name,
+              RbVmomi::VIM::Folder
+            )
           end
 
-          template_name = box_name
+          @logger.debug("Checking for box: #{box_to_search}...")
 
-          # FIXME: Raise a correct exception
-          datastore = dc.find_datastore(
-                      config.datastore_name) or fail 'datastore not found'
-          # FIXME: Raise a correct exception
-          computer = dc.find_compute_resource(
-                      config.computer_name) or fail 'Host not found'
+          # Check for the template object and add it the provider config
+          cfg.template = cfg.datacenter.find_vm(box_to_search)
 
-          network = computer.network.find { |x| x.name == config.network_name }
+          if cfg.template.nil?
+            # Roll a dice to get a winner in the race.
+            sleep_time = rand * (3 - 1) + 1
+            @logger.debug("Sleeping #{sleep_time} to avoid race conditions.")
+            sleep(sleep_time)
 
-          deployer = CachedOvfDeployer.new(
-            config.vcenter_cnx,
-            network,
-            computer,
-            template_folder,
-            vm_folder,
-            datastore
-          )
+            box_dir = env[:machine].box.directory
+            box_ovf = "file://#{box_dir}/#{box_file}.ovf"
 
-          deployer_opts = {
-            :run_without_interruptions => true,
-            :simple_vm_name => true
-          }
+            env[:ui].info("Uploading [#{box_name}]...")
+            @logger.debug("OVF File: #{box_ovf}")
+
+            deployer = CachedOvfDeployer.new(
+              cfg.vcenter_cnx,
+              cfg.network,
+              cfg.compute,
+              cfg.template_folder,
+              cfg.vmfolder,
+              cfg.datastore
+            )
+
+            deployer_opts = {
+              :run_without_interruptions  => true,
+              :simple_vm_name             => true
+            }
+
+            deployer.upload_ovf_as_template(
+              box_ovf,
+              box_name,
+              deployer_opts
+            )
+
+            # Re Fetch the template object and add it the provider config
+            cfg.template = cfg.datacenter.find_vm(box_to_search)
+          else
+            @logger.debug('Box already exists at target endpoint')
+          end
 
-          deployer.upload_ovf_as_template(
-                                          box_ovf,
-                                          template_name,
-                                          deployer_opts)
           # FIXME: Progressbar??
         end
 
         def vcenter_check_inventory(env)
           # Will check each mandatory config value against the vcenter
           # Instance and will setup the global environment config values
-          config = env[:machine].provider_config
-          # FIXME: Raise a correct exception
-          dc = config.vcenter_cnx.serviceInstance.find_datacenter(
-               config.datacenter_name) or fail 'datacenter not found'
-
-          if env[:machine].box.name.to_s.include? '/'
-            box_file = env[:machine].box.name.rpartition('/').last.to_s
-            box_name = env[:machine].box.name.to_s.gsub(/\//, '-')
-          else
-            box_file = env[:machine].box.name.to_s
-            box_name = box_file
-          end
-
-          if config.template_folder_name.nil?
-            box_to_search = box_name
-          else
-            box_to_search = config.template_folder_name + '/' + box_name
-          end
-
-          @logger.debug("This is the box we're looking for: #{box_to_search}")
-
-          config.template_id = dc.find_vm(box_to_search)
 
-          if config.template_id.nil?
-            # Roll a dice to get a winner in the race.
-            sleep_time = rand * (3 - 1) + 1
-            @logger.debug("Sleeping #{sleep_time} to avoid race conditions.")
-            sleep(sleep_time)
-
-            env[:ui].info("Uploading [#{box_name}]...")
-            vcenter_upload_box(env)
-          else
-            @logger.debug("Template found at #{box_to_search}")
-          end
+          cfg = env[:machine].provider_config
+          cnx = cfg.vcenter_cnx
+
+          # Fetch Datacenter handle and add it to provider config
+          cfg.datacenter = cnx.serviceInstance.find_datacenter(
+            cfg.datacenter_name
+          ) or fail Errors::DatacenterNotFound,
+                    :datacenter_name => cfg.datacenter_name
+
+          # Fetch vmFolder handle for the specific Datacenter and add it to
+          # provider config
+          cfg.vmfolder = cfg.datacenter.vmFolder
+
+          # Fetch compute resource handle and add it to the provider config
+          cfg.compute = cfg.datacenter.find_compute_resource(
+            cfg.compute_name
+          ) or fail Errors::ComputeNotFound,
+                    :compute_name => cfg.compute_name
+
+          # Fetch datastore handle and add it to the provider config
+          cfg.datastore = cfg.datacenter.find_datastore(
+            cfg.datastore_name
+          ) or fail Errors::DatastoreNotFound,
+                    :datastore_name => cfg.datastore_name
+
+          # Fetch network portgroup handle and add it to the provider config
+          cfg.network = cfg.compute.network.find {
+            |x| x.name == cfg.network_name
+          } or fail Errors::NetworkNotFound,
+                    :network_name => cfg.network_name
+
+          # Use this method to take care of the template/boxes
+          vcenter_upload_box(env)
         end
       end
     end

data/lib/vagrant-vcenter/action/is_created.rb

@@ -1,3 +1,4 @@
+
 module VagrantPlugins
   module VCenter
     module Action
@@ -10,33 +11,10 @@ module VagrantPlugins
 
         def call(env)
           vm_id = env[:machine].id
-          if vm_id
-
-            # VM is in the vagrant registry, now we need to check if it's
-            # actually in vcenter
-
-            # FIXME: this part needs some cleanup
-            config = env[:machine].provider_config
-
-            # FIXME: Raise a correct exception
-            dc = config.vcenter_cnx.serviceInstance.find_datacenter(
-                 config.datacenter_name) or abort 'datacenter not found'
 
-            root_vm_folder = dc.vmFolder
-
-            vm = root_vm_folder.findByUuid(env[:machine].id)
-
-            unless vm
-              @logger.info('VM is in the vagrant registry but not in vcenter')
-              # Clear the ID
-              env[:machine].id = nil
-              env[:result] = false
-            end
-
-            # VM is in the registry AND in vcenter
+          if vm_id
             @logger.info("VM has been created and ID is: [#{vm_id}]")
             env[:result] = true
-
           else
             # VM is not in the registry
             @logger.warn('VM has not been created')

data/lib/vagrant-vcenter/action/is_paused.rb

@@ -1,5 +1,3 @@
-require 'i18n'
-
 module VagrantPlugins
   module VCenter
     module Action

data/lib/vagrant-vcenter/action/message_cannot_suspend.rb

@@ -9,8 +9,9 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info(I18n.t(
-                        'vagrant_vcenter.power.vm_halted_cannot_suspend'))
+          env[:ui].info(
+            I18n.t('vagrant_vcenter.power.vm_halted_cannot_suspend')
+          )
           @app.call(env)
         end
       end

data/lib/vagrant-vcenter/action/message_will_not_destroy.rb

@@ -8,8 +8,12 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info(I18n.t('vagrant_vcenter.power.will_not_destroy',
-                               name: env[:machine].name))
+          env[:ui].info(
+            I18n.t(
+              'vagrant_vcenter.power.will_not_destroy',
+              name: env[:machine].name
+            )
+          )
           @app.call(env)
         end
       end

data/lib/vagrant-vcenter/action/power_off.rb

@@ -1,5 +1,3 @@
-require 'i18n'
-
 module VagrantPlugins
   module VCenter
     module Action
@@ -11,12 +9,11 @@ module VagrantPlugins
         end
 
         def call(env)
-          config = env[:machine].provider_config
-          # FIXME: Raise a correct exception
-          dc = config.vcenter_cnx.serviceInstance.find_datacenter(
-               config.datacenter_name) or abort 'datacenter not found'
-          root_vm_folder = dc.vmFolder
-          vm = root_vm_folder.findByUuid(env[:machine].id)
+          cfg = env[:machine].provider_config
+
+          vm = cfg.vmfolder.findByUuid(env[:machine].id) or
+               fail Errors::VMNotFound,
+                    :vm_name => env[:machine].name
 
           # Poweroff VM
           env[:ui].info('Powering off VM...')

data/lib/vagrant-vcenter/action/power_on.rb

@@ -1,5 +1,3 @@
-require 'i18n'
-
 module VagrantPlugins
   module VCenter
     module Action
@@ -11,17 +9,17 @@ module VagrantPlugins
         end
 
         def call(env)
-          config = env[:machine].provider_config
-          # FIXME: Raise a correct exception
-          dc = config.vcenter_cnx.serviceInstance.find_datacenter(
-               config.datacenter_name) or abort 'datacenter not found'
-          root_vm_folder = dc.vmFolder
-          vm = root_vm_folder.findByUuid(env[:machine].id)
+          cfg = env[:machine].provider_config
+
+          vm = cfg.vmfolder.findByUuid(env[:machine].id) or
+               fail Errors::VMNotFound,
+                    :vm_name => env[:machine].name
 
           # Poweron VM
           env[:ui].info('Powering on VM...')
           vm.PowerOnVM_Task.wait_for_completion
           sleep(20) until env[:machine].communicate.ready?
+
           @app.call env
         end
       end

data/lib/vagrant-vcenter/action/prepare_nfs_settings.rb

@@ -1,5 +1,3 @@
-require 'socket'
-
 module VagrantPlugins
   module VCenter
     module Action
@@ -12,11 +10,19 @@ module VagrantPlugins
         end
 
         def call(env)
-          host_ip = Socket.ip_address_list.find { |ai| ai.ipv4? && !ai.ipv4_loopback? }.ip_address
+          if env[:machine].state.id != :running
+            fail Errors::MachineNotRunning,
+                 :machine_name => env[:machine].name
+          end
+
+          host_ip = Socket.ip_address_list.find {
+            |ai| ai.ipv4? && !ai.ipv4_loopback?
+          }.ip_address
 
           @logger.debug("Setting host_ip to #{host_ip}")
 
-          env[:nfs_host_ip]    = host_ip
+          env[:nfs_host_ip] = host_ip
+
           @app.call env
         end
       end