Fix API request scheme for preemptible flag when provisioning

ManageIQ · Aug 28, 2018 · bdc02f2 · bdc02f2
1 parent 3b86b8c
commit bdc02f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/models/manageiq/providers/google/cloud_manager/provision/cloning.rb b/app/models/manageiq/providers/google/cloud_manager/provision/cloning.rb
@@ -10,14 +10,15 @@ def do_clone_task_check(clone_task_ref)
 
   def prepare_for_clone_task
     clone_options = super
-
     boot_disk = phase_context[:boot_disk]
 
     clone_options[:name]         = dest_name
     clone_options[:disks]        = [boot_disk]
     clone_options[:machine_type] = instance_type.ems_ref
     clone_options[:zone_name]    = dest_availability_zone.ems_ref
-    clone_options[:preemptible]  = get_option(:is_preemptible)
+    clone_options[:scheduling]   = {
+      :preemptible => get_option(:is_preemptible)
+    }
 
     if clone_options[:user_data]
       clone_options[:metadata] = {"user-data"          => Base64.encode64(clone_options[:user_data]),

diff --git a/spec/models/manageiq/providers/google/cloud_manager/provision_spec.rb b/spec/models/manageiq/providers/google/cloud_manager/provision_spec.rb
@@ -30,6 +30,17 @@
         expect(subject).to receive(:userdata_payload).and_return(nil)
         expect(subject.prepare_for_clone_task[:metadata]).to eql(nil)
       end
+
+      it "sets preemptible flag" do
+        subject.options = {:is_preemptible => true}
+        clone_options = subject.prepare_for_clone_task
+
+        expect(clone_options).to include(
+          :scheduling => {
+            :preemptible => true
+          }
+        )
+      end
     end
   end
 end