fog-vsphere 1.7.0.1 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 95375060abd33bf28937dfdc793ecbfcefb1a612d4a639456c0a304ac7641a25
-  data.tar.gz: 7550cbe2aee4325dafaff388c2546470a82cd893aad7818f52302f4005f5df2f
+SHA1:
+  metadata.gz: 63a4262cd25dd64e24bcf3d02231bc108a678e14
+  data.tar.gz: bae6e27a2c111effe8440ceb4b308fb15190a792
 SHA512:
-  metadata.gz: 032576f8e9d1c11dee28a26625d72f23c4c50c60fce93480b3cacb97c0ad13c98c182357acbcf2106138eaa6edf39a83dfd70fa86939f367cf32d017ab44fc8c
-  data.tar.gz: 215eb88241d55311ecfcd45f2e85a2fd3a6b52ed9806418d8bfc7767e82559390f0f5e71b623a5a8ffe62272f304d7c1fae5fec261ad43cab0fb5bebcc1514de
+  metadata.gz: 47dcd8b6aa212d64564beee1d2a22bd64d38529fceccd4752baff6bde4cced8130792fefe29a145201a5ba9695f65abbebd25e969e68f69e95b339c2526b7679
+  data.tar.gz: ff2a5bdb21167a04acd97a87fa756d25bf043009ade394c9cce5e8ea7934c429c39a956e4fa0fe6be881c6e94ad1cc7708024582dd35d2b0efd1bba69bbbcadc

data/.gitignore

@@ -20,5 +20,4 @@ tmp
 *.o
 *.a
 mkmf.log
-gemfiles/*.lock
-.*.swp
+gemfiles/*.lock

data/.travis.yml

@@ -6,19 +6,20 @@ matrix:
     - rvm: jruby-head
   fast_finish: true
   include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.1.9.2+
     - rvm: 2.0.0
       gemfile: Gemfile
-    - rvm: 2.1.10
+    - rvm: 2.1.0
       gemfile: Gemfile
-    - rvm: 2.2.6
+    - rvm: 2.1.1
       gemfile: Gemfile
-    - rvm: 2.3.3
-      gemfile: Gemfile
-    - rvm: 2.4.0
+    - rvm: 2.2.0
       gemfile: Gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/Gemfile.1.9.2+
     - rvm: jruby-head
       gemfile: Gemfile
-script: bundle exec rake travis:ci
 notifications:
   email: false
 addons:

data/CHANGELOG.md

@@ -1,5 +1,14 @@
+## v1.7.1
+
+* Send all options to VM migrate request
+* Fix VM clone with resource pool
+* Remove obsolete index argument to create_disk call
+* Fix error when creating volume using the wrong key name
+
 ## v1.7.0
 
+* Update volumes when `save` is called on Server
+* Add the ability to update the size of attached virtual disks
 * Improve mocks for folders and networks
 
 ## v1.6.0
@@ -12,15 +21,17 @@
 
 ## v1.5.1
 
-* Removed for hotfix
+* Move volume key generation to volume model
+* Set defaults more reliably for SCSI
 
 ## v1.5.0
 
 * Rename the get_spec method in create_rule to get_group_spec
+* Change modify_vm_controller to follow changes made to create_controller
 
 ## v1.4.0
 
-* Removed for hotfix
+* Add ability for VMs to have multiple SCSI controllers
 
 ## v1.3.0
 

data/CONTRIBUTORS.md

@@ -4,13 +4,11 @@
 * Ben Talbot - btalbot <ben_t48@hotmail.com>
 * Carl Caum <carl@carlcaum.com>
 * Carlos Sanchez <csanchez@maestrodev.com>
-* Chris Roberts <chrobert@redhat.com>
 * Chris Thompson <chris.thompson@govdelivery.com>
 * Chris Thompson <teaforthecat@gmail.com>
 * Christopher Oliver <coliver@datapipe.com>
 * Cyrus Team <cyrusteam@cyruslists.com>
 * Darren Foo <stonith@users.noreply.github.com>
-* Derek Wright <derekmwright@users.noreply.github.com>
 * Dominic Cleal <dcleal@redhat.com>
 * Eric Stonfer <ericstonfer@yahoo.com>
 * Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
@@ -38,7 +36,6 @@
 * Lukas Zapletal <lzap+git@redhat.com>
 * Marc Grimme <grimme@atix.de>
 * Marc Grimme <marc.grimme@googlemail.com>
-* Marek Hulan <mhulan@redhat.com>
 * Martin Matuska <martin@matuska.org>
 * Matt Darby <matt.darby@rackspace.com>
 * Matthew Black <matthew.black@sap.com>
@@ -63,10 +60,8 @@
 * Shlomi Zadok <shlomi@ben-hanna.com>
 * Simon Josi <me@yokto.net>
 * Tejas Ravindra Mandke <tejas@identified.com>
-* Timo Goebel <mail@timogoebel.name>
 * Timo Goebel <timo.goebel@dm.de>
 * Timur Alperovich <timur@maginatics.com>
-* Tyler Gregory <01100010011001010110010101110000@users.noreply.github.com>
 * Wesley Beary <geemus+github@gmail.com>
 * Wesley Beary <geemus@gmail.com>
 * Xavier Fontrodona <xavier.fontrodona@safelayer.com>
@@ -77,8 +72,5 @@
 * karmab <karimboumedhel@gmail.com>
 * karimb <karimboumedhel@gmail.com>
 * milo_cheung <milo.cheung@appcara.com>
-* scottd018 <scottd018@users.noreply.github.com>
 * slivik <jakub.sliva@gmail.com>
-* theOpenBit <theopenbit@users.noreply.github.com>
 * tipt0e <topo-2@charter.net>
-* wiad <adam.winberg@gmail.com>

data/Rakefile

@@ -1,17 +1,8 @@
 require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-
-desc 'Run Ruby style checks'
-RuboCop::RakeTask.new(:style)
-
-namespace :travis do
-  desc 'Run tests on Travis'
-  task ci: %w(style test)
-end
 
 mock = ENV['FOG_MOCK'] || 'true'
 task :test do
   sh("export FOG_MOCK=#{mock} && bundle exec shindont")
 end
 
-task(default: [:test])
+task(:default => [:test])

data/gemfiles/Gemfile.1.9.2+

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'codeclimate-test-reporter', '~> 1.0',  group: :test, require: nil
+gem 'json',    '~> 1.8.0'
+gem 'net-ssh', '~> 2.9'
+gem 'rubocop', '~> 0.41.0'
+gem 'simplecov', '~> 0.12.0'
+
+gemspec :path => '..'

data/lib/fog/vsphere/compute.rb

@@ -89,6 +89,7 @@ module Fog
       request :get_virtual_machine
       request :vm_reconfig_hardware
       request :vm_reconfig_memory
+      request :vm_reconfig_volumes
       request :vm_reconfig_cpus
       request :vm_reconfig_cdrom
       request :vm_config_vnc
@@ -100,6 +101,7 @@ module Fog
       request :list_vm_customvalues
       request :list_customfields
       request :get_vm_first_scsi_controller
+      request :list_vm_scsi_controllers
       request :set_vm_customvalue
       request :vm_take_snapshot
       request :list_vm_snapshots

data/lib/fog/vsphere/models/compute/scsicontroller.rb

@@ -5,9 +5,14 @@ module Fog
         attribute :shared_bus
         attribute :type
         attribute :unit_number
-        attribute :key
+        attribute :key, :type => :integer
         attribute :server_id
 
+        def initialize(attributes = {})
+          super
+          self.key ||= 1000
+        end
+
         def to_s
           "#{type} ##{key}: shared: #{shared_bus}, unit_number: #{unit_number}"
         end

data/lib/fog/vsphere/models/compute/server.rb

@@ -6,6 +6,7 @@ module Fog
       class Server < Fog::Compute::Server
         extend Fog::Deprecation
         deprecate(:ipaddress, :public_ip_address)
+        deprecate(:scsi_controller, :scsi_controllers)
 
         # This will be the instance uuid which is globally unique across
         # a vSphere deployment.
@@ -45,7 +46,7 @@ module Fog
         attribute :instance_uuid # move this --> id
         attribute :guest_id
         attribute :hardware_version
-        attribute :scsi_controller # this is the first scsi controller. Right now no more of them can be used.
+        attribute :scsi_controllers, :type => :array
         attribute :cpuHotAddEnabled
         attribute :memoryHotAddEnabled
         attribute :firmware
@@ -57,7 +58,7 @@ module Fog
           initialize_interfaces
           initialize_volumes
           initialize_customvalues
-          initialize_scsi_controller
+          initialize_scsi_controllers
         end
 
         # Lazy Loaded Attributes
@@ -79,6 +80,11 @@ module Fog
           service.vm_reconfig_cpus('instance_uuid' => instance_uuid, 'cpus' => cpus, 'corespersocket' => corespersocket)
         end
 
+        def vm_reconfig_volumes(options = {})
+          requires :instance_uuid, :volumes
+          service.vm_reconfig_volumes('instance_uuid' => instance_uuid, 'volumes' => volumes)
+        end
+
         def vm_reconfig_hardware(hardware_spec, options = {})
           requires :instance_uuid
           service.vm_reconfig_hardware('instance_uuid' => instance_uuid, 'hardware_spec' => hardware_spec)
@@ -114,7 +120,14 @@ module Fog
         def migrate(options = {})
           options = { :priority => 'defaultPriority' }.merge(options)
           requires :instance_uuid
-          service.vm_migrate('instance_uuid' => instance_uuid, 'priority' => options[:priority])
+
+          # Convert symbols to strings
+          req_options = options.reduce({}) { |hsh, (k,v)| hsh[k.to_s] = v; hsh }
+          req_options['cluster'] ||= cluster
+          req_options['datacenter'] = "#{datacenter}"
+          req_options['instance_uuid'] = instance_uuid
+          
+          service.vm_migrate(req_options)
         end
 
         # Clone from a server object
@@ -255,8 +268,12 @@ module Fog
           attributes[:customvalues] ||= id.nil? ? [] : service.customvalues( :vm => self )
         end
 
+        def scsi_controllers
+          self.attributes[:scsi_controllers] ||= service.list_vm_scsi_controllers(id)
+        end
+
         def scsi_controller
-          self.attributes[:scsi_controller] ||= service.get_vm_first_scsi_controller(id)
+          scsi_controllers.first
         end
 
         def folder
@@ -269,6 +286,7 @@ module Fog
           if persisted?
            vm_reconfig_cpus if attribute_changed?(:cpus) || attribute_changed?(:corespersocket)
            vm_reconfig_memory if attribute_changed?(:memory_mb)
+           vm_reconfig_volumes if attribute_changed?(:volumes)
           else
             self.id = service.create_vm(attributes)
           end
@@ -314,7 +332,7 @@ module Fog
 
         def initialize_volumes
           if attributes[:volumes] and attributes[:volumes].is_a?(Array)
-            self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? service.volumes.new(vol) : vol }
+            self.attributes[:volumes].map! { |vol| vol.is_a?(Hash) ? service.volumes.new({:server => self}.merge(vol)) : vol }
           end
         end
 
@@ -324,9 +342,20 @@ module Fog
           end
         end
 
-        def initialize_scsi_controller
-          if attributes[:scsi_controller] and attributes[:scsi_controller].is_a?(Hash)
-            Fog::Compute::Vsphere::SCSIController.new(self.attributes[:scsi_controller])
+        def initialize_scsi_controllers
+          if attributes[:scsi_controllers] && attributes[:scsi_controllers].is_a?(Array)
+            self.attributes[:scsi_controllers].map! do |controller|
+              controller.is_a?(Hash) ? Fog::Compute::Vsphere::SCSIController.new(controller) : controller
+            end
+          elsif attributes[:scsi_controller] && attributes[:scsi_controller].is_a?(Hash)
+            self.attributes[:scsi_controllers] = [
+              Fog::Compute::Vsphere::SCSIController.new(self.attributes[:scsi_controller])
+            ]
+          elsif attributes[:volumes] && attributes[:volumes].is_a?(Array) && !attributes[:volumes].empty?
+            # Create a default scsi controller if there are any disks but no controller defined
+            self.attributes[:scsi_controllers] = [
+              Fog::Compute::Vsphere::SCSIController.new
+            ]
           end
         end
 

data/lib/fog/vsphere/models/compute/volume.rb

@@ -5,6 +5,7 @@ module Fog
         DISK_SIZE_TO_GB = 1048576
         identity :id
 
+        has_one :server, Server
         attribute :datastore
         attribute :storage_pod
         attribute :mode
@@ -16,12 +17,9 @@ module Fog
         attribute :size_gb
         attribute :key
         attribute :unit_number
-        attribute :server_id
-
-        def initialize(attributes={} )
-          # Assign server first to prevent race condition with persisted?
-          self.server_id = attributes.delete(:server_id)
+        attribute :controller_key, :type => :integer
 
+        def initialize(attributes={})
           super defaults.merge(attributes)
         end
 
@@ -31,6 +29,7 @@ module Fog
 
         def size_gb= s
           attributes[:size] = s.to_i * DISK_SIZE_TO_GB if s
+          attributes[:size_gb] = s.to_i if s
         end
 
         def to_s
@@ -48,25 +47,7 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           requires :server_id, :size, :datastore
 
-          # When adding volumes to vsphere, if our unit_number is 7 or higher, vsphere will increment the unit_number
-          # This is due to SCSI ID 7 being reserved for the pvscsi controller
-          # When referring to a volume that already added using a unit_id of 7 or higher, we must refer to the actual SCSI ID
-          if unit_number.nil?
-            # Vsphere maps unit_numbers 7 and greater to a higher SCSI ID since the pvscsi driver reserves SCSI ID 7
-            used_unit_numbers = server.volumes.map { |volume| volume.unit_number < 7 ? volume.unit_number : volume.unit_number - 1 }
-            max_unit_number = used_unit_numbers.max
-
-            if max_unit_number > server.volumes.size
-              # If the max ID exceeds the number of volumes, there must be a hole in the range. Find a hole and use it.
-              self.unit_number = max_unit_number.times.to_a.find { |i| used_unit_numbers.exclude?(i) }
-            else
-              self.unit_number = max_unit_number + 1
-            end
-          else
-            if server.volumes.any? { |volume| volume.unit_number == self.unit_number && volume.id != self.id }
-              raise "A volume already exists with that unit_number, so we can't save the new volume"
-            end
-          end
+          set_unit_number
 
           data = service.add_vm_volume(self)
 
@@ -78,8 +59,25 @@ module Fog
             # We have to query vSphere to get the volume attributes since the task handle doesn't include that info.
             created = server.volumes.all.find { |volume| volume.unit_number == self.unit_number }
 
+            # example of "created" =>
+            #   <Fog::Compute::Vsphere::Volume
+            #     id="6000C295-576f-0e2d-5b70-c778cd108b3a",
+            #     datastore="datastore1",
+            #     storage_pod=nil,
+            #     mode="persistent",
+            #     size=10485760,
+            #     thin=true,
+            #     eager_zero=nil,
+            #     name="Hard disk 2",
+            #     filename="[datastore1] testvm/testvm_2.vmdk",
+            #     size_gb=10,
+            #     key=2004,
+            #     unit_number=2,
+            #     controller_key=1000
+            #   >
             self.id = created.id
             self.key = created.key
+            self.controller_key = created.controller_key
             self.filename = created.filename
 
             true
@@ -88,9 +86,33 @@ module Fog
           end
         end
 
-        def server
-          requires :server_id
-          service.servers.get(server_id)
+        def server_id
+          requires :server
+          server.id
+        end
+
+        def set_unit_number
+          # When adding volumes to vsphere, if our unit_number is 7 or higher, vsphere will increment the unit_number
+          # This is due to SCSI ID 7 being reserved for the pvscsi controller
+          # When referring to a volume that already added using a unit_id of 7 or higher, we must refer to the actual SCSI ID
+          if unit_number.nil?
+            self.unit_number = calculate_free_unit_number
+          else
+            if server.volumes.select { |vol| vol.controller_key == controller_key }.any? { |volume| volume.unit_number == self.unit_number && volume.id != self.id }
+              raise "A volume already exists with that unit_number, so we can't save the new volume"
+            end
+          end
+        end
+
+        def set_key
+          requires :controller_key, :unit_number
+
+          return unless key.nil?
+
+          # controller key is based on 1000 + controller bus
+          # disk key is based on 2000 + the SCSI ID + the controller bus * 16
+          controller_bus = controller_key - 1000
+          self.key = 2000 + (controller_bus * 16) + unit_number
         end
 
         private
@@ -99,9 +121,21 @@ module Fog
           {
             :thin => true,
             :name => "Hard disk",
-            :mode => "persistent"
+            :mode => "persistent",
+            :controller_key => 1000
           }
         end
+
+        def calculate_free_unit_number
+          requires :controller_key
+
+          # Vsphere maps unit_numbers 7 and greater to a higher SCSI ID since the pvscsi driver reserves SCSI ID 7
+          used_unit_numbers = server.volumes
+            .select { |vol| vol.unit_number && vol.controller_key == controller_key }.map(&:unit_number) + [7]
+          free_unit_numbers = (0..15).to_a - used_unit_numbers
+
+          free_unit_numbers.first
+        end
       end
     end
   end

data/lib/fog/vsphere/models/compute/volumes.rb

@@ -20,7 +20,7 @@ module Fog
               raise 'volumes should have vm or template'
             end
 
-          self.each { |volume| volume.server_id = server.id }
+          self.each { |volume| volume.server = server }
           self
         end