Use ToscaPolicy instead of legacy Policy

Removed usage of policy-yaml and old targetType definition.

Switched to using TOSCA operational policy classes and new
definitions for Target type enum.

Issue-ID: POLICY-2428
Change-Id: I25d1c5219764df27bdae7f2cbeb7ada7bcef4e1e
Signed-off-by: Jim Hahn <jrh3@att.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

1 files changed, 5 insertions, 1 deletions

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 5cf087abd..c0116c952 100644
--- 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
@@ -178,7 +178,7 @@ public class ControlLoopEventManager implements StepContext, Serializable {
      */
     private long detmControlLoopTimeoutMs() {
         // validation checks preclude null or 0 timeout values in the policy
-        Integer timeout = processor.getControlLoop().getTimeout();
+        Integer timeout = processor.getPolicy().getProperties().getTimeout();
         return TimeUnit.MILLISECONDS.convert(timeout, TimeUnit.SECONDS);
     }
 
@@ -221,6 +221,7 @@ public class ControlLoopEventManager implements StepContext, Serializable {
      * @param name name of the property of interest
      * @return {@code true} if the context contains the property, {@code false} otherwise
      */
+    @Override
     public boolean contains(String name) {
         return properties.containsKey(name);
     }
@@ -232,6 +233,7 @@ public class ControlLoopEventManager implements StepContext, Serializable {
      * @param name name of the property whose value is to be retrieved
      * @return the property's value, or {@code null} if it does not yet have a value
      */
+    @Override
     @SuppressWarnings("unchecked")
     public <T> T getProperty(String name) {
         return (T) properties.get(name);
@@ -243,6 +245,7 @@ public class ControlLoopEventManager implements StepContext, Serializable {
      * @param name property name
      * @param value new property value
      */
+    @Override
     public void setProperty(String name, Serializable value) {
         logger.error("set property {}={} manager={}", name, value, this);
         properties.put(name, value);
@@ -253,6 +256,7 @@ public class ControlLoopEventManager implements StepContext, Serializable {
      *
      * @param name property name
      */
+    @Override
     public void removeProperty(String name) {
         properties.remove(name);
     }