Merge "LOG SQL dump files getting installed"

[sdnc/oam.git] / dgbuilder / red / server.js

diff --git a/dgbuilder/red/server.js b/dgbuilder/red/server.js
index 01a769e..91bee45 100644 (file)
--- a/dgbuilder/red/server.js
+++ b/dgbuilder/red/server.js
@@ -950,11 +950,11 @@ function createServer(_server,_settings) {
                                //console.log("settingsStr:" + settingsStr);
                                fs.writeFileSync(settingsFile,settingsStr);
                                var svcLogicPropStr = "" ;
-                                       svcLogicPropStr += "org.openecomp.sdnc.sli.dbtype=jdbc" + "\n";
-                                       svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.url=jdbc:mysql://" + dbHost + ":" + dbPort + "/" + dbName + "\n";
-                                       svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.database=" + dbName + "\n";
-                                       svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.user=" + dbUser  + "\n";
-                                       svcLogicPropStr += "org.openecomp.sdnc.sli.jdbc.password=" + dbPassword;
+                                       svcLogicPropStr += "org.onap.ccsdk.sli.dbtype=jdbc" + "\n";
+                                       svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://" + dbHost + ":" + dbPort + "/" + dbName + "\n";
+                                       svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.database=" + dbName + "\n";
+                                       svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.user=" + dbUser  + "\n";
+                                       svcLogicPropStr += "org.onap.ccsdk.sli.jdbc.password=" + dbPassword;
                                
                                //create svclogic.properties file in the conf dir
                                var svcPropFile = userDir + "/conf/svclogic.properties";
@@ -1084,7 +1084,8 @@ function createServer(_server,_settings) {
                                var matchedArr = fileName.match(/.zip$/);
                                if(matchedArr != null && matchedArr.length >0){
                                        console.log("uploaded zip file" + fileName);
-                                       commandToExec = appDir + "/tools/generate_props_from_yangs_zip.sh " + yangFileFullPath ;
+                                       //commandToExec = appDir + "/tools/generate_props_from_yangs_zip.sh " + yangFileFullPath ;
+                                       commandToExec = appDir + "/tools/generate_props_from_yang.sh " + yangFileFullPath ;
                                }else{
                                        commandToExec = appDir + "/tools/generate_props_from_yang.sh " + yangFileFullPath ;
                                        console.log("uploaded file" + fileName);