Merge "VoLTE/E2E service flow fix"

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 89660fb..aee4c05 100755 (executable)
--- 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, {}));\r
                                        $scope.createType = COMPONENT.A_LA_CARTE;\r
                                        var broadcastType = COMPONENT.CREATE_COMPONENT;\r
-                    if (AsdcService.isMacro(serviceModel)) {\r
+                    if (AsdcService.isMacro(serviceModel) || DataService.getE2EService()) {\r
                         DataService.setALaCarte(false);\r
                         if(AsdcService.shouldExcludeMacroFromAsyncInstatiationFlow(serviceModel)){\r
                                DataService.setShouldExcludeMacroFromAsyncInstatiationFlow(true);\r

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 753f9fd..6bdc0ae 100755 (executable)
--- 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 @@
 \r
 "use strict";\r
 \r
-var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCONFIGURATION, COMPONENT, featureFlags) {\r
+var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCONFIGURATION, COMPONENT, DataService, featureFlags) {\r
     return {\r
         getModel: function (modelId, successCallbackFunction) {\r
             $log.debug("AsdcService:getModel: modelId: " + modelId);\r
@@ -37,6 +37,8 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON
         shouldExcludeMacroFromAsyncInstatiationFlow: function(serviceModel){\r
             if (!featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_ASYNC_INSTANTIATION))\r
                 return true;\r
+                       if (DataService.getE2EService())\r
+                               return true;\r
             if (!_.isEmpty(serviceModel.pnfs))\r
                 return true;\r
             if (!_.isEmpty(serviceModel.collectionResource))\r
@@ -72,4 +74,4 @@ var AsdcService = function ($http, $log, PropertyService, UtilityService, VIDCON
 }\r
 \r
 appDS2.factory("AsdcService", ["$http", "$log", "PropertyService",\r
-    "UtilityService", "VIDCONFIGURATION","COMPONENT", "featureFlags", AsdcService]);\r
+    "UtilityService", "VIDCONFIGURATION","COMPONENT", "DataService", "featureFlags", AsdcService]);\r