Merge pull request #331 from billfitzgerald0120/retirement_remove_ini…

…tialized

Remove check for a state of initialized in 4 start_retirement methods.

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

@@ -22,11 +22,6 @@
   exit MIQ_ABORT
 end
 
-unless stack.retirement_initialized?
-  $evm.log('error', "Stack has not been initialized for retirement. Aborting current State Machine.")
-  exit MIQ_ABORT
-end
-
 $evm.log('info', "Stack before start_retirement: #{stack.inspect} ")
 $evm.create_notification(:type => :vm_retiring, :subject => stack)
 

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

@@ -40,10 +40,6 @@ def vm_validation
                   if @vm.retiring?
                     raise 'VM is already in the process of being retired'
                   end
-
-                  unless @vm.retirement_initialized?
-                    raise 'VM has not been initialized for retirement. Aborting current State Machine.'
-                  end
                 end
 
                 def start_retirement

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

@@ -22,11 +22,6 @@
   exit MIQ_ABORT
 end
 
-unless vm.retirement_initialized?
-  $evm.log('error', "VM has not been initialized for retirement. Aborting current State Machine.")
-  exit MIQ_ABORT
-end
-
 $evm.log('info', "VM before start_retirement: #{vm.inspect} ")
 
 $evm.create_notification(:type => :vm_retiring, :subject => vm)

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

@@ -20,11 +20,6 @@
   exit MIQ_ABORT
 end
 
-unless service.retirement_initialized?
-  $evm.log('error', "Service has not been initialized for retirement. Aborting current State Machine.")
-  exit MIQ_ABORT
-end
-
 $evm.create_notification(:type => :service_retiring, :subject => service)
 service.start_retirement
 

spec/automation/unit/method_validation/orchestration_retirement_spec.rb

@@ -17,15 +17,10 @@
     let(:method_name) { "StartRetirement" }
 
     it "starts a retirement request" do
-      stack.update_attributes(:retirement_state => 'initializing')
       ws
       expect(OrchestrationStack.where(:id => stack.id).first.retirement_state).to eq('retiring')
     end
 
-    it "aborts if not initialized" do
-      expect { ws }.to raise_error(MiqAeException::AbortInstantiation, 'Method exited with rc=MIQ_ABORT')
-    end
-
     it "aborts if stack is already retired" do
       stack.update_attributes(:retired => true)
       expect { ws }.to raise_error(MiqAeException::AbortInstantiation, 'Method exited with rc=MIQ_ABORT')

spec/content/automate/ManageIQ/Cloud/VM/Retirement/StateMachines/Methods.class/__methods__/start_retirement_spec.rb

@@ -34,7 +34,6 @@
     allow(ae_service).to receive(:create_notification)
     expect(ae_service).to receive(:create_notification).with(:type => :vm_retiring, :subject => svc_vm)
     expect(svc_vm).to receive(:start_retirement)
-    svc_vm.retirement_state = 'initializing'
     expect { described_class.new(ae_service).main }.to_not raise_error
   end
 end