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 6ed410a..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
@@ -64,6 +64,12 @@ appDS2.constant("VIDCONFIGURATION", (function() {
                                "orchestrationStatus": "active",\r
                                "inMaint": false,\r
                                "operationalStatus": "out-of-service-path"\r
+                       },\r
+                       {\r
+                               "provStatus": "prov",\r
+                               "orchestrationStatus": "activated",\r
+                               "inMaint": false,\r
+                               "operationalStatus": "out-of-service-path"\r
                        }\r
        ];\r
        /* \r
@@ -79,12 +85,14 @@ appDS2.constant("VIDCONFIGURATION", (function() {
        /*\r
         * Max number of times that VID will poll MSO for a given request status\r
         */\r
-       var MSO_MAX_POLLS = 10;\r
+       var MSO_MAX_POLLS = 1440;\r
        /*\r
         * Number of msecs that VID will wait between MSO polls.\r
         */\r
-       var MSO_POLLING_INTERVAL_MSECS = 10000;\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
@@ -96,16 +104,27 @@ appDS2.constant("VIDCONFIGURATION", (function() {
         */\r
        var COMPONENT_LIST_NAMED_QUERY_ID = "0367193e-c785-4d5f-9cb8-7bc89dc9ddb7";\r
        var MACRO_SERVICES = [];\r
+\r
+       var SCHEDULER_CALLBACK_URL = "";\r
+\r
+       var SCHEDULER_PORTAL_URL = "";\r
+       \r
+       var SDNC_SHOW_ASSIGNMENTS_URL = "https://sdnc.api.simpledemo.onap.org:8448/configAdapter/index#/resource_manager/<SERVICE_INSTANCE_ID>";\r
+       \r
     return {\r
        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
        VNF_VALID_STATUS_LIST : vnfValidStatusList,\r
                UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED : UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED,\r
        MACRO_SERVICES : MACRO_SERVICES,\r
-       COMPONENT_LIST_NAMED_QUERY_ID : COMPONENT_LIST_NAMED_QUERY_ID\r
+       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
     };\r
 })())\r