Merge pull request crowbar#1102 from jsuchome/unify-values

Unify values we save in progress library to symbols

Author: jsuchome

crowbar_framework/app/controllers/api/upgrade_controller.rb

@@ -152,11 +152,11 @@ def nodes
         # When controller nodes have been upgraded previously,
         # whole 'nodes' step was not actually finished, just a substep.
         # It makes sense at this time to upgrade the rest with 'all'.
-        unless substep == "controllers" && status == "finished"
+        unless substep == :controller_nodes && status == :finished
           ::Crowbar::UpgradeStatus.new.start_step(:nodes)
         end
       else
-        if substep != "computes" && status != "finished"
+        if substep != :compute_nodes && status != :finished
           raise ::Crowbar::Error::UpgradeError.new(
             "Controller nodes must be upgraded first!"
           )
@@ -169,7 +169,7 @@ def nodes
           )
         end
 
-        if substep == "computes" && status == "running"
+        if substep == :compute_nodes && status == :running
           n = upgrade_status.progress[:current_node]
           raise ::Crowbar::Error::UpgradeError.new(
             "Upgrade of node '#{n[:name]}' is already running. " \
@@ -178,7 +178,7 @@ def nodes
         end
         # If the 'nodes' step did not fail, it is still running and user can continue
         # with upgrading single compute node.
-        if substep == "computes" && status == "failed"
+        if substep == :compute_nodes && status == :failed
           Rails.logger.info("Restarting the 'nodes' step after previous failure")
           ::Crowbar::UpgradeStatus.new.start_step(:nodes)
         end

crowbar_framework/app/models/api/upgrade.rb

@@ -554,55 +554,55 @@ def nodes(component = "all")
         end
 
         if substep.nil? || substep.empty?
-          substep = "controllers"
+          substep = :controller_nodes
         end
 
-        if substep == "controllers" && substep_status == "finished"
-          substep = "computes"
+        if substep == :controller_nodes && substep_status == :finished
+          substep = :compute_nodes
         end
 
         # decide what needs to be upgraded
         case component
         # Upgrade everything
         when "all"
-          if substep == "controllers"
-            ::Crowbar::UpgradeStatus.new.save_substep(substep, "running")
+          if substep == :controller_nodes
+            ::Crowbar::UpgradeStatus.new.save_substep(substep, :running)
             upgrade_controller_clusters
             prepare_all_compute_nodes
-            ::Crowbar::UpgradeStatus.new.save_substep(substep, "finished")
-            substep = "computes"
+            ::Crowbar::UpgradeStatus.new.save_substep(substep, :finished)
+            substep = :compute_nodes
           end
-          if substep == "computes"
-            ::Crowbar::UpgradeStatus.new.save_substep(substep, "running")
+          if substep == :compute_nodes
+            ::Crowbar::UpgradeStatus.new.save_substep(substep, :running)
             upgrade_all_compute_nodes
             finalize_nodes_upgrade
-            ::Crowbar::UpgradeStatus.new.save_substep(substep, "finished")
+            ::Crowbar::UpgradeStatus.new.save_substep(substep, :finished)
             ::Crowbar::UpgradeStatus.new.end_step
           end
         # Upgrade controller clusters only
         when "controllers"
-          if substep == "controllers"
-            ::Crowbar::UpgradeStatus.new.save_substep(substep, "running")
+          if substep == :controller_nodes
+            ::Crowbar::UpgradeStatus.new.save_substep(substep, :running)
             upgrade_controller_clusters
             prepare_all_compute_nodes
-            ::Crowbar::UpgradeStatus.new.save_substep(substep, "finished")
+            ::Crowbar::UpgradeStatus.new.save_substep(substep, :finished)
           end
         # Upgrade given compute node
         else
-          ::Crowbar::UpgradeStatus.new.save_substep(substep, "running")
+          ::Crowbar::UpgradeStatus.new.save_substep(substep, :running)
           upgrade_one_compute_node(component)
-          ::Crowbar::UpgradeStatus.new.save_substep(substep, "node finished")
+          ::Crowbar::UpgradeStatus.new.save_substep(substep, :node_finished)
 
           # if we're done with the last one, finalize
           progress = ::Crowbar::UpgradeStatus.new.progress
           if progress[:remaining_nodes].zero?
-            ::Crowbar::UpgradeStatus.new.save_substep(substep, "finished")
+            ::Crowbar::UpgradeStatus.new.save_substep(substep, :finished)
             finalize_nodes_upgrade
             ::Crowbar::UpgradeStatus.new.end_step
           end
         end
       rescue ::Crowbar::Error::Upgrade::NodeError => e
-        ::Crowbar::UpgradeStatus.new.save_substep(substep, "failed")
+        ::Crowbar::UpgradeStatus.new.save_substep(substep, :failed)
         ::Crowbar::UpgradeStatus.new.end_step(
           false,
           nodes: {
@@ -612,7 +612,7 @@ def nodes(component = "all")
         )
       rescue StandardError => e
         # end the step even for non-upgrade error, so we are not stuck with 'running'
-        ::Crowbar::UpgradeStatus.new.save_substep(substep, "failed")
+        ::Crowbar::UpgradeStatus.new.save_substep(substep, :failed)
         ::Crowbar::UpgradeStatus.new.end_step(
           false,
           nodes: {

crowbar_framework/spec/lib/crowbar/upgrade_status_spec.rb

@@ -300,9 +300,9 @@
       expect(subject.progress[:remaining_nodes]).to be nil
       expect(subject.progress[:upgraded_nodes]).to be nil
 
-      expect(subject.save_substep(:controllers, "running")).to be true
+      expect(subject.save_substep(:controllers, :running)).to be true
       expect(subject.current_substep).to eql :controllers
-      expect(subject.current_substep_status).to eql "running"
+      expect(subject.current_substep_status).to eql :running
       expect(subject.progress).to_not be_empty
       expect(subject.save_current_node(current_node)).to be true
       expect(subject.progress[:current_node][:name]).to be current_node[:name]