fog-vsphere 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c29e38fdaa62dc93aec72fd59b93c8faf6f8625
-  data.tar.gz: 76557efdce999f2226c60ca56752661831d04890
+  metadata.gz: edb0cd00d29fa95192e3d5a70f3f08d72c9a1221
+  data.tar.gz: f296c0b6fad69fb59c581c225af17398087a377d
 SHA512:
-  metadata.gz: 6b7b39dd5c28e51ba0445ee47fa93608c3610daf67e30ec7ff129738ce1b3897c7e03da2c4ce8760fcd74b46653f83f969dc216bb1a291f0815d6e068102418f
-  data.tar.gz: 34e87ecb4ac85e87d1862365f7d33b4d1b9c27c1865f24cc569ba9ceb6b8ceb46cb66d01dd1d68d5335194237ebf81686fdb51a078fa693d7594f317609cb771
+  metadata.gz: 0954d0617378088536af6d5099f39ff26097ed09069e8abf9eec1386c12aea659bf72847e05679064a9938a487f8e69c21bb8f1ec0164f62e7b526c26d471bde
+  data.tar.gz: 02cfbb0004d8e8cfec927052b0615eac8aefe2a24e4142495e2e3a256cfd05af05d6be642a67e606be213213321a4a03151da4d5b79a40b61b01ad21fa7fd774

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.5.1
+
+* 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

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/volume.rb

@@ -17,7 +17,7 @@ module Fog
         attribute :size_gb
         attribute :key
         attribute :unit_number
-        attribute :controller_key, :type => :integer, :default => 1000
+        attribute :controller_key, :type => :integer
 
         def initialize(attributes={})
           super defaults.merge(attributes)
@@ -87,13 +87,25 @@ module Fog
           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
 
         def defaults
           {
             :thin => true,
             :name => "Hard disk",
-            :mode => "persistent"
+            :mode => "persistent",
+            :controller_key => 1000
           }
         end
 

data/lib/fog/vsphere/requests/compute/create_vm.rb

@@ -149,7 +149,7 @@ module Fog
               disks.each do |disk|
                 # we allow booting from all harddisks, the first disk has the highest priority
                 boot_order << RbVmomi::VIM::VirtualMachineBootOptionsBootableDiskDevice.new(
-                  :deviceKey => get_disk_device_key(disk.controllerKey, disk.unitNumber)
+                  :deviceKey => disk.key
                 )
               end
             when 'cdrom'
@@ -163,13 +163,6 @@ module Fog
           boot_order
         end
 
-        def get_disk_device_key(controller_key, unit_number)
-          # 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
-          2000 + (controller_bus * 16) + unit_number
-        end
-
         def create_nic_backing nic, attributes
           raw_network = get_raw_network(nic.network, attributes[:datacenter], if nic.virtualswitch then nic.virtualswitch end)
 
@@ -246,12 +239,13 @@ module Fog
           end
 
           disk.set_unit_number
+          disk.set_key
 
           payload = {
             :operation     => operation,
             :fileOperation => operation == :add ? :create : :destroy,
             :device        => RbVmomi::VIM.VirtualDisk(
-              :key           => -1,
+              :key           => disk.key,
               :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
                 :fileName        => datastore,
                 :diskMode        => disk.mode.to_sym,

data/lib/fog/vsphere/requests/compute/modify_vm_volume.rb

@@ -3,17 +3,17 @@ module Fog
     class Vsphere
       class Real
         def add_vm_volume(volume)
-          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, volume.unit_number, :add)]})
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, :add)]})
         end
 
         def destroy_vm_volume(volume)
-          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, volume.unit_number, :remove)]})
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, :remove)]})
         end
       end
 
       class Mock
         def add_vm_volume(volume)
-          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_cdrom(volume, volume.unit_number, :add)]})
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_cdrom(volume, :add)]})
         end
 
         def destroy_vm_volume(volume)

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core