From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../src/main/webapp/app/vid/scripts/constants/vidConfiguration.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to '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 b2441fbe4..05c96ed6a 100755 --- 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. * Set to false, to disable the check. */ - var UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED = false; + var UPLOAD_SUPPLEMENTARY_STATUS_CHECK_ENABLED = true; /* * List of valid VNF status combinations */ @@ -91,6 +91,8 @@ appDS2.constant("VIDCONFIGURATION", (function() { */ var MSO_POLLING_INTERVAL_MSECS = 200; + var SERVER_RESPONSE_TIMEOUT_MSECS = 300000; + var SCHEDULER_POLLING_INTERVAL_MSECS = 10000; var SCHEDULER_MAX_POLLS = 10; @@ -113,6 +115,7 @@ appDS2.constant("VIDCONFIGURATION", (function() { ASDC_MODEL_STATUS : ASDC_MODEL_STATUS, MSO_MAX_POLLS : MSO_MAX_POLLS, MSO_POLLING_INTERVAL_MSECS : MSO_POLLING_INTERVAL_MSECS, + SERVER_RESPONSE_TIMEOUT_MSECS : SERVER_RESPONSE_TIMEOUT_MSECS, SCHEDULER_MAX_POLLS : SCHEDULER_MAX_POLLS, SCHEDULER_POLLING_INTERVAL_MSECS : SCHEDULER_POLLING_INTERVAL_MSECS, VNF_STATUS_CHECK_ENABLED : VNF_STATUS_CHECK_ENABLED, -- cgit 1.2.3-korg