vagrant-vcenter 0.3.2 → 0.3.3

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

@@ -20,12 +20,11 @@ module VagrantPlugins
         def read_ssh_info(env)
           return nil if env[:machine].id.nil?
 
-          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
 
           address = vm.guest.ipAddress
           if not address or address == ''

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

@@ -1,5 +1,3 @@
-require 'log4r'
-
 module VagrantPlugins
   module VCenter
     module Action
@@ -21,21 +19,20 @@ module VagrantPlugins
             return :not_created
           end
 
-          # 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
+          cfg = env[:machine].provider_config
 
-          vm = root_vm_folder.findByUuid(env[:machine].id)
+          vm = cfg.vmfolder.findByUuid(env[:machine].id) or
+               fail Errors::VMNotFound,
+                    :vm_name => env[:machine].name
 
           # @logger.debug("Current power state: #{vm.runtime.powerState}")
           vm_name = env[:machine].name
 
-          if vm.runtime.powerState == 'poweredOff'
+          if vm.nil?
+            # If the VM has been cloned/moved, the findByUuid call returns nil
+            @logger.info("VM [#{vm_name}] state is unknown")
+            return :unknown
+          elsif vm.runtime.powerState == 'poweredOff'
             @logger.info("VM [#{vm_name}] is stopped")
             return :stopped
           elsif vm.runtime.powerState == 'poweredOn'

data/lib/vagrant-vcenter/action/resume.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 on VM...')

data/lib/vagrant-vcenter/action/suspend.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('Suspending VM...')

data/lib/vagrant-vcenter/config.rb

@@ -51,7 +51,7 @@ module VagrantPlugins
       # Virtual Data Center to be used
       #
       # @return [String]
-      attr_accessor :computer_name
+      attr_accessor :compute_name
 
       # Virtual Data Center Network to be used
       #
@@ -105,11 +105,37 @@ module VagrantPlugins
       attr_accessor :memory
 
       ##
-      ## vCenter  config runtime values
+      ## vCenter config runtime values
       ##
 
       # connection handle
       attr_accessor :vcenter_cnx
+
+      # Datacenter object
+      attr_accessor :datacenter
+
+      # Compute object
+      attr_accessor :compute
+
+      # Compute resource pool object
+      attr_accessor :compute_rp
+
+      # Datastore object
+      attr_accessor :datastore
+
+      # Network (dv)portgroup object
+      attr_accessor :network
+
+      # VM Folder object
+      attr_accessor :vmfolder
+
+      # Template object
+      attr_accessor :template
+
+      # Template folder object
+      attr_accessor :template_folder
+
+      # Template ID, not sure if used ... verify
       attr_accessor :template_id
 
       def initialize
@@ -122,22 +148,22 @@ module VagrantPlugins
 
         # TODO: add blank?
         errors <<
-        I18n.t('vagrant_vcenter.config.hostname') if hostname.nil?
+          I18n.t('vagrant_vcenter.config.hostname') if hostname.nil?
         errors <<
-        I18n.t('vagrant_vcenter.config.username') if username.nil?
+          I18n.t('vagrant_vcenter.config.username') if username.nil?
         errors <<
-        I18n.t('vagrant_vcenter.config.password') if password.nil?
+          I18n.t('vagrant_vcenter.config.password') if password.nil?
         errors <<
-        I18n.t('vagrant_vcenter.config.datastore_name') if datastore_name.nil?
+          I18n.t('vagrant_vcenter.config.datastore_name') if datastore_name.nil?
         errors <<
-        I18n.t('vagrant_vcenter.config.datacenter_name') if datacenter_name.nil?
+          I18n.t('vagrant_vcenter.config.datacenter_name') if datacenter_name.nil?
         errors <<
-        I18n.t('vagrant_vcenter.config.computer_name') if computer_name.nil?
+          I18n.t('vagrant_vcenter.config.compute_name') if compute_name.nil?
         errors <<
-        I18n.t('vagrant_vcenter.config.network_name') if network_name.nil?
+          I18n.t('vagrant_vcenter.config.network_name') if network_name.nil?
         if enable_vm_customization
           errors <<
-          I18n.t('vagrant_vcenter.config.no_prep_type') if prep_type.downcase != 'linux' && prep_type.downcase != 'windows'
+            I18n.t('vagrant_vcenter.config.no_prep_type') if prep_type.downcase != 'linux' && prep_type.downcase != 'windows'
         end
         { 'vCenter Provider' => errors }
       end

data/lib/vagrant-vcenter/errors.rb

@@ -83,6 +83,34 @@ module VagrantPlugins
       class SyncError < VCenterError
         error_key(:sync_error)
       end
+      # Set key for DatacenterNotFound errors.
+      class DatacenterNotFound < VCenterError
+        error_key(:datacenter_not_found)
+      end
+      # Set key for ComputeNotFound errors.
+      class ComputeNotFound < VCenterError
+        error_key(:compute_not_found)
+      end
+      # Set key for DatastoreNotFound errors.
+      class DatastoreNotFound < VCenterError
+        error_key(:datastore_not_found)
+      end
+      # Set key for NetworkNotFound errors.
+      class NetworkNotFound < VCenterError
+        error_key(:network_not_found)
+      end
+      # Set key for MachineNotRunning errors.
+      class MachineNotRunning < VCenterError
+        error_key(:machine_not_running)
+      end
+      # Set key for VMNotFound errors.
+      class VMNotFound < VCenterError
+        error_key(:vm_not_found)
+      end
+      # Set key for GuestCustomNotSupported
+      class GuestCustomNotSupported < VCenterError
+        error_key(:guest_custom_not_supported)
+      end
     end
   end
 end

data/lib/vagrant-vcenter/plugin.rb

@@ -48,8 +48,10 @@ module VagrantPlugins
       end
 
       def self.setup_i18n
-        I18n.load_path << File.expand_path('locales/en.yml',
-                                           VCenter.source_root)
+        I18n.load_path << File.expand_path(
+          'locales/en.yml',
+          VCenter.source_root
+        )
         I18n.reload!
       end
 

data/lib/vagrant-vcenter/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Set version for vagrant-vcenter gem.
   module VCenter
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

data/locales/en.yml

@@ -1,4 +1,4 @@
-en: 
+en:
   vagrant_vcenter:
     power:
       vm_not_created: |-
@@ -9,7 +9,7 @@ en:
         VM is already running
       vm_halted_cannot_suspend: |-
         VM is not running or already suspended, cannot suspend it.
-    config: 
+    config:
       hostname: |-
         Configuration must specify a vCenter hostname
       username: |-
@@ -20,7 +20,7 @@ en:
         Configuration must specify a Datastore (for the VM templates images)
       datacenter_name: |-
         Configuration must specify a vCenter Datacenter
-      computer_name: |-
+      compute_name: |-
         Configuration must specify a compute resource name
       network_name: |-
         Configuration must specify a resource pool name
@@ -34,7 +34,7 @@ en:
         Configuration must specify a gateway
       netmask: |-
         Configuration must specify a netmask
-    states: 
+    states:
       not_created: |-
         The environment has not yet been created. Run `vagrant up` to
         create the environment. If a machine is not created, only the
@@ -50,3 +50,31 @@ en:
         shut it down forcefully, or you can run `vagrant suspend` to simply
         suspend the virtual machine. In either case, to restart it again,
         simply run `vagrant up`.
+      unknown: |-
+        The VM state cannot be retrieved from vCenter. Please contact your
+        vCenter administrator for more informations.
+    errors:
+      datacenter_not_found: |-
+        The Datacenter '%{datacenter_name}' was not found in this environment.
+        Verify that your Vagrantfile settings are correct.
+      compute_not_found: |-
+        The Cluster or Host '%{compute_name}' was not found in this environment.
+        Verify that your Vagrantfile settings are correct.
+      datastore_not_found: |-
+        The Datastore %{datastore_name} was not found in this environment.
+        Verify that your Vagrantfile settings are correct.
+      network_not_found: |-
+        The Network %{network_name} was not found in this environment.
+        Verify that your Vagrantfile settings are correct.
+      machine_not_running: |-
+        The Machine %{machine_name} is not currently running...
+        To start the VM you can simply run `vagrant up %{machine_name}`
+      vm_not_found: |-
+        The Virtual Machine %{vm_name} was not found in this environment.
+        This should not happen, please log an issue on Github
+      guest_custom_not_supported: |-
+        The Guest Customization process for %{type} is not supported.
+
+
+
+

data/vagrant-vcenter.gemspec

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'vagrant-vcenter/version'
 
@@ -7,19 +8,20 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = 'Fabio Rapposelli'
   s.email = 'fabio@gosddc.com'
-  s.homepage = 'https://github.com/gosddc/vagrant-vcenter'
+  s.homepage = 'https://github.com/frapposelli/vagrant-vcenter'
   s.license = 'MIT'
   s.summary = 'VMware vCenter® Vagrant provider'
   s.description = 'Enables Vagrant to manage machines with VMware vCenter®.'
 
   s.add_runtime_dependency 'vagrant-rbvmomi', '~> 1.8.1'
   s.add_runtime_dependency 'log4r', '~> 1.1.10'
-  s.add_runtime_dependency 'pry'
 
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec-core', '~> 2.12.2'
   s.add_development_dependency 'rspec-expectations', '~> 2.12.1'
   s.add_development_dependency 'rspec-mocks', '~> 2.12.1'
+  s.add_development_dependency 'rubocop'
 
   s.files = `git ls-files`.split($RS)
   s.executables = s.files.grep(/^bin/) { |f| File.basename(f) }

metadata

@@ -1,121 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vcenter
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Fabio Rapposelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.10
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables Vagrant to manage machines with VMware vCenter®.
 email: fabio@gosddc.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md
@@ -153,7 +168,7 @@ files:
 - lib/vagrant-vcenter/version.rb
 - locales/en.yml
 - vagrant-vcenter.gemspec
-homepage: https://github.com/gosddc/vagrant-vcenter
+homepage: https://github.com/frapposelli/vagrant-vcenter
 licenses:
 - MIT
 metadata: {}
@@ -163,19 +178,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: VMware vCenter® Vagrant provider
 test_files: []
-has_rdoc: