Fixes #23859 - Fix vm_exists? method

Fix related tests
theforeman · Jun 10, 2018 · f57d42f · f57d42f
1 parent 2a6bce4
commit f57d42f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/app/models/concerns/orchestration/compute.rb b/app/models/concerns/orchestration/compute.rb
@@ -350,7 +350,7 @@ def match_macs_to_nics(fog_attr)
   end
 
   def vm_exists?
-    return true unless compute_object
-    !compute_object.persisted?
+    return false unless compute_object
+    compute_object.persisted?
   end
 end
diff --git a/test/models/host_test.rb b/test/models/host_test.rb
@@ -2392,7 +2392,7 @@ def to_managed!
         :compute_resource => compute_resources(:ec2),
         :organization => nil,
         :location => nil)
-      host.stubs(:vm_exists?).returns(true)
+      host.stubs(:vm_exists?).returns(false)
       host.expects(:queue_compute_create)
       assert host.valid?, host.errors.full_messages.to_sentence
       assert_equal compute_attributes(:one).vm_attrs, host.compute_attributes
@@ -2404,7 +2404,7 @@ def to_managed!
         :compute_profile => compute_profiles(:two),
         :organization => nil,
         :location => nil)
-      host.stubs(:vm_exists?).returns(true)
+      host.stubs(:vm_exists?).returns(false)
       host.expects(:queue_compute_create)
       assert host.valid?, host.errors.full_messages.to_sentence
       assert_equal compute_attributes(:three).vm_attrs, host.compute_attributes
@@ -3465,7 +3465,7 @@ def to_managed!
     end
 
     test "should create host with compute profile when compute_attributes are empty" do
-      @host.stubs(:vm_exists?).returns(true)
+      @host.stubs(:vm_exists?).returns(false)
       @host.compute_resource.expects(:create_vm).once.with do |vm_attrs|
         vm_attrs['flavor_id'] == @compute_attrs.vm_attrs['flavor_id'] &&
         vm_attrs['availability_zone'] == @compute_attrs.vm_attrs['availability_zone']
@@ -3477,7 +3477,7 @@ def to_managed!
 
     test "should create host with compute profile when compute_attributes are nil" do
       @host.compute_attributes = nil
-      @host.stubs(:vm_exists?).returns(true)
+      @host.stubs(:vm_exists?).returns(false)
       @host.compute_resource.expects(:create_vm).once.with do |vm_attrs|
         vm_attrs['flavor_id'] == @compute_attrs.vm_attrs['flavor_id'] &&
         vm_attrs['availability_zone'] == @compute_attrs.vm_attrs['availability_zone']
@@ -3503,7 +3503,7 @@ def to_managed!
         vm_attrs['flavor_id'].nil? &&
         vm_attrs['availability_zone'].nil?
       end
-      @host.stubs(:vm_exists?).returns(true)
+      @host.stubs(:vm_exists?).returns(false)
 
       @host.valid?
       @host.send(:setCompute)

diff --git a/test/models/orchestration/compute_test.rb b/test/models/orchestration/compute_test.rb
@@ -210,7 +210,7 @@ def expected_message(identifier)
 
     test 'should queue compute orchestration' do
       host.compute_resource.stubs(:provided_attributes).returns({:mac => :mac})
-      host.stubs(:vm_exists?).returns(true)
+      host.stubs(:vm_exists?).returns(false)
       assert_valid host
       tasks = host.queue.all.map(&:name)
       assert_includes tasks, "Set up compute instance #{host.provision_interface}"
@@ -258,7 +258,7 @@ def expected_message(identifier)
 
     test 'should queue ipam and dns orchestration' do
       host.compute_resource.stubs(:provided_attributes).returns({:mac => :mac})
-      host.stubs(:vm_exists?).returns(true)
+      host.stubs(:vm_exists?).returns(false)
       assert_valid host
       tasks = host.queue.all.map(&:name)
       assert_includes tasks, "Set up compute instance #{host.provision_interface}"