Merge pull request #14416 from mkanoor/add_to_service

Add a add_to_service method to Vm

app/models/vm.rb

@@ -32,6 +32,10 @@ def validate_remote_console_vmrc_support
           _("VMRC remote console is not supported on %{vendor}.") % {:vendor => vendor})
   end
 
+  def add_to_service(service)
+    service.add_resource!(self)
+  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?
 

lib/miq_automation_engine/service_models/miq_ae_service_vm.rb

@@ -6,7 +6,7 @@ def remote_console_url=(url)
 
     def add_to_service(service)
       raise ArgumentError, "service must be a MiqAeServiceService" unless service.kind_of?(MiqAeMethodService::MiqAeServiceService)
-      ar_method { wrap_results(Service.find_by(:id => service.id).add_resource!(@object)) }
+      ar_method { wrap_results(@object.add_to_service(Service.find_by(:id => service.id))) }
     end
 
     def remove_from_service

spec/models/vm_spec.rb

@@ -262,4 +262,13 @@
     expect(console.url).to eq(url)
     expect(console.url_secret).to be
   end
+
+  it '#add_to_service' do
+    vm = FactoryGirl.create(:vm_vmware)
+    service = FactoryGirl.create(:service)
+
+    vm.add_to_service(service)
+    service.reload
+    expect(service.vms.count).to eq(1)
+  end
 end