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 <ittay.stern@att.com>

1 files changed, 2 insertions, 7 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js
index ad9bf7dfa..b576b29ed 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/propertyService.js
@@ -29,7 +29,6 @@ var PropertyService = function($location, $http, VIDCONFIGURATION ) {
     var DEFAULT_MSO_MAX_POLLING_INTERVAL_MSEC = 60000;

     var DEFAULT_MSO_MAX_POLLS = 10;

     var DEFAULT_MSO_BASE_URL = "/" + BASE_PATH + "/mso";

-    var DEFAULT_SERVER_RESPONSE_TIMEOUT_MSEC = 60000;

     var MSO_POLLING_INTERVAL_MSECS = "mso_polling_interval_msecs";

     var MSO_MAX_POLLS = "mso_max_polls";

 

@@ -40,7 +39,6 @@ var PropertyService = function($location, $http, VIDCONFIGURATION ) {
     _this.msoMaxPollingIntervalMsec = DEFAULT_MSO_MAX_POLLING_INTERVAL_MSEC;

     _this.msoMaxPolls = DEFAULT_MSO_MAX_POLLS;

     _this.msoBaseUrl = DEFAULT_MSO_BASE_URL;

-    _this.serverResponseTimeoutMsec = DEFAULT_SERVER_RESPONSE_TIMEOUT_MSEC;

 

     return {

 	

@@ -78,12 +76,9 @@ var PropertyService = function($location, $http, VIDCONFIGURATION ) {
 	    _this.msoBaseUrl = msoBaseUrl;

 	},

 	getServerResponseTimeoutMsec : function() {

-	    return _this.serverResponseTimeoutMsec;

-	},

-	setServerResponseTimeoutMsec : function(serverResponseTimeoutMsec) {

-	    _this.serverResponseTimeoutMsec = serverResponseTimeoutMsec;

+	    return VIDCONFIGURATION.SERVER_RESPONSE_TIMEOUT_MSECS;

 	}

     };

-}

+};

 

 appDS2.factory("PropertyService", PropertyService);