Merge "VoLTE/E2E service flow fix"

2 files changed, 5 insertions, 3 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 89660fb1..aee4c05f 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
@@ -190,7 +190,7 @@
           DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));

 					$scope.createType = COMPONENT.A_LA_CARTE;

 					var broadcastType = COMPONENT.CREATE_COMPONENT;

-                    if (AsdcService.isMacro(serviceModel)) {

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

                         DataService.setALaCarte(false);

                         if(AsdcService.shouldExcludeMacroFromAsyncInstatiationFlow(serviceModel)){

                         	DataService.setShouldExcludeMacroFromAsyncInstatiationFlow(true);

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 753f9fd1..6bdc0ae9 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
@@ -20,7 +20,7 @@
 

 "use strict";

 

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

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

     return {

         getModel: function (modelId, successCallbackFunction) {

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

@@ -37,6 +37,8 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON
         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))

@@ -72,4 +74,4 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON
 }

 

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

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

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