Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / constants / vidConfiguration.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
index b2441fb..05c96ed 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/vidConfiguration.js
@@ -30,7 +30,7 @@ appDS2.constant("VIDCONFIGURATION", (function() {
         * UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED: Determines the Property to Govern Presence of Upload Supplementary File on Volume Group Screen.\r
         * Set to false, to disable the check.\r
         */\r
-       var UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED = false;\r
+       var UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED = true;\r
        /*\r
         * List of valid VNF status combinations\r
         */\r
@@ -91,6 +91,8 @@ appDS2.constant("VIDCONFIGURATION", (function() {
         */\r
        var MSO_POLLING_INTERVAL_MSECS = 200;\r
        \r
+       var SERVER_RESPONSE_TIMEOUT_MSECS = 300000;\r
+\r
        var SCHEDULER_POLLING_INTERVAL_MSECS = 10000;\r
        \r
        var SCHEDULER_MAX_POLLS = 10;\r
@@ -113,6 +115,7 @@ appDS2.constant("VIDCONFIGURATION", (function() {
        ASDC_MODEL_STATUS : ASDC_MODEL_STATUS,\r
        MSO_MAX_POLLS : MSO_MAX_POLLS,\r
        MSO_POLLING_INTERVAL_MSECS : MSO_POLLING_INTERVAL_MSECS,\r
+        SERVER_RESPONSE_TIMEOUT_MSECS : SERVER_RESPONSE_TIMEOUT_MSECS,\r
        SCHEDULER_MAX_POLLS : SCHEDULER_MAX_POLLS,\r
        SCHEDULER_POLLING_INTERVAL_MSECS : SCHEDULER_POLLING_INTERVAL_MSECS,\r
        VNF_STATUS_CHECK_ENABLED : VNF_STATUS_CHECK_ENABLED,\r