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, 6 insertions, 7 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index aee4c05fe..f0a6ebdf7 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -121,9 +121,6 @@
     		

     		var polls = PropertyService.retrieveMsoMaxPolls();

     		PropertyService.setMsoMaxPolls(polls);

-    		

-    		//PropertyService.setMsoBaseUrl("testmso");

-    		PropertyService.setServerResponseTimeoutMsec(30000);

         };

 		

 		$scope.prevPage = function() {

@@ -186,14 +183,17 @@
 						"description": serviceModel.service.description,

 						"category":serviceModel.service.category

 					});

-					DataService.setALaCarte (true);

+

+                    var shouldTakeTheAsyncInstantiationFlow = AsdcService.shouldTakeTheAsyncInstantiationFlow(serviceModel);

+                    DataService.setShouldIncludeInAsyncInstantiationFlow(shouldTakeTheAsyncInstantiationFlow);

+

+                    DataService.setALaCarte (true);

           DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));

 					$scope.createType = COMPONENT.A_LA_CARTE;

 					var broadcastType = COMPONENT.CREATE_COMPONENT;

                     if (AsdcService.isMacro(serviceModel) || DataService.getE2EService()) {

                         DataService.setALaCarte(false);

-                        if(AsdcService.shouldExcludeMacroFromAsyncInstatiationFlow(serviceModel)){

-                        	DataService.setShouldExcludeMacroFromAsyncInstatiationFlow(true);

+                        if(!shouldTakeTheAsyncInstantiationFlow){

                             $scope.createType = COMPONENT.MACRO;

                             var convertedAsdcModel = UtilityService.convertModel(serviceModel);

 

@@ -210,7 +210,6 @@
                                 "serviceRole": serviceModel.service.serviceRole,

                                 "displayInputs": convertedAsdcModel.completeDisplayInputs

                             });

-

                         }

                     }