fog-vsphere 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d2a460b175971c18ddb06c47d33cc5e4d5a099e
-  data.tar.gz: f62a8ae39ab07aac91a035a62ab5c3bdbfe896fd
+  metadata.gz: 6be1e2a1637899ea613c7b58dbab33a4414d252e
+  data.tar.gz: c52b5f6072294919ff343ce384213b6ef2eb04b2
 SHA512:
-  metadata.gz: 29a92d9093e495a578fe28dffc698fa3c0f6cb8288f2470abceb4dc0becde7233a909b8004a22bab7db880191019f595ff457431ad8d6baf5e43bd0f8f17d993
-  data.tar.gz: cf4faa5926d2f6572faafc2cb2da2e65dcf3cb6185062f66d10cc8cf29d0e3035e5fdef8161bb6f0c0fc9710bae66237be63271134a22685af12e38fe8fa49fe
+  metadata.gz: 07c537deccc790717d3166a6de38eba43338e7c59ea12d5073bcf4c2090cb7f4f1f094669d8d262de3c412a83b6f05d59f7940fc725dd54c76361da436206a2b
+  data.tar.gz: 010e3c52e24594f2088f5649145cae621a2aa874250680f48d92815a568017016e73b979f55357e841355bc68595fbc095d9b339d5366659d4181d2d2958a18e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.9.0
+
+* Add :connectable option to `update_vm_interface`
+* Add ability to detach volume from VM
+
 ## v1.8.0
 
 * Add `suspend` to server model

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

@@ -36,6 +36,14 @@ module Fog
           name
         end
 
+        def detach
+          requires :server_id, :key, :unit_number
+
+          service.remove_vm_volume(self)
+          server.volumes -= [self]
+          true
+        end
+
         def destroy
           requires :server_id, :key, :unit_number
 

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

@@ -102,7 +102,7 @@ module Fog
           end
 
           if (disks = attributes[:volumes])
-            devices << disks.map { |disk| create_disk(disk, :add, get_storage_pod(attributes)) }
+            devices << disks.map { |disk| create_disk(disk, :add, storage_pod: get_storage_pod(attributes)) }
           end
 
           if (cdroms = attributes[:cdroms])
@@ -230,9 +230,9 @@ module Fog
           end
         end
 
-        def create_disk(disk, operation = :add, storage_pod = nil)
+        def create_disk(disk, operation = :add, options = {})
           # If we deploy the vm on a storage pod, datastore has to be an empty string
-          if storage_pod
+          if options[:storage_pod]
             datastore = ''
           else
             datastore = "[#{disk.datastore}]"
@@ -243,11 +243,10 @@ module Fog
 
           payload = {
             :operation     => operation,
-            :fileOperation => operation == :add ? :create : :destroy,
             :device        => RbVmomi::VIM.VirtualDisk(
               :key           => disk.key,
               :backing       => RbVmomi::VIM.VirtualDiskFlatVer2BackingInfo(
-                :fileName        => datastore,
+                :fileName        => options[:filename] || datastore,
                 :diskMode        => disk.mode.to_sym,
                 :thinProvisioned => disk.thin
               ),
@@ -256,6 +255,8 @@ module Fog
               :capacityInKB  => disk.size
             )
           }
+          file_operation = options[:file_operation] || (:create if operation == :add)
+          payload[:fileOperation] = file_operation if file_operation
 
           if operation == :add && disk.thin == 'false' && disk.eager_zero == 'true'
             payload[:device][:backing][:eagerlyScrub] = disk.eager_zero

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

@@ -26,15 +26,16 @@ module Fog
             backing = create_nic_backing(interface, {})
             raw_interface.backing = backing
           end
+          apply_options_to_raw_interface(raw_interface, options)
           spec = {
             operation: :edit,
             device: raw_interface
-          }          
+          }
           vm_reconfig_hardware('instance_uuid' => vmid, 'hardware_spec' => {'deviceChange'=>[spec]})
         end
 
         private
-        
+
         def get_interface_from_options(vmid, options)
           if options and options[:interface]
             options[:interface]
@@ -50,6 +51,15 @@ module Fog
             raise ArgumentError, "interface is a required parameter or pass options with type and network"
           end
         end
+
+        def apply_options_to_raw_interface(raw_interface, options)
+          if options[:connectable]
+            options[:connectable].each do |key, value|
+              raw_interface.connectable.send("#{key}=", value)
+            end
+          end
+          raw_interface
+        end
       end
 
       class Mock
@@ -64,7 +74,7 @@ module Fog
           raise ArgumentError, "interface is a required parameter" unless options and options[:interface]
           true
         end
-        
+
         def update_vm_interface(vmid, options = {})
           return unless options[:interface]
           options[:interface].network = options[:network]

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

@@ -6,9 +6,15 @@ module Fog
           vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, :add)]})
         end
 
-        def destroy_vm_volume(volume)
+        def remove_vm_volume(volume)
           vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_disk(volume, :remove)]})
         end
+
+        def destroy_vm_volume(volume)
+          vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {
+            'deviceChange'=>[create_disk(volume, :remove, file_operation: :destroy)]
+          })
+        end
       end
 
       class Mock
@@ -16,6 +22,10 @@ module Fog
           vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => {'deviceChange'=>[create_cdrom(volume, :add)]})
         end
 
+        def remove_vm_volume(volume)
+          true
+        end
+
         def destroy_vm_volume(volume)
           true
         end

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

@@ -9,16 +9,7 @@ module Fog
             deviceChange: []
           }
           options['volumes'].each do |volume|
-            hardware_spec[:deviceChange].push({
-              :operation=>:edit,
-              device: RbVmomi::VIM::VirtualDisk(
-                backing: RbVmomi::VIM::VirtualDiskFlatVer2BackingInfo( diskMode: volume.mode, fileName: volume.filename ),
-                unitNumber: volume.unit_number,
-                key: volume.key,
-                controllerKey: volume.controller_key,
-                capacityInKB: volume.size,
-              )
-            })
+            hardware_spec[:deviceChange].push(create_disk(volume, :edit, filename: volume.filename))
           end
           vm_reconfig_hardware('instance_uuid' => options['instance_uuid'], 'hardware_spec' => hardware_spec )
         end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.8.0'
+    VERSION = '1.9.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core