VoLTE supportv2.0.02.0.0-ONAP2.0.0-ONAP

Change-Id: I506a30d012003d8f6efb7c894435c28f1e421ac4
Issue-ID: VID-189
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

3 files changed, 32 insertions, 7 deletions

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/deleteResumeDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/deleteResumeDialogController.js
index 9715484d4..cdda3a143 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/deleteResumeDialogController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/deleteResumeDialogController.js
@@ -21,7 +21,7 @@
 "use strict";
 
 var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $timeout, $log,
-    DeleteResumeService, CreationService, UtilityService) {
+    DeleteResumeService, CreationService, DataService, UtilityService) {
 
     $scope.isDialogVisible = false;
     $scope.summaryControl = {};
@@ -32,6 +32,7 @@ var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $t
 
     $scope.$on(COMPONENT.DELETE_RESUME_COMPONENT, function(event, request) {
 
+    $scope.isE2EService = false;
     $scope.isDataVisible = false;
 	$scope.isSpinnerVisible = false;
 	$scope.isErrorVisible = false;
@@ -41,6 +42,7 @@ var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $t
 	$scope.dialogMethod = request.dialogMethod;
 	callbackFunction = request.callbackFunction;
 	componentId = request.componentId;
+    $scope.isServiceInstance = componentId === "service";
 
     DeleteResumeService.initializeComponent(request.componentId);
 
@@ -69,6 +71,8 @@ var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $t
 	}
 
     $scope.confirm = function() {
+        DataService.setE2EService($scope.isE2EService); //VoLTE support
+
     	var requiredFields = $scope.userProvidedControl.getRequiredFields();
 		if (requiredFields === "") {
 			$scope.isErrorVisible = false;
@@ -96,7 +100,7 @@ var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $t
 
             var requestDetails = DeleteResumeService.getMsoRequestDetails($scope.userProvidedControl.getList());
 
-            if(DeleteResumeService.isMacro === true){
+            if(!DataService.getE2EService() && DeleteResumeService.isMacro === true){
             	requestDetails.requestParameters.aLaCarte = false;
             }
 
@@ -144,5 +148,5 @@ var deleteResumeDialogController = function( COMPONENT, FIELD, $scope, $http, $t
 }
 
 appDS2.controller("deleteResumeDialogController", [ "COMPONENT", "FIELD", "$scope", "$http",
-		"$timeout", "$log", "DeleteResumeService","CreationService", "UtilityService",
+		"$timeout", "$log", "DeleteResumeService","CreationService", "DataService", "UtilityService",
     deleteResumeDialogController]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
index 90daf3550..3255bc9a3 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js
@@ -266,8 +266,10 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
 					+ DataService.getServiceInstanceId() + "/networks/"
 					+ DataService.getNetworkInstanceId();
 			case COMPONENT.SERVICE:
-				return "mso_delete_svc_instance/"
-					+ DataService.getServiceInstanceId();
+				if(DataService.getE2EService() === true)
+					return "mso_delete_e2e_svc_instance/"+ DataService.getServiceInstanceId();
+				else
+					return "mso_delete_svc_instance/"+ DataService.getServiceInstanceId();
 			case COMPONENT.VNF:
 				return "mso_delete_vnf_instance/"
 					+ DataService.getServiceInstanceId() + "/vnfs/"
@@ -291,9 +293,22 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService,
 			value : value
 		});
 	};
-	
+
+	var getMsoE2ERequest = function(parameterList) {
+		return {
+			"globalSubscriberId": DataService.getSubscriberName(),
+			"serviceType": DataService.getServiceType()
+		};
+	};
+
     var getMsoRequestDetails = function(parameterList) {
     	console.log("getMsoRequestDetails invoked");
+
+		//VoLTE logic goes here
+		if(DataService.getE2EService() === true) {
+			return getMsoE2ERequest(parameterList);
+		}
+
 		var inventoryInfo = ComponentService.getInventoryInfo(
 			_this.componentId, DataService.getInventoryItem());
 		var modelInfo = DataService.getModelInfo(_this.componentId);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/deleteResumeDialog.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/deleteResumeDialog.htm
index ccd54a612..efaca5bd3 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/deleteResumeDialog.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/deleteResumeDialog.htm
@@ -32,7 +32,13 @@
 		</div>
 
       <parameter-block control="summaryControl"></parameter-block>
-      
+
+		<!-- tell VID if it's an E2E VoLTE service-->
+		<div style="margin-left: 15px" ng-show="isServiceInstance">
+			<input type="checkbox" ng-model="isE2EService" />
+			This is an E2E (VoLTE) service instance
+	  	</div>
+
       <div ngx-visible="{{isDataVisible}}">
 		
         <h4>