Refs #36745 - VM is not associated upon host registration

theforeman · May 16, 2024 · 8dbfff0 · 8dbfff0
1 parent 6bdd117
commit 8dbfff0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/app/models/compute_resource.rb b/app/models/compute_resource.rb
@@ -457,6 +457,10 @@ def associate_by(name, attributes)
       first
   end
 
+  def associated_vm(host)
+    vms(:eager_loading => true).find { |vm| associate_by_host("mac", vm.interfaces.map(&:mac), host) }
+  end
+
   def associate_by_host(name, attributes, host)
     attributes = Array.wrap(attributes).map { |mac| Net::Validations.normalize_mac(mac) } if name == 'mac'
     Host.authorized(:view_hosts, Host).where(:id => host.id).joins(:primary_interface).

diff --git a/app/models/compute_resources/foreman/model/libvirt.rb b/app/models/compute_resources/foreman/model/libvirt.rb
@@ -200,10 +200,6 @@ def associated_host(vm)
       associate_by("mac", vm.interfaces.map(&:mac))
     end
 
-    def associated_vm(host)
-      vms(:eager_loading => true).find { |vm| associate_by_host("mac", vm.interfaces.map(&:mac), host) }
-    end
-
     def vm_compute_attributes_for(uuid)
       vm_attrs = super
       if vm_attrs[:memory_size].nil?

diff --git a/app/models/compute_resources/foreman/model/ovirt.rb b/app/models/compute_resources/foreman/model/ovirt.rb
@@ -412,10 +412,6 @@ def associated_host(vm)
       associate_by("mac", vm.interfaces.map(&:mac))
     end
 
-    def associated_vm(host)
-      vms(:eager_loading => true).find { |vm| associate_by_host("mac", vm.interfaces.map(&:mac), host) }
-    end
-
     def self.provider_friendly_name
       "oVirt"
     end

diff --git a/app/models/compute_resources/foreman/model/vmware.rb b/app/models/compute_resources/foreman/model/vmware.rb
@@ -661,10 +661,6 @@ def associated_host(vm)
       associate_by("mac", vm.interfaces.map(&:mac))
     end
 
-    def associated_vm(host)
-      vms(:eager_loading => true).find { |vm| associate_by_host("mac", vm.interfaces.map(&:mac), host) }
-    end
-
     def display_type
       attrs[:display] || 'vmrc'
     end