Tweaks to drools-apps for new usecases controller

Made the following updates:
- modified feature-controlloop-utils to pull from the usecases
  controller instead of the frankfurt controller
- modified ONAPInstance in the xacml-pdp Decision request
- log Step2 property changes as info() instead of error()
- log Lock acquisition as info() instead of warn()

Issue-ID: POLICY-2748
Change-Id: I6b4b5877bbd6731acb761d09d0f0dec85561b163
Signed-off-by: Jim Hahn <jrh3@att.com>

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
index c0116c9..1212855 100644 (file)
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java
@@ -247,7 +247,7 @@ public class ControlLoopEventManager implements StepContext, Serializable {
      */
     @Override
     public void setProperty(String name, Serializable value) {
-        logger.error("set property {}={} manager={}", name, value, this);
+        logger.info("set property {}={} manager={}", name, value, this);
         properties.put(name, value);
     }
 

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/LockData.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/LockData.java
index 91b5325..119d146 100644 (file)
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/LockData.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/LockData.java
@@ -126,7 +126,7 @@ public class LockData implements LockCallback {
 
     @Override
     public synchronized void lockAvailable(Lock lock) {
-        logger.warn("lock granted on {} for {}", targetEntity, requestId);
+        logger.info("lock granted on {} for {}", targetEntity, requestId);
         theLock = lock;
 
         OperationOutcome outcome = makeOutcome();

diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
index b10b897..9b28e66 100644 (file)
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
@@ -34,7 +34,7 @@ actor.service.GUARD.disabled=${envd:GUARD_DISABLED:false}
 actor.service.GUARD.clientName=GUARD
 actor.service.GUARD.onapName=Policy
 actor.service.GUARD.onapComponent=Drools PDP
-actor.service.GUARD.onapInstance=Frankfurt
+actor.service.GUARD.onapInstance=Usecases
 actor.service.GUARD.operations.Decision.path=decision
 
 actor.service.AAI.clientName=AAI

diff --git a/controlloop/common/feature-controlloop-utils/src/assembly/assemble_zip.xml b/controlloop/common/feature-controlloop-utils/src/assembly/assemble_zip.xml
index 70421a3..465e11c 100644 (file)
--- a/controlloop/common/feature-controlloop-utils/src/assembly/assemble_zip.xml
+++ b/controlloop/common/feature-controlloop-utils/src/assembly/assemble_zip.xml
@@ -59,12 +59,12 @@
             <excludes/>
         </fileSet>
         <fileSet>
-            <directory>../controller-frankfurt/src/test/resources/config</directory>
+            <directory>../controller-usecases/src/test/resources/config</directory>
             <outputDirectory>config</outputDirectory>
             <fileMode>0644</fileMode>
             <excludes/>
             <includes>
-                <include>frankfurt-http-client.properties</include>
+                <include>usecases-http-client.properties</include>
             </includes>
         </fileSet>
         <fileSet>