fog-vsphere 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db0f780c6c5076000b2b57254b785e90146d45e7
-  data.tar.gz: 2e4c439a77c42da160a258f34b71902f42ae7231
+  metadata.gz: ce99898828f010893cf231e4848df2e606ca70c8
+  data.tar.gz: ddab6c8da05931d2c347d96c7f6f3b4490577780
 SHA512:
-  metadata.gz: 3afe86e14e6bea538af974ad4015d0f7d3bba74f9c17473a4e71bc96e3ed5274acd053f075b7b6095cd591f6871daa3090015464fa3e2bf054cbaa8f87e09d06
-  data.tar.gz: 0ad8e324e32505f43950450efdab85ff466eb77943f3a2ec8ab01e1b5a37a8c5b998eedb5f1a7cc01776fa0e8b724bca5709866a1879b4f4328feb85d00a911e
+  metadata.gz: f45ddf72f15fc715f45cfbfa3ee2091817cadeaca315b281febd7b41ab0690a4d7844781a18ed26d0d95fbbdf09e07ae51fbb919686b61c65c03b920a049223c
+  data.tar.gz: a796b42151696961fb6c2f743f6a860b3ff221aff22715eaad57cc14a660e0d67042b292c2550c366a5986b9bdafd0de4110589189f810af93567e7e02666638

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.11.0
+
+* Add ability to query subresource pools
+* Fix `snapshots.get(id)` when no snapshot is found
+* Add `vm_remove_snapshot` request, use in `snapshot.destroy`
+* Fix `snapshots.get` for non-root snapshot
+* Add `vm_revert_snapshot` request and `revert` method to `snapshot`
+
 ## v1.10.0
 
 * Add request to rename VM

data/CONTRIBUTORS.md

@@ -74,4 +74,5 @@
 * karimb <karimboumedhel@gmail.com>
 * milo_cheung <milo.cheung@appcara.com>
 * slivik <jakub.sliva@gmail.com>
+* theOpenBit <theopenbit@users.noreply.github.com>
 * tipt0e <topo-2@charter.net>

data/fog-vsphere.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'fog-vsphere'
   spec.version       = Fog::Vsphere::VERSION
   spec.authors       = ['J.R. Garcia']
-  spec.email         = ['jrg@vmware.com']
+  spec.email         = ['jr@garciaole.com']
 
   spec.summary       = "Module for the 'fog' gem to support VMware vSphere."
   spec.description   = 'This library can be used as a module for `fog` or as standalone provider to use vSphere in applications.'

data/lib/fog/vsphere/compute.rb

@@ -121,6 +121,8 @@ module Fog
       request :destroy_group
       request :get_host
       request :modify_vm_controller
+      request :vm_revert_snapshot
+      request :vm_remove_snapshot
 
       module Shared
         attr_reader :vsphere_is_vcenter

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

@@ -29,6 +29,15 @@ module Fog
           return self if ref == snapshot_ref
           child_snapshots().get(snapshot_ref)
         end
+
+        def revert
+          service.vm_revert_snapshot server_id, ref
+        end
+
+        def destroy(remove_children = false)
+          requires :server_id, :ref
+          service.vm_remove_snapshot(server_id, ref, remove_children)
+        end
       end
     end
   end

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

@@ -19,7 +19,11 @@ module Fog
         end
 
         def get(snapshot_ref)
-          all.find { |snapshot| snapshot.get_child(snapshot_ref) }
+          all.each do |snapshot|
+            snapshot = snapshot.get_child(snapshot_ref)
+            return snapshot if snapshot
+          end
+          nil
         end
       end
     end

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

@@ -32,7 +32,8 @@ module Fog
               :snapshot_name_chain =>
                 "#{parent_snap.snapshot_name_chain}/#{snap_tree.name}",
               :ref_chain =>
-                "#{parent_snap.ref_chain}/#{snap_tree.snapshot._ref}"
+                "#{parent_snap.ref_chain}/#{snap_tree.snapshot._ref}",
+              :server_id => parent_snap.server_id
             }
           end
       end

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

@@ -15,13 +15,32 @@ module Fog
 
         # root ResourcePool + Children if they exists
         def list_raw_resource_pools(cluster)
-          [cluster.resourcePool, cluster.resourcePool.resourcePool].flatten
+          pools = []
+          traverse_raw_resource_pools(pools, cluster.resourcePool)
+          pools.uniq
         end
 
-        def resource_pool_attributes resource_pool, cluster, datacenter
+        def traverse_raw_resource_pools(pools, rp)
+          if rp 
+            if rp.respond_to? :resourcePool
+              traverse_raw_resource_pools(pools, rp.resourcePool)
+            end
+            if rp.respond_to? :each
+               rp.each do |resourcePool|
+                 traverse_raw_resource_pools(pools, resourcePool)
+               end
+            else
+              pools << rp
+            end
+          end
+        end
+
+        def resource_pool_attributes(resource_pool, cluster, datacenter)
+          name = folder_path(resource_pool).gsub(/^.*Resources(\/|)/,'')
+          name = 'Resources' if name.empty?
           {
             :id                   => managed_obj_id(resource_pool),
-            :name                 => resource_pool.name,
+            :name                 => name,
             :configured_memory_mb => resource_pool.summary.configuredMemoryMB,
             :overall_status       => resource_pool.overallStatus,
             :cluster              => cluster,
@@ -29,6 +48,7 @@ module Fog
           }
         end
       end
+
       class Mock
         def list_resource_pools(filters = { })
         end

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

@@ -31,7 +31,8 @@ module Fog
               :mo_ref => snap_tree.snapshot,
               :tree_node => snap_tree,
               :ref_chain => "#{vm_id}/#{snap_tree.snapshot._ref}",
-              :snapshot_name_chain => "#{vm_id}/#{snap_tree.name}"
+              :snapshot_name_chain => "#{vm_id}/#{snap_tree.name}",
+              :server_id => vm_id
             }
           end
       end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def vm_remove_snapshot(vm_id, snapshot_id, remove_children = false)
+          vm = servers.get(vm_id)
+          snapshot = vm.snapshots.get(snapshot_id).mo_ref
+          task = snapshot.RemoveSnapshot_Task(:removeChildren => remove_children)
+
+          task.wait_for_completion
+
+          {
+            'task_state' => task.info.state,
+            'was_cancelled' => task.info.cancelled
+          }
+        end
+      end
+
+      class Mock
+        def vm_remove_snapshot(vm_id, snapshot_id)
+          {
+            'task_state' => 'success',
+            'was_cancelled' => false
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+        def vm_revert_snapshot(vm_id, snapshot_id)
+          vm = servers.get(vm_id)
+          snapshot = vm.snapshots.get(snapshot_id).mo_ref
+          task = snapshot.RevertToSnapshot_Task
+
+          task.wait_for_completion
+
+          {
+            'task_state' => task.info.state,
+            'was_cancelled' => task.info.cancelled
+          }
+        end
+      end
+
+      class Mock
+        def vm_revert_snapshot(vm_id, snapshot_id)
+          {
+            'task_state' => 'success',
+            'was_cancelled' => false
+          }
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '1.10.0'.freeze
+    VERSION = '1.11.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -125,7 +125,7 @@ dependencies:
 description: This library can be used as a module for `fog` or as standalone provider
   to use vSphere in applications.
 email:
-- jrg@vmware.com
+- jr@garciaole.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -251,7 +251,9 @@ files:
 - 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_remove_snapshot.rb
 - lib/fog/vsphere/requests/compute/vm_rename.rb
+- lib/fog/vsphere/requests/compute/vm_revert_snapshot.rb
 - lib/fog/vsphere/requests/compute/vm_suspend.rb
 - lib/fog/vsphere/requests/compute/vm_take_snapshot.rb
 - lib/fog/vsphere/version.rb