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, 43 insertions, 16 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js
index 6bdc0ae9c..52adcc949 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/asdcService.js
@@ -21,6 +21,22 @@
 "use strict";

 

 var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCONFIGURATION, COMPONENT, DataService, featureFlags) {

+    var shouldExcludeMacroFromAsyncInstantiationFlow = function(serviceModel){

+            if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))

+                return true;

+			if (DataService.getE2EService())

+				return true;

+            if (!_.isEmpty(serviceModel.pnfs))

+                return true;

+            if (!_.isEmpty(serviceModel.collectionResource))

+                return true;

+            if (!_.isEmpty(serviceModel.networks) && !featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_NETWORK_TO_ASYNC_INSTANTIATION))

+                return true;

+            if(serviceModel.service.instantiationType === "ClientConfig")

+                return true;

+            return false;

+    };

+

     return {

         getModel: function (modelId, successCallbackFunction) {

             $log.debug("AsdcService:getModel: modelId: " + modelId);

@@ -34,19 +50,30 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON
             (UtilityService.runHttpErrorHandler);

         },

 

-        shouldExcludeMacroFromAsyncInstatiationFlow: function(serviceModel){

-            if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))

-                return true;

-			if (DataService.getE2EService())

-				return true;

-            if (!_.isEmpty(serviceModel.pnfs))

-                return true;

-            if (!_.isEmpty(serviceModel.collectionResource))

-                return true;

-            if (!_.isEmpty(serviceModel.networks) && !featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_NETWORK_TO_ASYNC_INSTANTIATION))

-                return true;

-            if(serviceModel.service.instantiationType === "ClientConfig")

-                return true;

+        shouldTakeTheDrawingBoardViewEdit: function(serviceModel) {

+            if (serviceModel.service.vidNotions

+                && serviceModel.service.vidNotions.viewEditUI

+                && serviceModel.service.vidNotions.viewEditUI !== 'legacy'

+            ) return true;

+

+            return false;

+        },

+

+        shouldTakeTheAsyncInstantiationFlow: function(serviceModel) {

+            // First of all, respect serviceModel.service.vidNotions.instantiationUI

+            if (serviceModel.service.vidNotions

+                && serviceModel.service.vidNotions.instantiationUI

+                && serviceModel.service.vidNotions.instantiationUI !== 'legacy'

+            ) return true;

+

+            // If defined 'legacy' or not defined, other client-side

+            // logic still apply:

+

+            if (this.isMacro(serviceModel)

+                && !shouldExcludeMacroFromAsyncInstantiationFlow(serviceModel)

+            ) return true;

+

+            // otherwise...

             return false;

         },

 

@@ -63,15 +90,15 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON
                         return UtilityService.arrayContains(VIDCONFIGURATION.MACRO_SERVICES, serviceModel.service.invariantUuid);

                     default:

                         console.debug("Unexpected serviceModel.service.instantiationType: " + serviceModel.service.instantiationType);

-                        return true;

+                        return UtilityService.arrayContains(VIDCONFIGURATION.MACRO_SERVICES, serviceModel.service.invariantUuid);

                 }

             } else {

                 $log.debug("isMscro=false, because serviceModel.service is undefined");

                 return false;

             }

         }

-    }

-}

+    };

+};

 

 appDS2.factory("AsdcService", ["$http", "$log", "PropertyService",

     "UtilityService", "VIDCONFIGURATION","COMPONENT", "DataService", "featureFlags", AsdcService]);