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 f71213b..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
@@ -106,8 +108,6 @@ appDS2.constant("VIDCONFIGURATION", (function() {
        var SCHEDULER_CALLBACK_URL = "";\r
 \r
        var SCHEDULER_PORTAL_URL = "";\r
-\r
-       var SCALE_OUT_CONTROLLERS = ["", "SDNC", "APPC"];\r
        \r
        var SDNC_SHOW_ASSIGNMENTS_URL = "https://sdnc.api.simpledemo.onap.org:8448/configAdapter/index#/resource_manager/<SERVICE_INSTANCE_ID>";\r
        \r
@@ -115,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
@@ -124,7 +125,6 @@ appDS2.constant("VIDCONFIGURATION", (function() {
        COMPONENT_LIST_NAMED_QUERY_ID : COMPONENT_LIST_NAMED_QUERY_ID,\r
         SCHEDULER_CALLBACK_URL: SCHEDULER_CALLBACK_URL,\r
         SCHEDULER_PORTAL_URL: SCHEDULER_PORTAL_URL,\r
-               SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL,\r
-               SCALE_OUT_CONTROLLERS: SCALE_OUT_CONTROLLERS\r
+               SDNC_SHOW_ASSIGNMENTS_URL: SDNC_SHOW_ASSIGNMENTS_URL\r
     };\r
 })())\r