Fix JUnit Test for ControlLoops

Fixed the test case by using getters and setters for Policy objects
in the drl. Added gson dependency in the pom to fix gson runtime errors.

Fixed dependencies in template.demo pom to add vfc.

The drl was having compilation errors in the guard permitted
rule due to the operation request object not being casted
into a VFCRequest when being passed into the VFCManager.

Issue-ID: POLICY-194
Change-Id: Id71c74ad9727ad942a683f63a0dfad3f22b6376b
Signed-off-by: Daniel Cruz <dc443y@att.com>

diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml
index c09cfa2..c7451cf 100644 (file)
--- a/controlloop/templates/template.demo/pom.xml
+++ b/controlloop/templates/template.demo/pom.xml
@@ -41,12 +41,24 @@
                        <version>6.5.0.Final</version>
                        <scope>test</scope>
                </dependency>
+               <dependency>
+                       <groupId>com.google.code.gson</groupId>
+                       <artifactId>gson</artifactId>
+                       <version>2.5</version>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.policy.drools-applications</groupId>
                        <artifactId>appc</artifactId>
                        <version>${project.version}</version>
                        <scope>provided</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.policy.drools-applications</groupId>
+                       <artifactId>vfc</artifactId>
+                       <version>${project.version}</version>
+                       <scope>provided</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.policy.drools-applications</groupId>
                        <artifactId>events</artifactId>
@@ -125,6 +137,12 @@
                        <version>${project.version}</version>
                        <scope>provided</scope>
                </dependency>
+               <dependency>
+                       <groupId>org.onap.policy.drools-applications</groupId>
+                       <artifactId>actor.vfc</artifactId>
+                       <version>${project.version}</version>
+                       <scope>provided</scope>
+               </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>

diff --git a/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl b/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl
index 8eab478..276e64b 100644 (file)
--- a/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl
+++ b/controlloop/templates/template.demo/src/main/resources/ControlLoop_Template_xacml_guard.drl
@@ -320,7 +320,7 @@ rule "${policyName}.EVENT.MANAGER"
                                        //
                                        // Check whether we need to wait for abatement
                                        //
-                                       if ($manager.getProcessor().getControlLoop().abatement == true && notification.notification == ControlLoopNotificationType.FINAL_SUCCESS) {
+                                       if ($manager.getProcessor().getControlLoop().getAbatement() == true && notification.notification == ControlLoopNotificationType.FINAL_SUCCESS) {
                                                Logger.info("Waiting for abatement.");
                                        } else {
                                                Logger.info("No abatement is promised to come, close out the control loop for " + $event.requestID);
@@ -486,7 +486,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                        notification.policyVersion = "${policyVersion}";
                        Engine.deliver("UEB", "POLICY-CL-MGT", notification);
                        
-                       switch ($operation.policy.actor){
+                       switch ($operation.policy.getActor()){
                                
                                case "APPC":
                        
@@ -497,7 +497,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_PERMITTED"
                                case "VFC":
                                        if (request instanceof VFCRequest) {
                                                // Start VFC thread
-                                               Thread t = new Thread(new VFCManager(request));
+                                               Thread t = new Thread(new VFCManager((VFCRequest)request));
                                                t.start();
                                        }                       
                                        break;
@@ -567,8 +567,8 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_NOT_YET_QUERIED"
                                                                                                                "", 
                                                                                                                drools.getWorkingMemory(),
                                                                                                                $event.closedLoopControlName,
-                                                                                                               $operation.policy.actor.toString(),
-                                                                                                               $operation.policy.recipe,
+                                                                                                               $operation.policy.getActor().toString(),
+                                                                                                               $operation.policy.getRecipe(),
                                                                                                                $manager.getTargetInstance($operation.policy),
                                                                                                                //$event.target,
                                                                                                                $event.requestID.toString()
@@ -576,7 +576,7 @@ rule "${policyName}.EVENT.MANAGER.OPERATION.LOCKED.GUARD_NOT_YET_QUERIED"
                    t.start();
            }
            else{
-               insert(new PolicyGuardResponse("Permit", $event.requestID, $operation.policy.recipe));
+               insert(new PolicyGuardResponse("Permit", $event.requestID, $operation.policy.getRecipe()));
            }
                
                

diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java
index bad984b..18c0a20 100644 (file)
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/ControlLoopXacmlGuardTest.java
@@ -89,7 +89,6 @@ import com.att.research.xacml.util.XACMLProperties;
 public class ControlLoopXacmlGuardTest {
 
        
-       @Ignore
        @Test
        public void test() {
                try {