From 46b926fdacf597c1afc7136230d72562444008f6 Mon Sep 17 00:00:00 2001 From: liboNet Date: Wed, 31 Oct 2018 10:03:49 +0800 Subject: Add more logics about fields value for OOF model To align with OOF/Policy/SO, need add below: . resource should be set as name field of SDC resource. . identity should be set as a concatenation of PolicyType + "_" + Resource . value of flavorDirective's type, expected from OOF, is "flavor_directives" . policyScope should add the name of service from SDC to align with that from SO. . Update the Testcase Change-Id: I57f461ef51e0f50e6096c9c9ba84c5832cb13656 Issue-ID: POLICY-1227 Signed-off-by: liboNet --- .../reception/decoding/pdpx/TestPolicyDecoderCsarPdpx.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 21593868..de148520 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 @@ -84,7 +84,7 @@ public class TestPolicyDecoderCsarPdpx { assertTrue(policy.getConfigBody().contains("\"id\":\"vdu_vnf_1\"")); assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.node.nfv.Vdu.Compute\"")); - assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directive\"")); + assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\"")); assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"BasicCapabilities\"")); assertTrue(policy.getConfigBody().contains("\"mandatory\":\"true\"")); assertTrue(policy.getConfigBody().contains("\"architecture\":\"generic\"")); @@ -113,7 +113,7 @@ public class TestPolicyDecoderCsarPdpx { assertTrue(policy.getConfigBody().contains("\"id\":\"vdu_vnf_1\"")); assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.node.nfv.Vdu.Compute\"")); - assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directive\"")); + assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\"")); assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\"")); assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\"")); assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"SriovNICNetwork\"")); @@ -154,7 +154,7 @@ public class TestPolicyDecoderCsarPdpx { assertTrue(policy.getConfigBody().contains("\"id\":\"vdu_vnf_1\"")); assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.node.nfv.Vdu.Compute\"")); - assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directive\"")); + assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\"")); assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\"")); assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\"")); assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"pciePassthrough\"")); @@ -197,7 +197,7 @@ public class TestPolicyDecoderCsarPdpx { assertTrue(policy.getConfigBody().contains("\"id\":\"vdu_vnf_1\"")); assertTrue(policy.getConfigBody().contains("\"type\":\"tosca.node.nfv.Vdu.Compute\"")); - assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directive\"")); + assertTrue(policy.getConfigBody().contains("\"type\":\"flavor_directives\"")); assertTrue(policy.getConfigBody().contains("\"attribute_name\":\"flavorName\"")); assertTrue(policy.getConfigBody().contains("\"attribute_value\":\"\"")); assertTrue(policy.getConfigBody().contains("\"hpa-feature\":\"hugePages\"")); -- cgit 1.2.3-korg