Merge pull request #828 from agrare/subclass_snapshot

Author: Fryguy

app/models/manageiq/providers/vmware/infra_manager.rb

@@ -22,6 +22,7 @@ class Vmware::InfraManager < InfraManager
     require_nested :Refresher
     require_nested :RefreshWorker
     require_nested :ResourcePool
+    require_nested :Snapshot
     require_nested :Storage
     require_nested :StorageCluster
     require_nested :Template

app/models/manageiq/providers/vmware/infra_manager/provision/cloning.rb

@@ -117,18 +117,13 @@ def start_clone(clone_options)
 
     [:config, :customization, :linked_clone].each { |key| vim_clone_options[key] = clone_options[key] }
 
-    [:folder, :host, :pool].each do |key|
+    %i[folder host pool snapshot].each do |key|
       ci = clone_options[key]
       next if ci.nil?
 
       vim_clone_options[key] = ci.ems_ref_obj
     end
 
-    if clone_options[:snapshot]
-      ci = clone_options[:snapshot]
-      vim_clone_options[:snapshot] = VimString.new(ci.ems_ref, ci.ems_ref_type, :ManagedObjectReference) if ci.ems_ref.present? && ci.ems_ref_type.present?
-    end
-
     vim_clone_options[:datastore]       = datastore_ems_ref(clone_options)
     vim_clone_options[:disk]            = build_disk_relocate_spec(vim_clone_options[:datastore])
     vim_clone_options[:storage_profile] = build_storage_profile(clone_options[:storage_profile]) unless clone_options[:storage_profile].nil?

app/models/manageiq/providers/vmware/infra_manager/snapshot.rb

@@ -0,0 +1,3 @@
+class ManageIQ::Providers::Vmware::InfraManager::Snapshot < ::Snapshot
+  include ManageIQ::Providers::Vmware::InfraManager::EmsRefObjMixin
+end

spec/factories/snapshot.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :snapshot_vmware, :class => "ManageIQ::Providers::Vmware::InfraManager::Snapshot", :parent => :snapshot do
+    sequence(:ems_ref) { |n| "snapshot-#{seq_padded_for_sorting(n)}" }
+    ems_ref_type { "Snapshot" }
+  end
+end

spec/models/manageiq/providers/vmware/infra_manager/provision/cloning_spec.rb

@@ -41,7 +41,7 @@
     let(:folder)    { FactoryBot.create(:vmware_folder_vm, :ext_management_system => ems) }
     let(:host)      { FactoryBot.create(:host_vmware_esx, :ext_management_system => ems, :ems_ref => "host-1") }
     let(:pool)      { FactoryBot.create(:resource_pool_vmware, :ext_management_system => ems) }
-    let(:snapshot)  { FactoryBot.create(:snapshot, :ems_ref => "snapshot-1", :ems_ref_type => "Snapshot") }
+    let(:snapshot)  { FactoryBot.create(:snapshot_vmware) }
     let(:datastore) { FactoryBot.create(:storage_vmware, :ext_management_system => ems) }
 
     let(:clone_options) do

spec/models/manageiq/providers/vmware/infra_manager/refresher_spec.rb

@@ -384,6 +384,7 @@
 
         expect(vm.snapshots.count).to eq(1)
         expect(vm.snapshots.first).to have_attributes(
+          :type        => "ManageIQ::Providers::Vmware::InfraManager::Snapshot",
           :uid_ems     => "2018-05-19T06:47:56.000000Z",
           :uid         => "2018-05-19T06:47:56.000000Z",
           :parent_uid  => nil,