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/services/dataService.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js') diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js index 0e1635512..6cc71b41c 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/dataService.js @@ -270,15 +270,15 @@ var DataService = function($log, DataService) { } return _this.aLaCarte; }, - setShouldExcludeMacroFromAsyncInstatiationFlow: function (val) { - _this.shouldExcludeMacroFromAsyncInstatiationFlow = val; + setShouldIncludeInAsyncInstantiationFlow: function (val) { + _this.shouldIncludeInAsyncInstantiationFlow = val; }, - getShouldExcludeMacroFromAsyncInstatiationFlow: function(){ - if (_this.shouldExcludeMacroFromAsyncInstatiationFlow === undefined) { + getShouldIncludeInAsyncInstantiationFlow: function(){ + if (_this.shouldIncludeInAsyncInstantiationFlow === undefined) { return false; } - return _this.shouldExcludeMacroFromAsyncInstatiationFlow; - }, + return _this.shouldIncludeInAsyncInstantiationFlow; + }, setMacro : function(aval) { _this.macro = aval; }, -- cgit 1.2.3-korg