Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / controller / ServiceModelController.js

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 aee4c05..f0a6ebd 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
@@ -121,9 +121,6 @@
                \r
                var polls = PropertyService.retrieveMsoMaxPolls();\r
                PropertyService.setMsoMaxPolls(polls);\r
-               \r
-               //PropertyService.setMsoBaseUrl("testmso");\r
-               PropertyService.setServerResponseTimeoutMsec(30000);\r
         };\r
                \r
                $scope.prevPage = function() {\r
@@ -186,14 +183,17 @@
                                                "description": serviceModel.service.description,\r
                                                "category":serviceModel.service.category\r
                                        });\r
-                                       DataService.setALaCarte (true);\r
+\r
+                    var shouldTakeTheAsyncInstantiationFlow = AsdcService.shouldTakeTheAsyncInstantiationFlow(serviceModel);\r
+                    DataService.setShouldIncludeInAsyncInstantiationFlow(shouldTakeTheAsyncInstantiationFlow);\r
+\r
+                    DataService.setALaCarte (true);\r
           DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));\r
                                        $scope.createType = COMPONENT.A_LA_CARTE;\r
                                        var broadcastType = COMPONENT.CREATE_COMPONENT;\r
                     if (AsdcService.isMacro(serviceModel) || DataService.getE2EService()) {\r
                         DataService.setALaCarte(false);\r
-                        if(AsdcService.shouldExcludeMacroFromAsyncInstatiationFlow(serviceModel)){\r
-                               DataService.setShouldExcludeMacroFromAsyncInstatiationFlow(true);\r
+                        if(!shouldTakeTheAsyncInstantiationFlow){\r
                             $scope.createType = COMPONENT.MACRO;\r
                             var convertedAsdcModel = UtilityService.convertModel(serviceModel);\r
 \r
@@ -210,7 +210,6 @@
                                 "serviceRole": serviceModel.service.serviceRole,\r
                                 "displayInputs": convertedAsdcModel.completeDisplayInputs\r
                             });\r
-\r
                         }\r
                     }\r
 \r