Moved Vm#find_all_by_mac_address_and_hostname_and_ipaddress to EvmServer

Author: kbrock

app/models/vm.rb

@@ -44,38 +44,6 @@ def enforce_single_service_parent?
     true
   end
 
-  def self.find_all_by_mac_address_and_hostname_and_ipaddress(mac_address, hostname, ipaddress)
-    return [] if mac_address.blank? && hostname.blank? && ipaddress.blank?
-
-    include = [:vm_or_template]
-    references = []
-    conds = [["hardwares.vm_or_template_id IS NOT NULL"]]
-    if mac_address
-      conds[0] << "guest_devices.address = ?"
-      conds << mac_address
-      include << :nics
-      references << :guest_devices
-    end
-    if hostname
-      conds[0] << "networks.hostname = ?"
-      conds << hostname
-      include << :networks
-      references << :networks
-    end
-    if ipaddress
-      conds[0] << "networks.ipaddress = ?"
-      conds << ipaddress
-      include << :networks
-      references << :networks
-    end
-    conds[0] = "(#{conds[0].join(" AND ")})"
-
-    Hardware.includes(include.uniq)
-            .references(references.uniq)
-            .where(conds)
-            .map(&:vm_or_template).select { |vm| vm.kind_of?(Vm) }
-  end
-
   def running_processes
     pl = {}
     if (reason = unsupported_reason(:collect_running_processes))

lib/workers/evm_server.rb

@@ -186,7 +186,7 @@ def save_local_network_info
 
   def set_local_server_vm
     if @current_server.vm_id.nil?
-      vms = Vm.find_all_by_mac_address_and_hostname_and_ipaddress(@current_server.mac_address, @current_server.hostname, @current_server.ipaddress)
+      vms = Vm.find_vms_by_mac_address_and_hostname_and_ipaddress(@current_server.mac_address, @current_server.hostname, @current_server.ipaddress)
       if vms.length > 1
         _log.warn("Found multiple Vms that may represent this MiqServer: #{vms.collect(&:id).sort.inspect}")
       elsif vms.length == 1
@@ -195,6 +195,38 @@ def set_local_server_vm
     end
   end
 
+  def find_vms_by_mac_address_and_hostname_and_ipaddress(mac_address, hostname, ipaddress)
+    return [] if mac_address.blank? && hostname.blank? && ipaddress.blank?
+
+    include = [:vm_or_template]
+    references = []
+    conds = [["hardwares.vm_or_template_id IS NOT NULL"]]
+    if mac_address
+      conds[0] << "guest_devices.address = ?"
+      conds << mac_address
+      include << :nics
+      references << :guest_devices
+    end
+    if hostname
+      conds[0] << "networks.hostname = ?"
+      conds << hostname
+      include << :networks
+      references << :networks
+    end
+    if ipaddress
+      conds[0] << "networks.ipaddress = ?"
+      conds << ipaddress
+      include << :networks
+      references << :networks
+    end
+    conds[0] = "(#{conds[0].join(" AND ")})"
+
+    Hardware.includes(include.uniq)
+            .references(references.uniq)
+            .where(conds)
+            .map(&:vm_or_template).select { |vm| vm.kind_of?(Vm) }
+  end
+
   def reset_server_runtime_info
     @current_server.update(
       :drb_uri        => nil,

spec/lib/workers/evm_server_spec.rb

@@ -188,4 +188,47 @@
       end
     end
   end
+
+  context "#find_vms_by_mac_address_and_hostname_and_ipaddress (private)" do
+    subject { described_class.new }
+    before do
+      @hardware1 = FactoryBot.create(:hardware)
+      @vm1 = FactoryBot.create(:vm_vmware, :hardware => @hardware1)
+
+      @hardware2 = FactoryBot.create(:hardware)
+      @vm2 = FactoryBot.create(:vm_vmware, :hardware => @hardware2)
+    end
+
+    it "mac_address" do
+      address = "ABCDEFG"
+      guest_device = FactoryBot.create(:guest_device, :address => address, :device_type => "ethernet")
+      @hardware1.guest_devices << guest_device
+
+      expect(subject.send(:find_vms_by_mac_address_and_hostname_and_ipaddress, address, nil, nil))
+        .to eql([@vm1])
+    end
+
+    it "hostname" do
+      hostname = "ABCDEFG"
+      network = FactoryBot.create(:network, :hostname => hostname)
+      @hardware1.networks << network
+
+      expect(subject.send(:find_vms_by_mac_address_and_hostname_and_ipaddress, nil, hostname, nil))
+        .to eql([@vm1])
+    end
+
+    it "ipaddress" do
+      ipaddress = "127.0.0.1"
+      network = FactoryBot.create(:network, :ipaddress => ipaddress)
+      @hardware1.networks << network
+
+      expect(subject.send(:find_vms_by_mac_address_and_hostname_and_ipaddress, nil, nil, ipaddress))
+        .to eql([@vm1])
+    end
+
+    it "returns an empty list when all are blank" do
+      expect(subject.send(:find_vms_by_mac_address_and_hostname_and_ipaddress, nil, nil, nil)).to eq([])
+      expect(subject.send(:find_vms_by_mac_address_and_hostname_and_ipaddress, '', '', '')).to eq([])
+    end
+  end
 end

spec/models/vm_spec.rb

@@ -48,48 +48,6 @@
     expect { vm.validate_native_console_support }.to raise_error MiqException::RemoteConsoleNotSupportedError
   end
 
-  context ".find_all_by_mac_address_and_hostname_and_ipaddress" do
-    before do
-      @hardware1 = FactoryBot.create(:hardware)
-      @vm1 = FactoryBot.create(:vm_vmware, :hardware => @hardware1)
-
-      @hardware2 = FactoryBot.create(:hardware)
-      @vm2 = FactoryBot.create(:vm_vmware, :hardware => @hardware2)
-    end
-
-    it "mac_address" do
-      address = "ABCDEFG"
-      guest_device = FactoryBot.create(:guest_device, :address => address, :device_type => "ethernet")
-      @hardware1.guest_devices << guest_device
-
-      expect(described_class.find_all_by_mac_address_and_hostname_and_ipaddress(address, nil, nil))
-        .to eql([@vm1])
-    end
-
-    it "hostname" do
-      hostname = "ABCDEFG"
-      network = FactoryBot.create(:network, :hostname => hostname)
-      @hardware1.networks << network
-
-      expect(described_class.find_all_by_mac_address_and_hostname_and_ipaddress(nil, hostname, nil))
-        .to eql([@vm1])
-    end
-
-    it "ipaddress" do
-      ipaddress = "127.0.0.1"
-      network = FactoryBot.create(:network, :ipaddress => ipaddress)
-      @hardware1.networks << network
-
-      expect(described_class.find_all_by_mac_address_and_hostname_and_ipaddress(nil, nil, ipaddress))
-        .to eql([@vm1])
-    end
-
-    it "returns an empty list when all are blank" do
-      expect(described_class.find_all_by_mac_address_and_hostname_and_ipaddress(nil, nil, nil)).to eq([])
-      expect(described_class.find_all_by_mac_address_and_hostname_and_ipaddress('', '', '')).to eq([])
-    end
-  end
-
   context "with relationships of multiple types" do
     before do
       @rp        = FactoryBot.create(:resource_pool, :name => "RP")