Merge pull request #279 from jntullo/allow_provider_attributes

Allow additional provider parameters to be specified on create
ManageIQ · Feb 14, 2018 · 6983681 · 6983681
2 parents b3a2bf8 + feeaa6c
commit 6983681
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/app/controllers/api/providers_controller.rb b/app/controllers/api/providers_controller.rb
@@ -177,7 +177,7 @@ def validate_credential_attributes(provider, creds)
     def fetch_provider_data(provider_klass, data, options = {})
       data["options"] = data["options"].deep_symbolize_keys if data.key?("options")
       provider_data = data.except(*RESTRICTED_ATTRS)
-      invalid_keys  = provider_data.keys - provider_klass.columns_hash.keys - ENDPOINT_ATTRS - CONNECTION_ATTRS
+      invalid_keys  = provider_data.keys - provider_klass.columns_hash.keys - ENDPOINT_ATTRS - CONNECTION_ATTRS - provider_klass.api_allowed_attributes
       raise BadRequestError, "Invalid Provider attributes #{invalid_keys.join(', ')} specified" if invalid_keys.present?
       specify_zone(provider_data, data, options)
       provider_data

diff --git a/spec/requests/providers_spec.rb b/spec/requests/providers_spec.rb
@@ -455,6 +455,25 @@ def have_endpoint_attributes(expected_hash)
         .and_return([OvirtSDK4::ProbeResult.new(:version => '3')])
     end
 
+    it 'allows provider specific attributes to be specified' do
+      allow(ManageIQ::Providers::Azure::CloudManager).to receive(:api_allowed_attributes).and_return(%w(azure_tenant_id))
+      tenant = FactoryGirl.create(:cloud_tenant)
+      api_basic_authorize collection_action_identifier(:providers, :create)
+
+      post(api_providers_url, :params => { "type"            => "ManageIQ::Providers::Azure::CloudManager",
+                                           "name"            => "sample azure provider",
+                                           "hostname"        => "hostname",
+                                           "zone"            => @zone,
+                                           "azure_tenant_id" => tenant.id,
+                                           "credentials"     => {}})
+
+      expected = {
+        "results" => [a_hash_including("uid_ems" => tenant.id.to_s, "name" => "sample azure provider")]
+      }
+      expect(response).to have_http_status(:ok)
+      expect(response.parsed_body).to include(expected)
+    end
+
     it "rejects creation without appropriate role" do
       api_basic_authorize