From ac3eeb30f40a225372c67cb33fe3396cf44770e4 Mon Sep 17 00:00:00 2001
From: sebdet <sd378r@intl.att.com>
Date: Fri, 21 Sep 2018 17:46:12 +0200
Subject: Add delete test

Add a test and fix the delete model code that was not working

Issue-ID: CLAMP-217
Change-Id: I235200ee0e7dc25ed759b88568333882bfb90c50
Signed-off-by: sebdet <sd378r@intl.att.com>
---
 .../META-INF/resources/designer/scripts/app.js     | 22 +++-------------------
 .../resources/clds/camel/routes/flexible-flow.xml  |  3 ++-
 2 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/META-INF/resources/designer/scripts/app.js b/src/main/resources/META-INF/resources/designer/scripts/app.js
index 0c3995280..d01016aef 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/app.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/app.js
@@ -259,8 +259,8 @@ function($scope, $rootScope, $timeout, dialogs, $location, MenuService,
 				$scope.cldsConfirmPerformAction("RESUBMIT");
 			} else if (name == "Update") {
 				$scope.cldsConfirmPerformAction("UPDATE");
-			} else if (name.toLowerCase() == "delete") {
-				$scope.manageConfirmPerformAction("DELETE");
+			} else if (name == "Delete") {
+				$scope.cldsConfirmPerformAction("DELETE");
 			} else if (name == "Stop") {
 				$scope.cldsConfirmPerformAction("STOP");
 			} else if (name == "Restart") {
@@ -670,23 +670,7 @@ function($scope, $rootScope, $timeout, dialogs, $location, MenuService,
 		}, function(data) {
 		});
 	}
-	$scope.managePerformAction = function(action) {
-		if (action.toLowerCase() === "delete") {
-			cldsModelService.manageAction(selected_model,
-			"805b9f83-261f-48d9-98c7-8011fc2cc8e8", "ClosedLoop-ABCD-0000.yml")
-			.then(function(pars) {
-			}, function(data) {
-			});
-		}
-	};
-	$scope.manageConfirmPerformAction = function(uiAction) {
-		var dlg = dialogs.confirm('Message', 'Do you want to '
-		+ uiAction.toLowerCase() + ' the closed loop?');
-		dlg.result.then(function(btn) {
-			$scope.managePerformAction(uiAction);
-		}, function(btn) {
-		});
-	};
+
 	$scope.VesCollectorWindow = function(vesCollector) {
 		var dlg = dialogs.create(
 		'partials/portfolios/vesCollector_properties.html', 'ImportSchemaCtrl',
diff --git a/src/main/resources/clds/camel/routes/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml
index c7f7ec3b7..e84c68614 100644
--- a/src/main/resources/clds/camel/routes/flexible-flow.xml
+++ b/src/main/resources/clds/camel/routes/flexible-flow.xml
@@ -17,13 +17,14 @@
 								<simple> ${exchangeProperty.actionCd} == 'DELETE'</simple>
 								<to uri="bean:org.onap.clamp.clds.client.TcaPolicyDeleteDelegate" />
 								<to uri="bean:org.onap.clamp.clds.client.HolmesPolicyDeleteDelegate" />
-								<to uri="bean:org.onap.clamp.clds.client.ModelDeleteDelegate" />
 								<delay>
 										<constant>30000</constant>
 								</delay>
 								<to
 										uri="bean:org.onap.clamp.clds.client.OperationalPolicyDeleteDelegate" />
 								<to uri="bean:org.onap.clamp.clds.client.GuardPolicyDeleteDelegate" />
+								<to uri="bean:org.onap.clamp.clds.client.ModelDeleteDelegate" />
+								<to uri="bean:org.onap.clamp.clds.client.CldsEventDelegate" />
 						</when>
 						<when>
 								<simple> ${exchangeProperty.actionCd} == 'UPDATE'</simple>
-- 
cgit 1.2.3-korg