From 8a43a894dbf9d3f3f1d19277ac295fd7026f4925 Mon Sep 17 00:00:00 2001 From: ramverma Date: Tue, 23 Jul 2019 11:03:52 +0000 Subject: Update PolicyDecoderCsarPdpx to match policy/api Lifecycle API's for creating policies & policy types in policy/api expects ToscaServiceTemplate as input instead of ToscaPolicy or ToscaPolicyType. Hence, changing the return type of decoder to generate & return ToscaServiceTemplate instead of ToscaPolicy. Change-Id: I4fb92738e15ee7e2868741f7ca50cf09429d8cde Issue-ID: POLICY-1888 Signed-off-by: ramverma --- .../decoding/pdpx/TestPolicyDecoderCsarPdpx.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins/reception-plugins/src/test') diff --git a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java index 3954b972..0cd8b6f4 100644 --- a/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java +++ b/plugins/reception-plugins/src/test/java/org/onap/policy/distribution/reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java @@ -33,7 +33,7 @@ import org.onap.policy.common.parameters.ParameterGroup; import org.onap.policy.common.parameters.ParameterService; import org.onap.policy.distribution.model.Csar; import org.onap.policy.distribution.reception.decoding.PolicyDecodingException; -import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; +import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; /** * Class to perform unit test of {@link PolicyDecoderCsarPdpx}. @@ -69,10 +69,10 @@ public class TestPolicyDecoderCsarPdpx { final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx(); policyDecoderCsarPdpx.configure(CSAR_TO_OPTIMIZATION_POLICY_CONFIGURATION); - final Collection ret = policyDecoderCsarPdpx.decode(csar); + final Collection ret = policyDecoderCsarPdpx.decode(csar); assertEquals(2, ret.size()); - final ToscaPolicy policy = (ToscaPolicy) ret.toArray()[0]; + final ToscaServiceTemplate policy = (ToscaServiceTemplate) ret.toArray()[0]; // assertEquals("onapName", policy.getOnapName()); assertTrue(policy.getName().startsWith("OOF.")); @@ -100,8 +100,8 @@ public class TestPolicyDecoderCsarPdpx { final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx(); policyDecoderCsarPdpx.configure(CSAR_TO_OPTIMIZATION_POLICY_CONFIGURATION); - final Collection policies = policyDecoderCsarPdpx.decode(csar); - final ToscaPolicy policy = (ToscaPolicy) policies.toArray()[0]; + final Collection policies = policyDecoderCsarPdpx.decode(csar); + final ToscaServiceTemplate policy = (ToscaServiceTemplate) policies.toArray()[0]; // assertEquals("onapName", policy.getOnapName()); assertTrue(policy.getName().startsWith("OOF.")); @@ -140,9 +140,9 @@ public class TestPolicyDecoderCsarPdpx { final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx(); policyDecoderCsarPdpx.configure(CSAR_TO_OPTIMIZATION_POLICY_CONFIGURATION); - final Collection policies = policyDecoderCsarPdpx.decode(csar); + final Collection policies = policyDecoderCsarPdpx.decode(csar); assertEquals(2, policies.size()); - final ToscaPolicy policy = (ToscaPolicy) policies.toArray()[0]; + final ToscaServiceTemplate policy = (ToscaServiceTemplate) policies.toArray()[0]; // assertEquals("onapName", policy.getOnapName()); assertTrue(policy.getName().startsWith("OOF.")); @@ -183,9 +183,9 @@ public class TestPolicyDecoderCsarPdpx { final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx(); policyDecoderCsarPdpx.configure(CSAR_TO_OPTIMIZATION_POLICY_CONFIGURATION); - final Collection policies = policyDecoderCsarPdpx.decode(csar); + final Collection policies = policyDecoderCsarPdpx.decode(csar); assertEquals(2, policies.size()); - final ToscaPolicy policy = (ToscaPolicy) policies.toArray()[0]; + final ToscaServiceTemplate policy = (ToscaServiceTemplate) policies.toArray()[0]; // assertEquals("onapName", policy.getOnapName()); assertTrue(policy.getName().startsWith("OOF.")); @@ -216,9 +216,9 @@ public class TestPolicyDecoderCsarPdpx { final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx(); policyDecoderCsarPdpx.configure(CSAR_TO_OPTIMIZATION_POLICY_CONFIGURATION); - final Collection policies = policyDecoderCsarPdpx.decode(csar); + final Collection policies = policyDecoderCsarPdpx.decode(csar); assertEquals(1, policies.size()); - final ToscaPolicy policy = (ToscaPolicy) policies.toArray()[0]; + final ToscaServiceTemplate policy = (ToscaServiceTemplate) policies.toArray()[0]; // assertEquals("onapName", policy.getOnapName()); assertTrue(policy.getName().startsWith("OOF.")); @@ -250,9 +250,9 @@ public class TestPolicyDecoderCsarPdpx { final PolicyDecoderCsarPdpx policyDecoderCsarPdpx = new PolicyDecoderCsarPdpx(); policyDecoderCsarPdpx.configure(CSAR_TO_OPTIMIZATION_POLICY_CONFIGURATION); - final Collection policies = policyDecoderCsarPdpx.decode(csar); + final Collection policies = policyDecoderCsarPdpx.decode(csar); assertEquals(5, policies.size()); - final ToscaPolicy policy = (ToscaPolicy) policies.toArray()[0]; + final ToscaServiceTemplate policy = (ToscaServiceTemplate) policies.toArray()[0]; // assertEquals("onapName", policy.getOnapName()); assertTrue(policy.getName().startsWith("OOF.")); -- cgit 1.2.3-korg