Create/Update/Delete Ansible Tower Projects and Credentials via queue

app/models/manageiq/providers/ansible_tower/shared/automation_manager/configuration_script_source.rb

@@ -8,36 +8,68 @@ def create_in_provider(manager_id, params)
         connection.api.projects.create!(params)
       end
 
+      refresh(manager)
+      find_by!(:manager_id => manager.id, :manager_ref => project.id)
+    end
+
+    def create_in_provider_queue(manager_id, params)
+      manager = ExtManagementSystem.find(manager_id)
+      queue(manager.my_zone, nil, "create_in_provider", [manager_id, params], "Creating #{name}")
+    end
+
+    def provider_object(connection = nil)
+      (connection || connection_source.connect).api.projects.find(manager_ref)
+    end
+
+    private
+
+    def refresh(manager)
       # Get the record in our database
       # TODO: This needs to be targeted refresh so it doesn't take too long
       task_ids = EmsRefresh.queue_refresh_task(manager)
       task_ids.each { |tid| MiqTask.wait_for_taskid(tid) }
-
-      find_by!(:manager_id => manager.id, :manager_ref => project.id)
     end
 
-    def create_in_provider_queue(manager_id, params)
+    def queue(zone, instance_id, method_name, args, action)
       task_opts = {
-        :action => "Creating Ansible Tower Project",
+        :action => action,
         :userid => "system"
       }
 
-      manager = ExtManagementSystem.find(manager_id)
-
       queue_opts = {
-        :args        => [manager_id, params],
-        :class_name  => "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource",
-        :method_name => "create_in_provider",
+        :args        => args,
+        :class_name  => name,
+        :method_name => method_name,
         :priority    => MiqQueue::HIGH_PRIORITY,
         :role        => "ems_operations",
-        :zone        => manager.my_zone
+        :zone        => zone
       }
-
+      queue_opts[:instance_id] = instance_id if instance_id
       MiqTask.generic_action_with_callback(task_opts, queue_opts)
     end
+  end
 
-    def provider_object(connection = nil)
-      (connection || connection_source.connect).api.projects.find(manager_ref)
+  def update_in_provider(params)
+    params.delete(:task_id) # in case this is being called through update_in_provider_queue which will stick in a :task_id
+    manager.with_provider_connection do |connection|
+      connection.api.projects.find(manager_ref).update_attributes!(params)
     end
+    self.class.send('refresh', manager)
+    reload
+  end
+
+  def update_in_provider_queue(params)
+    self.class.send('queue', manager.my_zone, id, "update_in_provider", [params], "Updating #{self.class.name}")
+  end
+
+  def delete_in_provider
+    manager.with_provider_connection do |connection|
+      connection.api.projects.find(manager_ref).destroy!
+    end
+    self.class.send('refresh', manager)
+  end
+
+  def delete_in_provider_queue
+    self.class.send('queue', manager.my_zone, id, "delete_in_provider", [], "Deleting #{self.class.name}")
   end
 end

app/models/manageiq/providers/ansible_tower/shared/automation_manager/credential.rb

@@ -8,32 +8,64 @@ def create_in_provider(manager_id, params)
         connection.api.credentials.create!(params)
       end
 
+      refresh(manager)
+      find_by!(:resource_id => manager.id, :manager_ref => credential.id)
+    end
+
+    def create_in_provider_queue(manager_id, params)
+      manager = ExtManagementSystem.find(manager_id)
+      queue(manager.my_zone, nil, "create_in_provider", [manager_id, params], "Creating #{name}")
+    end
+
+    private
+
+    def refresh(manager)
       # Get the record in our database
       # TODO: This needs to be targeted refresh so it doesn't take too long
       task_ids = EmsRefresh.queue_refresh_task(manager)
       task_ids.each { |tid| MiqTask.wait_for_taskid(tid) }
-
-      find_by!(:resource_id => manager.id, :manager_ref => credential.id)
     end
 
-    def create_in_provider_queue(manager_id, params)
+    def queue(zone, instance_id, method_name, args, action)
       task_opts = {
-        :action => "Creating #{name}",
+        :action => action,
         :userid => "system"
       }
 
-      manager = ExtManagementSystem.find(manager_id)
-
       queue_opts = {
-        :args        => [manager_id, params],
+        :args        => args,
         :class_name  => name,
-        :method_name => "create_in_provider",
+        :method_name => method_name,
         :priority    => MiqQueue::HIGH_PRIORITY,
         :role        => "ems_operations",
-        :zone        => manager.my_zone
+        :zone        => zone
       }
-
+      queue_opts[:instance_id] = instance_id if instance_id
       MiqTask.generic_action_with_callback(task_opts, queue_opts)
     end
   end
+
+  def update_in_provider(params)
+    params.delete(:task_id) # in case this is being called through update_in_provider_queue which will stick in a :task_id
+    resource.with_provider_connection do |connection|
+      connection.api.credentials.find(manager_ref).update_attributes!(params)
+    end
+    self.class.send('refresh', resource)
+    reload
+  end
+
+  def update_in_provider_queue(params)
+    self.class.send('queue', resource.my_zone, id, "update_in_provider", [params], "Updating #{self.class.name}")
+  end
+
+  def delete_in_provider
+    resource.with_provider_connection do |connection|
+      connection.api.credentials.find(manager_ref).destroy!
+    end
+    self.class.send('refresh', resource)
+  end
+
+  def delete_in_provider_queue
+    self.class.send('queue', resource.my_zone, id, "delete_in_provider", [], "Deleting #{self.class.name}")
+  end
 end

spec/models/manageiq/providers/ansible_tower/automation_manager/configuration_script_source_spec.rb

@@ -1,14 +1,14 @@
 require 'ansible_tower_client'
 
 describe ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource do
+  let(:finished_task) { FactoryGirl.create(:miq_task, :state => "Finished") }
+  let(:manager)       { FactoryGirl.create(:provider_ansible_tower, :with_authentication).managers.first }
+  let(:atc)           { double("AnsibleTowerClient::Connection", :api => api) }
+  let(:api)           { double("AnsibleTowerClient::Api", :projects => projects) }
+
   context "create through API" do
-    let(:finished_task) { FactoryGirl.create(:miq_task, :state => "Finished") }
-    let(:provider)      { FactoryGirl.create(:provider_ansible_tower, :with_authentication) }
-    let(:manager)       { provider.managers.first }
-    let(:atc)           { double("AnsibleTowerClient::Connection", :api => api) }
-    let(:api)           { double("AnsibleTowerClient::Api", :projects => projects) }
-    let(:projects)      { double("AnsibleTowerClient::Collection", :create! => project) }
-    let(:project)       { AnsibleTowerClient::Project.new(nil, project_json) }
+    let(:projects) { double("AnsibleTowerClient::Collection", :create! => project) }
+    let(:project)  { AnsibleTowerClient::Project.new(nil, project_json) }
 
     let(:project_json) do
       params.merge(
@@ -46,7 +46,9 @@
     it ".create_in_provider_queue" do
       EvmSpecHelper.local_miq_server
       task_id = described_class.create_in_provider_queue(manager.id, params)
-      expect(MiqTask.find(task_id)).to have_attributes(:name => "Creating Ansible Tower Project")
+      expect(MiqTask.find(task_id)).to have_attributes(
+        :name => "Creating ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource"
+      )
       expect(MiqQueue.first).to have_attributes(
         :args        => [manager.id, params],
         :class_name  => "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource",
@@ -65,4 +67,56 @@ def store_new_project(project, manager)
       )
     end
   end
+
+  context "Delete through API" do
+    let(:projects)      { double("AnsibleTowerClient::Collection", :find => tower_project) }
+    let(:tower_project) { double("AnsibleTowerClient::Project", :destroy! => nil, :id => 1) }
+    let(:project)       { described_class.create!(:manager => manager, :manager_ref => tower_project.id) }
+
+    it "#delete_in_provider" do
+      expect(AnsibleTowerClient::Connection).to receive(:new).and_return(atc)
+      expect(EmsRefresh).to receive(:queue_refresh_task).and_return([finished_task])
+      project.delete_in_provider
+    end
+
+    it "#delete_in_provider_queue" do
+      task_id = project.delete_in_provider_queue
+      expect(MiqTask.find(task_id)).to have_attributes(:name => "Deleting ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource")
+      expect(MiqQueue.first).to have_attributes(
+        :instance_id => project.id,
+        :args        => [],
+        :class_name  => "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource",
+        :method_name => "delete_in_provider",
+        :priority    => MiqQueue::HIGH_PRIORITY,
+        :role        => "ems_operations",
+        :zone        => manager.my_zone
+      )
+    end
+  end
+
+  context "Update through API" do
+    let(:projects)      { double("AnsibleTowerClient::Collection", :find => tower_project) }
+    let(:tower_project) { double("AnsibleTowerClient::Project", :update_attributes! => {}, :id => 1) }
+    let(:project)       { described_class.create!(:manager => manager, :manager_ref => tower_project.id) }
+
+    it "#update_in_provider" do
+      expect(AnsibleTowerClient::Connection).to receive(:new).and_return(atc)
+      expect(EmsRefresh).to receive(:queue_refresh_task).and_return([finished_task])
+      expect(project.update_in_provider({})).to be_a(described_class)
+    end
+
+    it "#update_in_provider_queue" do
+      task_id = project.update_in_provider_queue({})
+      expect(MiqTask.find(task_id)).to have_attributes(:name => "Updating ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource")
+      expect(MiqQueue.first).to have_attributes(
+        :instance_id => project.id,
+        :args        => [{:task_id => task_id}],
+        :class_name  => "ManageIQ::Providers::AnsibleTower::AutomationManager::ConfigurationScriptSource",
+        :method_name => "update_in_provider",
+        :priority    => MiqQueue::HIGH_PRIORITY,
+        :role        => "ems_operations",
+        :zone        => manager.my_zone
+      )
+    end
+  end
 end

spec/models/manageiq/providers/ansible_tower/automation_manager/credential_spec.rb

@@ -1,12 +1,12 @@
 require 'ansible_tower_client'
 
 describe ManageIQ::Providers::AnsibleTower::AutomationManager::Credential do
+  let(:finished_task) { FactoryGirl.create(:miq_task, :state => "Finished") }
+  let(:manager)       { FactoryGirl.create(:provider_ansible_tower, :with_authentication).managers.first }
+  let(:atc)           { double("AnsibleTowerClient::Connection", :api => api) }
+  let(:api)           { double("AnsibleTowerClient::Api", :credentials => credentials) }
+
   context "Create through API" do
-    let(:finished_task) { FactoryGirl.create(:miq_task, :state => "Finished") }
-    let(:provider)      { FactoryGirl.create(:provider_ansible_tower, :with_authentication) }
-    let(:manager)       { provider.managers.first }
-    let(:atc)           { double("AnsibleTowerClient::Connection", :api => api) }
-    let(:api)           { double("AnsibleTowerClient::Api", :credentials => credentials) }
     let(:credentials)   { double("AnsibleTowerClient::Collection", :create! => credential) }
     let(:credential)    { AnsibleTowerClient::Credential.new(nil, credential_json) }
 
@@ -42,7 +42,6 @@
     end
 
     it ".create_in_provider_queue" do
-      EvmSpecHelper.local_miq_server
       task_id = described_class.create_in_provider_queue(manager.id, params)
       expect(MiqTask.find(task_id)).to have_attributes(:name => "Creating ManageIQ::Providers::AnsibleTower::AutomationManager::Credential")
       expect(MiqQueue.first).to have_attributes(
@@ -63,4 +62,56 @@ def store_new_credential(credential, manager)
       )
     end
   end
+
+  context "Delete through API" do
+    let(:credentials)   { double("AnsibleTowerClient::Collection", :find => credential) }
+    let(:credential)    { double("AnsibleTowerClient::Credential", :destroy! => nil, :id => 1) }
+    let(:ansible_cred)  { described_class.create!(:resource => manager, :manager_ref => credential.id) }
+
+    it "#delete_in_provider" do
+      expect(AnsibleTowerClient::Connection).to receive(:new).and_return(atc)
+      expect(EmsRefresh).to receive(:queue_refresh_task).and_return([finished_task])
+      ansible_cred.delete_in_provider
+    end
+
+    it "#delete_in_provider_queue" do
+      task_id = ansible_cred.delete_in_provider_queue
+      expect(MiqTask.find(task_id)).to have_attributes(:name => "Deleting ManageIQ::Providers::AnsibleTower::AutomationManager::Credential")
+      expect(MiqQueue.first).to have_attributes(
+        :instance_id => ansible_cred.id,
+        :args        => [],
+        :class_name  => "ManageIQ::Providers::AnsibleTower::AutomationManager::Credential",
+        :method_name => "delete_in_provider",
+        :priority    => MiqQueue::HIGH_PRIORITY,
+        :role        => "ems_operations",
+        :zone        => manager.my_zone
+      )
+    end
+  end
+
+  context "Update through API" do
+    let(:credentials)   { double("AnsibleTowerClient::Collection", :find => credential) }
+    let(:credential)    { double("AnsibleTowerClient::Credential", :update_attributes! => {}, :id => 1) }
+    let(:ansible_cred)  { described_class.create!(:resource => manager, :manager_ref => credential.id) }
+
+    it "#update_in_provider" do
+      expect(AnsibleTowerClient::Connection).to receive(:new).and_return(atc)
+      expect(EmsRefresh).to receive(:queue_refresh_task).and_return([finished_task])
+      expect(ansible_cred.update_in_provider({})).to be_a(described_class)
+    end
+
+    it "#update_in_provider_queue" do
+      task_id = ansible_cred.update_in_provider_queue({})
+      expect(MiqTask.find(task_id)).to have_attributes(:name => "Updating ManageIQ::Providers::AnsibleTower::AutomationManager::Credential")
+      expect(MiqQueue.first).to have_attributes(
+        :instance_id => ansible_cred.id,
+        :args        => [{:task_id => task_id}],
+        :class_name  => "ManageIQ::Providers::AnsibleTower::AutomationManager::Credential",
+        :method_name => "update_in_provider",
+        :priority    => MiqQueue::HIGH_PRIORITY,
+        :role        => "ems_operations",
+        :zone        => manager.my_zone
+      )
+    end
+  end
 end