Fix Service Retirement requests leaving the Service as 'retiring'.

content/automate/ManageIQ/Service/Retirement/StateMachines/Methods.class/__methods__/start_retirement.rb

@@ -20,6 +20,12 @@
   exit MIQ_ABORT
 end
 
+unless $evm.root['service_retire_task']
+  $evm.log(:error, "Service retire task not found")
+  $evm.log(:error, "The old style retirement is incompatible with the new retirement state machine.")
+  exit(MIQ_ABORT)
+end
+
 $evm.create_notification(:type => :service_retiring, :subject => service)
 service.start_retirement
 

content/automate/ManageIQ/Service/Retirement/StateMachines/ServiceRetirement.class/__methods__/update_service_retirement_status.rb

@@ -16,7 +16,7 @@ def main
 
                 if @handle.root['ae_result'] == "error"
                   @handle.create_notification(:level   => "error",
-                                              :subject => task.miq_request,
+                                              :subject => task.try(:miq_request),
                                               :message => "Service Retire Error: #{updated_message}")
                   @handle.log(:error, "Service Retire Error: #{updated_message}")
                 end

spec/content/automate/ManageIQ/Service/Retirement/StateMachines/ServiceRetirement.class/__methods__/update_service_retirement_status_spec.rb

@@ -6,7 +6,8 @@
   let(:miq_server)            { EvmSpecHelper.local_miq_server }
   let(:miq_request_task) do
     FactoryBot.create(:miq_request_task,
-                       :miq_request => request, :state => 'fred')
+                      :miq_request => request,
+                      :state       => 'active')
   end
 
   let(:request) do
@@ -40,7 +41,7 @@
     end
 
     before do
-      allow(ae_service).to receive(:inputs) { {'status' => "fred"} }
+      allow(ae_service).to receive(:inputs) { {'status' => "active"} }
       ae_service.root['ae_result'] = 'ok'
     end
 
@@ -51,7 +52,7 @@
 
     it "request message set properly" do
       described_class.new(ae_service).main
-      msg = "Server [#{miq_server.name}] Step [] Status [fred] Message [] "
+      msg = "Server [#{miq_server.name}] Step [] Status [active] Message [] "
       expect(svc_model_request.reload.message).to eq(msg)
     end
 
@@ -61,4 +62,18 @@
       described_class.new(ae_service).main
     end
   end
+
+  context "without a service retire task" do
+    let(:root_hash)   { {} }
+    let(:root_object) do
+      obj = Spec::Support::MiqAeMockObject.new(root_hash)
+      obj["miq_server"] = svc_model_miq_server
+      obj
+    end
+
+    it "Task not provided" do
+      described_class.new(ae_service).main
+      expect { described_class.new(ae_service).main }.not_to raise_error
+    end
+  end
 end