fog-vsphere 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed406936e8160692fc51175c72c9011fecd95653
-  data.tar.gz: 7f184ce06c1b43431c84da12d2880589d570d724
+  metadata.gz: f885f4027de3c28c90d0d9909bd13c7c9ec8b339
+  data.tar.gz: afc80dbe162913b73794220d69ca791ea2829ef0
 SHA512:
-  metadata.gz: 7c3892e6447634c9cb464ac7fd9aae19ef12c7583a0fa6f598a66055e6aee66007e4dfa44e8859b417da0cdf3b1ec71f732196e6bff2b0de3d20d4a9e5149410
-  data.tar.gz: 8f99da266df8a4aa7182d383601562664fa26a3c50a2dfbad5cb2b4479ade1a3f2e3756d7d4db13172421cf5210ee0e7b12dbb06b961203ffae407f110dc6c1f
+  metadata.gz: 6ee93b2bb15102f94be2510f384651452b6a973626dfc8efef770091c2e58856de199b39c043d1c8316d79f921732b2846ea027f17b3cf03042c2dab2ef087f5
+  data.tar.gz: 7144e530d128aeb69042ec2dfdbf7935eb4130e46f2ef7e5a9bd8097f2385b5bd82715b056558aac00347269017701932756dce6fc3d7b20e08e30096848397c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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
 
 *  Support updating of server CPUs and memory

data/CONTRIBUTORS.md

@@ -1,3 +1,4 @@
+* Adam, Till - D0249540 <till.adam@dm.de>
 * Ahmed Elsabbahy <aelsabbahy@promnetwork.com>
 * Alan Sebastian <asebastian2@gmail.com>
 * Ben Talbot - btalbot <ben_t48@hotmail.com>

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
@@ -258,7 +259,7 @@ module Fog
                      }],
                  "interfaces"       =>
                     [{"mac"     => "00:50:56:a9:00:28",
-                      "network" => "VM Network",
+                      "network" => "dvportgroup-123456",
                       "name"    => "Network adapter 1",
                       "status"  => "ok",
                       "summary" => "VM Network",
@@ -312,7 +313,7 @@ module Fog
                     [{ "summary" => "VM Network",
                       "mac"     => "00:50:56:a9:00:00",
                       "status"  => "ok",
-                      "network" => "VM Network",
+                      "network" => "dvportgroup-123456",
                       "name"    => "Network adapter 1" }],
                  "hypervisor"       => "gunab.puppetlabs.lan",
                  "guest_id"         => nil,

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

@@ -80,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)
@@ -274,6 +279,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

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

@@ -29,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

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

@@ -39,6 +39,12 @@ module Fog
           [folder, folder.childEntity.grep(RbVmomi::VIM::Folder).map(&method(:child_folders)).flatten]
         end
       end
+      class Mock
+        def list_folders(options = {})
+          options.reject! {|k,v| v.nil? } # ignore options with nil value
+          self.data[:folders].values.select {|folder| options.all? {|k,v| folder[k.to_s] == v.to_s }}
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,51 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def vm_reconfig_volumes(options = {})
+          raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
+          raise ArgumentError, "volumes is a required parameter" unless options.key? 'volumes'
+          hardware_spec = {
+            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,
+              )
+            })
+          end
+          vm_reconfig_hardware('instance_uuid' => options['instance_uuid'], 'hardware_spec' => hardware_spec )
+        end
+      end
+
+      class Mock
+        def vm_reconfig_volumes(options = {})
+          raise ArgumentError, "instance_uuid is a required parameter" unless options.key? 'instance_uuid'
+          raise ArgumentError, "volumes is a required parameter" unless options.key? 'volumes'
+          hardware_spec = {
+            deviceChange: []
+          }
+          options['volumes'].each do |volume|
+            hardware_spec[:deviceChange].push({
+              :operation=>:edit,
+              device: {
+                backing: { diskMode: volume.mode, fileName: volume.filename },
+                unitNumber: volume.unit_number,
+                key: volume.key,
+                controllerKey: volume.controller_key,
+                capacityInKB: volume.size,
+              }
+            })
+          end
+          vm_reconfig_hardware('instance_uuid' => options['instance_uuid'], 'hardware_spec' => hardware_spec )
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -250,6 +250,7 @@ files:
 - lib/fog/vsphere/requests/compute/vm_reconfig_cpus.rb
 - lib/fog/vsphere/requests/compute/vm_reconfig_hardware.rb
 - lib/fog/vsphere/requests/compute/vm_reconfig_memory.rb
+- lib/fog/vsphere/requests/compute/vm_reconfig_volumes.rb
 - lib/fog/vsphere/requests/compute/vm_take_snapshot.rb
 - lib/fog/vsphere/version.rb
 - tests/class_from_string_tests.rb