Merge pull request #13937 from rubenvp8510/ds-parameters

Send data source properties when adding data source operation is performed
ManageIQ · Feb 17, 2017 · 6f61eb2 · 6f61eb2
2 parents ee3e7b9 + 3e63ea7
commit 6f61eb2
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/app/models/manageiq/providers/hawkular/middleware_manager.rb b/app/models/manageiq/providers/hawkular/middleware_manager.rb
@@ -263,16 +263,18 @@ def self.raw_alerts_connect(hostname, port, username, password)
     def add_middleware_datasource(ems_ref, hash)
       with_provider_connection do |connection|
         datasource_data = {
-          :resourcePath   => ems_ref.to_s,
-          :datasourceName => hash[:datasource]["datasourceName"],
-          :xaDatasource   => hash[:datasource]["xaDatasource"],
-          :jndiName       => hash[:datasource]["jndiName"],
-          :driverName     => hash[:datasource]["driverName"],
-          :driverClass    => hash[:datasource]["driverClass"],
-          :connectionUrl  => hash[:datasource]["connectionUrl"],
-          :userName       => hash[:datasource]["userName"],
-          :password       => hash[:datasource]["password"],
-          :securityDomain => hash[:datasource]["securityDomain"]
+          :resourcePath         => ems_ref.to_s,
+          :datasourceName       => hash[:datasource]["datasourceName"],
+          :xaDatasource         => hash[:datasource]["xaDatasource"],
+          :jndiName             => hash[:datasource]["jndiName"],
+          :driverName           => hash[:datasource]["driverName"],
+          :driverClass          => hash[:datasource]["driverClass"],
+          :connectionUrl        => hash[:datasource]["connectionUrl"],
+          :userName             => hash[:datasource]["userName"],
+          :password             => hash[:datasource]["password"],
+          :xaDataSourceClass    => hash[:datasource]["driverClass"],
+          :securityDomain       => hash[:datasource]["securityDomain"],
+          :datasourceProperties => hash[:datasource]["datasourceProperties"]
         }
 
         connection.operations(true).add_datasource(datasource_data) do |on|