Aligned decoder with forwarder for opt. policies

Changed decoder for optimization policies to generate instance of
OptimizationPolicy (instead of PdpxPolicy) as expected by the forwarder.
Without this change there is a mismatch between the decoder and the
forwarder.

Added parameters for configuring the static elements of the optimization
policies and setting of these elements.

Issue-ID: POLICY-927
Change-Id: Ib91a905dc89eed13622fb88e4dd19b3cb9f62c75
Signed-off-by: mmis <michael.morris@ericsson.com>

1 files changed, 0 insertions, 6 deletions

diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
index d851b640..9ef88b43 100644
--- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
+++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/xacml/pdp/engine/XacmlPdpPolicyForwarderTest.java
@@ -99,7 +99,6 @@ public class XacmlPdpPolicyForwarderTest {
 
         OptimizationPolicy policy1 = new OptimizationPolicy();
         policy1.setPolicyName("policy1");
-        policy1.setPolicyConfigType("Optimization");
         policies.add(policy1);
 
         Policy policy2 = new UnsupportedPolicy();
@@ -107,7 +106,6 @@ public class XacmlPdpPolicyForwarderTest {
 
         OptimizationPolicy policy3 = new OptimizationPolicy();
         policy3.setPolicyName("policy3");
-        policy3.setPolicyConfigType("Optimization");
         policies.add(policy3);
 
         forwarder.forward(policies);
@@ -143,7 +141,6 @@ public class XacmlPdpPolicyForwarderTest {
         Collection<Policy> policies = new ArrayList<>();
         OptimizationPolicy policy = new OptimizationPolicy();
         policy.setPolicyName("policy");
-        policy.setPolicyConfigType("Optimization");
         policies.add(policy);
         forwarder.forward(policies);
 
@@ -172,7 +169,6 @@ public class XacmlPdpPolicyForwarderTest {
         Collection<Policy> policies = new ArrayList<>();
         OptimizationPolicy policy = new OptimizationPolicy();
         policy.setPolicyName("policy");
-        policy.setPolicyConfigType("Optimization");
         policies.add(policy);
         forwarder.forward(policies);
 
@@ -202,7 +198,6 @@ public class XacmlPdpPolicyForwarderTest {
         Collection<Policy> policies = new ArrayList<>();
         OptimizationPolicy policy = new OptimizationPolicy();
         policy.setPolicyName("policy");
-        policy.setPolicyConfigType("Optimization");
         policies.add(policy);
         forwarder.forward(policies);
 
@@ -232,7 +227,6 @@ public class XacmlPdpPolicyForwarderTest {
         Collection<Policy> policies = new ArrayList<>();
         OptimizationPolicy policy = new OptimizationPolicy();
         policy.setPolicyName("policy");
-        policy.setPolicyConfigType("Optimization");
         policies.add(policy);
         forwarder.forward(policies);