retrofitted tenant data store info
diff --git a/src/main/java/io/mifos/dev/TenantBuilder.java b/src/main/java/io/mifos/dev/TenantBuilder.java
index 7880cec..766bdaf 100644
--- a/src/main/java/io/mifos/dev/TenantBuilder.java
+++ b/src/main/java/io/mifos/dev/TenantBuilder.java
@@ -1,5 +1,8 @@
package io.mifos.dev;
+import io.mifos.core.cassandra.util.CassandraConnectorConstants;
+import io.mifos.core.mariadb.util.MariaDBConstants;
+import io.mifos.core.test.env.TestEnvironment;
import io.mifos.provisioner.api.v1.domain.CassandraConnectionInfo;
import io.mifos.provisioner.api.v1.domain.DatabaseConnectionInfo;
import io.mifos.provisioner.api.v1.domain.Tenant;
@@ -11,7 +14,7 @@
super();
}
- static Tenant create(final String identifier, final String name, final String databaseName) {
+ static Tenant create(final TestEnvironment testEnvironment, final String identifier, final String name, final String databaseName) {
final Tenant tenant = new Tenant();
tenant.setIdentifier(identifier);
tenant.setName(name);
@@ -21,15 +24,15 @@
databaseConnectionInfo.setDriverClass("org.mariadb.jdbc.Driver");
databaseConnectionInfo.setDatabaseName(databaseName);
- databaseConnectionInfo.setHost("localhost");
- databaseConnectionInfo.setPort("3306");
- databaseConnectionInfo.setUser("root");
- databaseConnectionInfo.setPassword("mysql");
+ databaseConnectionInfo.setHost(testEnvironment.getProperty(MariaDBConstants.MARIADB_HOST_PROP));
+ databaseConnectionInfo.setPort(testEnvironment.getProperty(MariaDBConstants.MARIADB_PORT_PROP));
+ databaseConnectionInfo.setUser(testEnvironment.getProperty(MariaDBConstants.MARIADB_USER_PROP));
+ databaseConnectionInfo.setPassword(testEnvironment.getProperty(MariaDBConstants.MARIADB_PASSWORD_PROP));
tenant.setDatabaseConnectionInfo(databaseConnectionInfo);
final CassandraConnectionInfo cassandraConnectionInfo = new CassandraConnectionInfo();
- cassandraConnectionInfo.setClusterName("Test Cluster");
- cassandraConnectionInfo.setContactPoints("127.0.0.1:9142");
+ cassandraConnectionInfo.setClusterName(CassandraConnectorConstants.CLUSTER_NAME_PROP);
+ cassandraConnectionInfo.setContactPoints(testEnvironment.getProperty(CassandraConnectorConstants.CONTACT_POINTS_PROP));
cassandraConnectionInfo.setKeyspace(databaseName);
cassandraConnectionInfo.setReplicas("3");
cassandraConnectionInfo.setReplicationType("Simple");