diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-01-10 12:42:59 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-01-10 12:42:59 +0000 |
commit | 659874df80409170e57b6dd6197eb3a81eb3468e (patch) | |
tree | 08e79fd57aa0ed299586fd88f69f87a5a2f5ded1 /vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js | |
parent | 143784a849ece4fc35cc290e33f829b72bf1fc79 (diff) | |
parent | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (diff) |
Merge "Merge from ECOMP's repository"
Diffstat (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js')
-rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js | 13 |
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 aee4c05f..f0a6ebdf 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
});
-
}
}
|