Merge "Use exported merged config of config and default config across…

… webController Corresponding changes in core is: https://review.opencontrail.org/#/c/4274/"

webroot/common/api/adminapi.helper.js

@@ -8,7 +8,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils'),
     commonUtils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/common.utils'),
     messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages'),

webroot/common/api/flowCache.api.js

@@ -9,7 +9,7 @@
 
 var assert = require('assert')
     , rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api')
-    , config = require(process.mainModule.exports["corePath"] + '/config/config.global.js')
+    , config = process.mainModule.exports["config"]
     , commonUtils = require(process.mainModule.exports["corePath"] +
                             '/src/serverroot/utils/common.utils')
     , global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global')

webroot/common/api/nwMon.utils.js

@@ -13,7 +13,7 @@ var commonUtils = require(process.mainModule.exports["corePath"] +
     logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils'),
     infraCmn = require('./infra.common.api'),
     assert = require('assert'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     opApiServer = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/opServer.api'),
     async = require('async');
 

webroot/config/bgp/api/admin.api.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     adminapi = module.exports,
     logutils = require(process.mainModule.exports["corePath"] +
                        '/src/serverroot/utils/log.utils'),

webroot/config/common/api/projectconfig.api.js

@@ -14,7 +14,7 @@ var projectconfigapi = module.exports;
 var logutils         = require(process.mainModule.exports["corePath"] +
                                '/src/serverroot/utils/log.utils');
 var commonUtils      = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/common.utils');
-var config           = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config           = process.mainModule.exports["config"];
 var messages         = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages');
 var global           = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global');
 var appErrors        = require(process.mainModule.exports["corePath"] + '/src/serverroot/errors/app.errors.js');

webroot/config/dns/api/virtualdnsconfig.api.js

@@ -16,7 +16,7 @@ var logutils    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config      = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config      = process.mainModule.exports["config"];
 var messages    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/common/messages');
 var global      = require(process.mainModule.exports["corePath"] +

webroot/config/fip/api/fipconfig.api.js

@@ -16,7 +16,7 @@ var logutils     = require(process.mainModule.exports["corePath"] +
                            '/src/serverroot/utils/log.utils');
 var commonUtils  = require(process.mainModule.exports["corePath"] +
                            '/src/serverroot/utils/common.utils');
-var config       = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config       = process.mainModule.exports["config"];
 var messages     = require(process.mainModule.exports["corePath"] +
                            '/src/serverroot/common/messages');
 var global       = require(process.mainModule.exports["corePath"] +
@@ -749,4 +749,4 @@ exports.listFloatingIpPools = listFloatingIpPools;
 exports.createFloatingIp    = createFloatingIp
 exports.deleteFloatingIp    = deleteFloatingIp
 exports.updateFloatingIp    = updateFloatingIp
-exports.listFloatingIpsAsync = listFloatingIpsAsync;
+exports.listFloatingIpsAsync = listFloatingIpsAsync;

webroot/config/ipaddressmanagement/api/ipamconfig.api.js

@@ -16,7 +16,7 @@ var logutils      = require(process.mainModule.exports["corePath"] +
                             '/src/serverroot/utils/log.utils');
 var commonUtils   = require(process.mainModule.exports["corePath"] +
                             '/src/serverroot/utils/common.utils');
-var config        = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config        = process.mainModule.exports["config"];
 var messages      = require(process.mainModule.exports["corePath"] +
                             '/src/serverroot/common/messages');
 var global        = require(process.mainModule.exports["corePath"] +

webroot/config/linklocalservices/api/globalvrouterconfig.api.js

@@ -16,7 +16,7 @@ var logutils    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config      = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config      = process.mainModule.exports["config"];
 var messages    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/common/messages');
 var global      = require(process.mainModule.exports["corePath"] +

webroot/config/logicalrouters/api/logicalroutersconfig.api.js

@@ -17,7 +17,7 @@ var logutils = require(process.mainModule.exports["corePath"] +
                        '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config = process.mainModule.exports["config"];
 var messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages');
 var global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global');
 var appErrors = require(process.mainModule.exports["corePath"] +
@@ -320,4 +320,4 @@ exports.listLogicalRouter = listLogicalRouter;
 exports.readLogicalRouter = readLogicalRouter;
 exports.createLogicalRouter = createLogicalRouter;
 exports.updateLogicalRouter = updateLogicalRouter;
-exports.deleteLogicalRouter = deleteLogicalRouter;
+exports.deleteLogicalRouter = deleteLogicalRouter;

webroot/config/networkpolicies/api/policyconfig.api.js

@@ -15,7 +15,7 @@ var logutils = require(process.mainModule.exports["corePath"] +
                        '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config = process.mainModule.exports["config"];
 var messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages');
 var global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global');
 var appErrors = require(process.mainModule.exports["corePath"] +

webroot/config/physicaldevices/physicalinterfaces/api/physicalinterfacesconfig.api.js

@@ -15,8 +15,7 @@ var logutils    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config      = require(process.mainModule.exports["corePath"] +
-                          '/config/config.global.js');
+var config      = process.mainModule.exports["config"];
 var messages    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/common/messages');
 var global      = require(process.mainModule.exports["corePath"] +

webroot/config/physicaldevices/physicalrouters/api/physicalroutersconfig.api.js

@@ -15,8 +15,7 @@ var logutils    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config      = require(process.mainModule.exports["corePath"] +
-                          '/config/config.global.js');
+var config      = process.mainModule.exports["config"];
 var messages    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/common/messages');
 var global      = require(process.mainModule.exports["corePath"] +
@@ -455,4 +454,4 @@ function validatePhysicalRouterId (request)
  exports.getPhysicalRouters    = getPhysicalRouters; 
  exports.createPhysicalRouters = createPhysicalRouters;
  exports.updatePhysicalRouters = updatePhysicalRouters;
- exports.deletePhysicalRouters = deletePhysicalRouters;
+ exports.deletePhysicalRouters = deletePhysicalRouters;

webroot/config/physicaldevices/virtualrouters/api/virtualroutersconfig.api.js

@@ -15,8 +15,7 @@ var logutils    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config      = require(process.mainModule.exports["corePath"] +
-                          '/config/config.global.js');
+var config      = process.mainModule.exports["config"];
 var messages    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/common/messages');
 var global      = require(process.mainModule.exports["corePath"] +
@@ -167,4 +166,4 @@ exports.getVirtualRouters    = getVirtualRouters;
 exports.createVirtualRouters = createVirtualRouters;
 exports.updateVirtualRouters = updateVirtualRouters;
 exports.deleteVirtualRouters = deleteVirtualRouters;  
-
+

webroot/config/quotas/api/quotasconfig.api.js

@@ -15,8 +15,7 @@ var logutils    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config      = require(process.mainModule.exports["corePath"] +
-                          '/config/config.global.js');
+var config      = process.mainModule.exports["config"];
 var messages    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/common/messages');
 var global      = require(process.mainModule.exports["corePath"] +

webroot/config/securitygroup/api/securitygroupconfig.api.js

@@ -14,7 +14,7 @@ var logutils = require(process.mainModule.exports["corePath"] +
                        '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-//var config = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+//var config = process.mainModule.exports["config"];
 var messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages');
 //var global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global');
 var appErrors = require(process.mainModule.exports["corePath"] +

webroot/config/services/instances/api/serviceinstanceconfig.api.js

@@ -14,7 +14,7 @@ var logutils = require(process.mainModule.exports["corePath"] +
                        '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config = process.mainModule.exports["config"];
 var messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages');
 var global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global');
 var appErrors = require(process.mainModule.exports["corePath"] +

webroot/config/services/template/api/servicetemplateconfig.api.js

@@ -13,7 +13,7 @@ var async = require('async');
 var logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config = process.mainModule.exports["config"];
 var messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages');
 var global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global');
 var appErrors = require(process.mainModule.exports["corePath"] +

webroot/config/vn/api/vnconfig.api.js

@@ -16,7 +16,7 @@ var logutils    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/log.utils');
 var commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils');
-var config      = require(process.mainModule.exports["corePath"] + '/config/config.global.js');
+var config      = process.mainModule.exports["config"];
 var messages    = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/common/messages');
 var global      = require(process.mainModule.exports["corePath"] +

webroot/monitor/infra/analyticsnode/api/analyticsnode.api.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     async = require('async'),
     commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils'),

webroot/monitor/infra/confignode/api/confignode.api.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     async = require('async'),
     commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils'),

webroot/monitor/infra/controlnode/api/controlnode.api.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     async = require('async'),
     commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils'),

webroot/monitor/infra/controlnode/jobs/controlnode.jobs.api.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     adminapi = module.exports,
     logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils'),
     commonUtils = require(process.mainModule.exports["corePath"] +

webroot/monitor/infra/vrouter/api/vrouternode.api.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     async = require('async'),
     commonUtils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/common.utils'),
     logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils'),

webroot/monitor/infra/vrouter/jobs/vrouternode.jobs.api.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     adminapi = module.exports,
     logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils'),
     commonUtils = require(process.mainModule.exports["corePath"] +

webroot/monitor/tenant-network/api/network.mon.api.js

@@ -7,7 +7,7 @@ var cacheApi = require(process.mainModule.exports["corePath"] + '/src/serverroot
     messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages'),
     commonUtils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/common.utils'),
     tenantapi = require('./tenant.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
     async = require('async'),
     jsonPath = require('JSONPath').eval,

webroot/monitor/tenant-network/api/tenant.api.js

@@ -8,7 +8,7 @@ var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/com
   logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils'),
   commonUtils = require(process.mainModule.exports["corePath"] +
                         '/src/serverroot/utils/common.utils'),
-  config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+  config = process.mainModule.exports["config"],
   messages = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/messages'),
   global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global'),
   appErrors = require(process.mainModule.exports["corePath"] +

webroot/monitor/tenant-network/jobs/network.mon.jobs.js

@@ -3,7 +3,7 @@
  */
 
 var rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     logutils = require(process.mainModule.exports["corePath"] +
                        '/src/serverroot/utils/log.utils'),
     commonUtils = require(process.mainModule.exports["corePath"] +

webroot/monitor/tenant-network/jobs/topoCache.api.js

@@ -4,7 +4,7 @@
 
 var assert = require('assert')
     , rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api')
-    , config = require(process.mainModule.exports["corePath"] + '/config/config.global.js')
+    , config = process.mainModule.exports["config"]
     , commonUtils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/common.utils')
     , jobsApi = require(process.mainModule.exports["corePath"] + '/src/serverroot/jobs/core/jobs.api')
     , global = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/global')

webroot/monitor/tenant-network/jobs/tpoCache.api.js

@@ -8,7 +8,7 @@
 
 var assert = require('assert')
     , rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api')
-    , config = require(process.mainModule.exports["corePath"] + '/config/config.global.js')
+    , config = process.mainModule.exports["config"]
     , commonUtils = require(process.mainModule.exports["corePath"] +
                             '/src/serverroot/utils/common.utils')
     , jobsApi = require(process.mainModule.exports["corePath"] + '/src/serverroot/jobs/core/jobs.api')

webroot/reports/api/qe.api.js

@@ -8,7 +8,7 @@
 
 var qeapi = module.exports,
     rest = require(process.mainModule.exports["corePath"] + '/src/serverroot/common/rest.api'),
-    config = require(process.mainModule.exports["corePath"] + '/config/config.global.js'),
+    config = process.mainModule.exports["config"],
     logutils = require(process.mainModule.exports["corePath"] + '/src/serverroot/utils/log.utils'),
     commonUtils = require(process.mainModule.exports["corePath"] +
                           '/src/serverroot/utils/common.utils'),