Merge pull request #1298 from agrare/fix_snapshot_operations_queue_name

Snapshot Operations should queue_object_action with role=ems_operations

Author: Fryguy

app/controllers/api/subcollections/snapshots.rb

@@ -14,6 +14,7 @@ def snapshots_create_resource(parent, _type, _id, data)
           parent,
           message,
           :method_name => "create_snapshot",
+          :role        => "ems_operations",
           :args        => [data["name"], data["description"], data.fetch("memory", false)]
         )
 
@@ -28,7 +29,7 @@ def delete_resource_snapshots(parent, type, id, _data)
           raise parent.unsupported_reason(:remove_snapshot) unless parent.supports?(:remove_snapshot)
 
           message = "Deleting snapshot #{snapshot.name} for #{snapshot_ident(parent)}"
-          task_id = queue_object_action(parent, message, :method_name => "remove_snapshot", :args => [id])
+          task_id = queue_object_action(parent, message, :method_name => "remove_snapshot", :role => "ems_operations", :args => [id])
           action_result(true, message, :task_id => task_id)
         rescue => e
           action_result(false, e.to_s)
@@ -41,7 +42,7 @@ def snapshots_revert_resource(parent, type, id, _data)
         snapshot = resource_search(id, type)
 
         message = "Reverting to snapshot #{snapshot.name} for #{snapshot_ident(parent)}"
-        task_id = queue_object_action(parent, message, :method_name => "revert_to_snapshot", :args => [id])
+        task_id = queue_object_action(parent, message, :method_name => "revert_to_snapshot", :role => "ems_operations", :args => [id])
         action_result(true, message, :task_id => task_id)
       rescue => e
         action_result(false, e.to_s)

spec/requests/snapshots_spec.rb

@@ -83,6 +83,12 @@
         }
         expect(response.parsed_body).to include(expected)
         expect(response).to have_http_status(:ok)
+
+        queue_item = MiqQueue.find_by(:class_name => vm.class.name, :method_name => "create_snapshot")
+        expect(queue_item).to have_attributes(
+          :zone       => ems.zone_name,
+          :queue_name => ems.queue_name_for_ems_operations
+        )
       end
 
       it "renders a failed action response if snapshotting is not supported" do
@@ -168,8 +174,15 @@
           "task_href" => a_string_matching(api_tasks_url),
           "task_id"   => anything
         }
+
         expect(response.parsed_body).to include(expected)
         expect(response).to have_http_status(:ok)
+
+        queue_item = MiqQueue.find_by(:class_name => vm.class.name, :method_name => "revert_to_snapshot")
+        expect(queue_item).to have_attributes(
+          :zone       => ems.zone_name,
+          :queue_name => ems.queue_name_for_ems_operations
+        )
       end
 
       it "renders a failed action response if reverting is not supported" do
@@ -216,6 +229,12 @@
         }
         expect(response.parsed_body).to include(expected)
         expect(response).to have_http_status(:ok)
+
+        queue_item = MiqQueue.find_by(:class_name => vm.class.name, :method_name => "remove_snapshot")
+        expect(queue_item).to have_attributes(
+          :zone       => ems.zone_name,
+          :queue_name => ems.queue_name_for_ems_operations
+        )
       end
 
       it "renders a failed action response if deleting is not supported" do