vagrant-vsphere 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86bbc3afad22bc9be46d1ea266be3eb020251f29
-  data.tar.gz: 576d495fee241d31b5954b1bb55886bc7438b7e4
+  metadata.gz: b063bf190dceeafef58aa04ce867ebc9667d5c0b
+  data.tar.gz: f43cc9c9d34d8a988166bd06aed7973fea7ea70c
 SHA512:
-  metadata.gz: 8f62c938f26de6ef905bf1d97899ff095630c4c165bd328ec8c9d6f2d7a1dafad4ace951cca5b4fd23c173936b89d23c9e285917b9f5d44593704395b95d48fc
-  data.tar.gz: f0a47dd6662ea81107f5a64761b5416933310739613dd19140de3416d37524f19c27c74a9b0b959dfee5ea1264ab11d54c854fc416763acd48e6f65f8f1e475d
+  metadata.gz: b947f9e482a26aebc7a723427aea0f2bb675738b4ea82114f92ac892026560dbe4e473d6d8de79d946a1a518e5d7953ca47f251d6b0c0f079080089dc2937db7
+  data.tar.gz: fb835079c46f46143fdb719eeca089b5fe09dcd7255c442238081a1b0e293db2e08842a1839730554a8ba57c17cecf82aa026f5fcdaf49f80a29f6d298971710

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.16.0
+current_version = 0.17.0
 tag = true
 commit = true
 

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.0.0
+before_install:
+  - rvm @global do gem uninstall bundler --all --executables
+  - gem uninstall bundler --all --executables
+  - gem install bundler --version '< 1.7.0'

data/Gemfile

@@ -11,3 +11,7 @@ ruby "2.0.0"
 gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.3'
 
 end
+
+group :plugins do
+  gem 'vagrant-vsphere', path: '.'
+end

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/nsidc/vagrant-vsphere.svg?branch=master)](https://travis-ci.org/nsidc/vagrant-vsphere)
+
 # Vagrant vSphere Provider
 
 This is a [Vagrant](http://www.vagrantup.com) 1.6.3+ plugin that adds a [vSphere](http://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc_50%2Fright-pane.html)
@@ -12,9 +14,9 @@ This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 0.16.0**
+**version: 0.17.0**
 
-vagrant-vsphere (**version: 0.16.0**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
+vagrant-vsphere (**version: 0.17.0**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
 
@@ -87,7 +89,9 @@ This provider has the following settings, all are required unless noted:
 * `host` -  IP or name for the vSphere API
 * `insecure` - _Optional_ verify SSL certificate from the host
 * `user` - user name for connecting to vSphere
-* `password` - password  for connecting to vSphere
+* `password` - password for connecting to vSphere. If no value is given, or the
+  value is set to `:ask`, the user will be prompted to enter the password on
+  each invocation.
 * `data_center_name` - _Optional_ datacenter containing the computed resource, the template and where the new VM will be created, if not specified the first datacenter found will be used
 * `compute_resource_name` - _Required if cloning from template_ the name of the host containing the resource pool for the new VM
 * `resource_pool_name` - the resource pool for the new VM. If not supplied, and cloning from a template, uses the root resource pool
@@ -102,6 +106,7 @@ This provider has the following settings, all are required unless noted:
 * `proxy_port` - _Optional_ proxy port number for connecting to vSphere via proxy
 * `vlan` - _Optional_ vlan to connect the first NIC to
 * `memory_mb` - _Optional_ Configure the amount of memory (in MB) for the new VM
+* `cpu_count` - _Optional_ Configure the number of CPUs for the new VM
 
 ### Cloning from a VM rather than a template
 
@@ -194,7 +199,17 @@ This is useful if running Vagrant from multiple directories or if multiple machi
   * If the VM is powered off, it is just destroyed.
   * If the VM is suspended, it is powered on, then powered off, then destroyed.
 * 0.16.0 Add ability to configure amount of memory the new cloned VM will have [#94 rylarson:add-memory-configuration](https://github.com/nsidc/vagrant-vsphere/pull/94).
-
+* 0.17.0
+  * Add ability to configure the CPU Count
+    [#96 rylarson:add-cpu-configuration](https://github.com/nsidc/vagrant-vsphere/pull/96).
+  * Prompt the user to enter a password if none is given, or the configuration
+    value is set to `:ask`
+    [#97 topmedia:password-prompt](https://github.com/nsidc/vagrant-vsphere/pull/97).
+  * Add support for `vagrant reload`
+    [#105 clintoncwolfe:add-reload-action](https://github.com/nsidc/vagrant-vsphere/pull/105).
+  * Fix compatibility with Vagrant 1.7 to use vSphere connection info from a base
+    box
+    [#111 mkuzmin:get-state](https://github.com/nsidc/vagrant-vsphere/pull/111).
 
 ## Versioning
 
@@ -216,7 +231,33 @@ If you want a quick merge, write a spec that fails before your changes are appli
 
 If you don't have rake installed, first install [bundler](http://bundler.io/) and run `bundle install`.
 
+### Development Without Building the Plugin
+
+To test your changes when developing the plugin, you have two main
+options. First, you can build and install the plugin from source every time you
+make a change:
+
+1. Make changes
+2. `rake build`
+3. `vagrant plugin install ./pkg/vagrant-vsphere-$VERSION.gem`
+4. `vagrant up --provider=vsphere`
+
+Second, you can use Bundler and the Vagrant gem to execute vagrant commands,
+saving time as you never have to wait for the plugin to build and install:
+
+1. Make changes
+2. `bundle exec vagrant up --provider=vsphere`
+
+This method uses the version of Vagrant specified in
+[`Gemfile`](https://github.com/nsidc/vagrant-vsphere/blob/master/Gemfile). It
+will also cause Bundler and Vagrant to output warnings every time you run
+`bundle exec vagrant`, because `Gemfile` lists **vagrant-vsphere** twice (once
+with `gemspec` and another time in the `group :plugins` block), and Vagrant
+prefers to be run from the official installer rather than through the gem.
 
+Despite those warning messages, this is the
+[officially recommended](https://docs.vagrantup.com/v2/plugins/development-basics.html)
+method for Vagrant plugin development.
 
 ## License
 

data/lib/vSphere/action.rb

@@ -133,9 +133,24 @@ module VagrantPlugins
         end
       end
 
+      def self.action_reload
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConnectVSphere
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              b2.use MessageNotCreated
+              next
+            end
+            b2.use action_halt
+            b2.use action_up
+          end
+        end
+      end
+
       #vSphere specific actions
       def self.action_get_state
         Vagrant::Action::Builder.new.tap do |b|
+          b.use HandleBox
           b.use ConfigValidate
           b.use ConnectVSphere
           b.use GetState

data/lib/vSphere/action/clone.rb

@@ -34,6 +34,7 @@ module VagrantPlugins
             spec[:customization] = get_customization_spec(machine, customization_info) unless customization_info.nil?
             add_custom_vlan(template, dc, spec, config.vlan) unless config.vlan.nil?
             add_custom_memory(spec, config.memory_mb) unless config.memory_mb.nil?
+            add_custom_cpu(spec, config.cpu_count) unless config.cpu_count.nil?
 
             env[:ui].info I18n.t('vsphere.creating_cloned_vm')
             env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{template.pretty_path}"
@@ -157,6 +158,10 @@ module VagrantPlugins
         def add_custom_memory(spec, memory_mb)
           spec[:config][:memoryMB] = Integer(memory_mb)
         end
+
+        def add_custom_cpu(spec, cpu_count)
+          spec[:config][:numCPUs] = Integer(cpu_count)
+        end
       end
     end
   end

data/lib/vSphere/action/message_not_created.rb

@@ -3,7 +3,7 @@ require 'i18n'
 module VagrantPlugins
   module VSphere
     module Action
-      class MessageAlreadyCreated
+      class MessageNotCreated
         def initialize(app, env)
           @app = app
         end
@@ -15,4 +15,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vSphere/config.rb

@@ -21,10 +21,15 @@ module VagrantPlugins
       attr_accessor :proxy_port
       attr_accessor :vlan
       attr_accessor :memory_mb
+      attr_accessor :cpu_count
 
       def validate(machine)
         errors = _detected_errors
 
+        if password == :ask || password.nil?
+          self.password = machine.ui.ask("vSphere Password (will be hidden): ", echo: false)
+        end
+
         # TODO: add blank?
         errors << I18n.t('vsphere.config.host') if host.nil?
         errors <<  I18n.t('vsphere.config.user') if user.nil?

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.16.0'
+    VERSION = '0.17.0'
   end
 end

data/spec/action_spec.rb

@@ -5,7 +5,7 @@ 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
@@ -71,7 +71,7 @@ describe VagrantPlugins::VSphere::Action do
   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
@@ -94,6 +94,12 @@ describe VagrantPlugins::VSphere::Action do
 
       run_get_state
     end
+
+    it 'should handle the values in a base vagrant box' do
+      Vagrant::Action::Builtin::HandleBox.any_instance.should_receive(:call)
+
+      run_get_state
+    end
   end
 
   describe 'get ssh info' do
@@ -113,4 +119,38 @@ describe VagrantPlugins::VSphere::Action do
       run_get_ssh_info
     end
   end
+
+  describe 'reload' do
+    after :each do
+      run :reload
+    end
+
+    it 'should power off the VM' do
+      @machine.state.stub(:id).and_return(:running)
+
+      VagrantPlugins::VSphere::Action::PowerOff.any_instance.should_receive(:call)
+    end
+
+    it 'should connect to vSphere' do
+      VagrantPlugins::VSphere::Action::ConnectVSphere.any_instance.should_receive(:call)
+    end
+
+    it 'should check if the VM exits' do
+      VagrantPlugins::VSphere::Action::IsCreated.any_instance.should_receive(:call)
+    end
+
+    it 'should not 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_not_receive(:call)
+      VagrantPlugins::VSphere::Action::MessageNotCreated.any_instance.should_receive(:call)
+    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)
+      VagrantPlugins::VSphere::Action::MessageAlreadyCreated.any_instance.should_receive(:call)
+    end
+  end
 end

data/spec/clone_spec.rb

@@ -73,6 +73,18 @@ describe VagrantPlugins::VSphere::Action::Clone do
     })
   end
 
+
+  it 'should create a CloneVM spec with configured number of cpus' do
+    @machine.provider_config.stub(:cpu_count).and_return(4)
+    call
+    expect(@template).to have_received(:CloneVM_Task).with({
+      :folder => @data_center,
+      :name => NAME,
+      :spec => {:location => {:pool => @child_resource_pool}, 
+        :config => RbVmomi::VIM.VirtualMachineConfigSpec(:numCPUs => 4) },
+    })
+  end
+
   it 'should set static IP when given config spec' do
     @machine.provider_config.stub(:customization_spec_name).and_return('spec')
     call

data/spec/spec_helper.rb

@@ -54,7 +54,8 @@ RSpec.configure do |config|
         :proxy_host => nil,
         :proxy_port => nil,
         :vlan => nil,
-        :memory_mb => nil)
+        :memory_mb => nil,
+        :cpu_count => nil)
     vm_config = double(
       :vm => double('config_vm',
                     :box => nil,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Andrew Grauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -117,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .bumpversion.cfg
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: VMWare vSphere provider