Tower CUD cares only input of symbolic key

can because of ManageIQ#14685
jameswnl · Apr 10, 2017 · ced7fac · ced7fac
1 parent ea5673b
commit ced7fac
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/app/models/manageiq/providers/ansible_tower/shared/automation_manager/credential.rb b/app/models/manageiq/providers/ansible_tower/shared/automation_manager/credential.rb
@@ -12,7 +12,6 @@ def provider_collection(manager)
 
     def provider_params(params)
       params[:username] = params.delete(:userid) if params.include?(:userid)
-      params[:username] = params.delete('userid') if params.include?('userid')
       params[:kind] = self::TOWER_KIND
       params
     end

diff --git a/app/models/manageiq/providers/ansible_tower/shared/automation_manager/tower_api.rb b/app/models/manageiq/providers/ansible_tower/shared/automation_manager/tower_api.rb
@@ -17,7 +17,7 @@ def create_in_provider(manager_id, params)
 
     def create_in_provider_queue(manager_id, params)
       manager = ExtManagementSystem.find(manager_id)
-      action = "Creating #{name} with name=#{params[:name] || params['name']}"
+      action = "Creating #{name} with name=#{params[:name]}"
       queue(manager.my_zone, nil, "create_in_provider", [manager_id, params], action)
     end
 

diff --git a/spec/support/ansible_shared/automation_manager/credential.rb b/spec/support/ansible_shared/automation_manager/credential.rb
@@ -134,7 +134,7 @@ def store_new_credential(credential, manager)
     let(:credentials)     { double("AnsibleTowerClient::Collection", :find => credential) }
     let(:credential)      { double("AnsibleTowerClient::Credential", :id => 1) }
     let(:ansible_cred)    { described_class.create!(:resource => manager, :manager_ref => credential.id) }
-    let(:params)          { {'userid' => 'john'} }
+    let(:params)          { {:userid => 'john'} }
     let(:expected_params) { {:username => 'john', :kind => described_class::TOWER_KIND} }
     let(:expected_notify) do
       {