Allow configurable database name

Change-Id: I967df28f2f5281e7eee6a03087a279cbbe9f6e3e
Issue-ID: MUSIC-258
Signed-off-by: Tschaen, Brendan <ctschaen@att.com>

diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcServerLogic.java b/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcServerLogic.java
index d00ca35..e35c214 100755 (executable)
--- a/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcServerLogic.java
+++ b/mdbc-server/src/main/java/org/onap/music/mdbc/MdbcServerLogic.java
@@ -57,7 +57,7 @@ public class MdbcServerLogic extends JdbcMeta{
 
        public MdbcServerLogic(String Url, Properties info, NodeConfiguration config) throws SQLException, MDBCServiceException {
                super(Url,info);
-               this.manager = new StateManager(Url,info,config.nodeName, "test"); //FIXME: db name should not be passed in ahead of time
+               this.manager = new StateManager(Url,info,config.nodeName, config.sqlDatabaseName); //FIXME: db name should not be passed in ahead of time
                this.info = info;
         int concurrencyLevel = Integer.parseInt(
                 info.getProperty(ConnectionCacheSettings.CONCURRENCY_LEVEL.key(),

diff --git a/mdbc-server/src/main/java/org/onap/music/mdbc/configurations/NodeConfiguration.java b/mdbc-server/src/main/java/org/onap/music/mdbc/configurations/NodeConfiguration.java
index ad86ada..7a6aad7 100755 (executable)
--- a/mdbc-server/src/main/java/org/onap/music/mdbc/configurations/NodeConfiguration.java
+++ b/mdbc-server/src/main/java/org/onap/music/mdbc/configurations/NodeConfiguration.java
@@ -38,11 +38,13 @@ public class NodeConfiguration {
 
     public DatabasePartition partition;
     public String nodeName;
+    public String sqlDatabaseName;
 
-    public NodeConfiguration(String tables, UUID mriIndex, String mriTableName, String node){
+    public NodeConfiguration(String tables, UUID mriIndex, String sqlDatabaseName, String node){
         //     public DatabasePartition(List<Range> knownRanges, UUID mriIndex, String mriTable, String lockId, String musicTxDigestTable) {
         partition = new DatabasePartition(toRanges(tables), mriIndex, null) ;
         this.nodeName = node;
+        this.sqlDatabaseName = sqlDatabaseName;
     }
 
     protected List<Range> toRanges(String tables){