From: Pamela Dragosh <pdragosh@research.att.com>
Date: Tue, 14 Mar 2017 22:17:28 +0000 (-0400)
Subject: cherry 42ab38f051fa30e48c36c03e8983904bfaa60256
X-Git-Tag: v1.1.0~153
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F2145%2F1;p=policy%2Fdrools-applications.git

cherry 42ab38f051fa30e48c36c03e8983904bfaa60256

Change-Id: I4bace6eb9fd928183758dec8b6cd9e7c52d09d24
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---

diff --git a/.gitreview b/.gitreview
index 81743ce69..e027ed4ed 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=gerrit.openecomp.org
 port=29418
 project=policy/drools-applications.git
+defaultbranch=master
diff --git a/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl b/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl
index 3cb6196fd..5008df7f1 100644
--- a/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl
+++ b/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl
@@ -1046,7 +1046,7 @@ rule "${policyName}.MSO.RESPONSE"
 		//
 		// The operation can either be succeeded or failed
 		// 
-		if($response.request.requestStatus.requestState.equals("Completed")) {
+		if($response.request.requestStatus.requestState.equals("COMPLETE")) {
 			$operationWrapper.operation.outcome = "SUCCESS";
 			$manager.setControlLoopResult("SUCCESS");
 			notification.history.add($operationWrapper.operation);
diff --git a/template.demo/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl b/template.demo/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl
index 28d4f9f34..987fa60a6 100644
--- a/template.demo/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl
+++ b/template.demo/src/main/resources/archetype-resources/src/main/resources/ControlLoopDemo__closedLoopControlName__.drl
@@ -1224,7 +1224,7 @@ rule "${policyName}.MSO.RESPONSE"
 		//
 		// The operation can either be succeeded or failed
 		// 
-		if($response.request.requestStatus.requestState.equals("Completed")) {
+		if($response.request.requestStatus.requestState.equals("COMPLETE")) {
 			$operationWrapper.operation.outcome = "SUCCESS";
 			$manager.setControlLoopResult("SUCCESS");
 			notification.history.add($operationWrapper.operation);