Merge pull request #2770 from agrare/fix_vmware_infra_credential_vali…

…dation

Explicitly disable broker for vSphere validation

app/controllers/mixins/ems_common_angular.rb

@@ -156,7 +156,7 @@ def get_task_args(ems)
           :metrics_database => params[:metrics_database_name],
         }]
       when 'ManageIQ::Providers::Vmware::InfraManager'
-        [{:pass => password, :user => user, :ip => params[:default_hostname]}]
+        [{:pass => password, :user => user, :ip => params[:default_hostname], :use_broker => false}]
       when 'ManageIQ::Providers::Nuage::NetworkManager'
         endpoint_opts = {:protocol => params[:default_security_protocol], :hostname => params[:default_hostname], :api_port => params[:default_api_port], :api_version => params[:api_version]}
         [user, params[:default_password], endpoint_opts]

spec/controllers/ems_cloud_controller_spec.rb

@@ -349,6 +349,17 @@
         expect(mocked_class).to receive(:validate_credentials_task)
         controller.send(:create_ems_button_validate)
       end
+
+      context "vmware infrastructure manager" do
+        let(:mocked_class) { ManageIQ::Providers::Vmware::InfraManager }
+        let(:mocked_class_controller) { "ems_infra" }
+
+        it "disables the broker" do
+          expected_validate_args = [{:pass => nil, :user => nil, :ip => nil, :use_broker => false}]
+          expect(mocked_class).to receive(:validate_credentials_task).with(expected_validate_args, nil, nil)
+          controller.send(:create_ems_button_validate)
+        end
+      end
     end
 
     context "with a container manager" do