From 34197ebfa853c7e8b501203f02174901624e761e Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Wed, 4 Mar 2020 10:29:54 -0500 Subject: Fix tca monitoring tca_policy type Should not use map or entry_schema Issue-ID: POLICY-2408 Change-Id: Ieebe625676edab6c44323b7c69a50cc22099235f Signed-off-by: Pamela Dragosh --- .../policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml | 4 +--- .../simple/serialization/MonitoringPolicyTypeSerializationTest.java | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml index 5fa4308db..dc16da224 100644 --- a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml +++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml @@ -9,10 +9,8 @@ policy_types: version: 1.0.0 properties: tca_policy: - type: map + type: onap.datatypes.monitoring.tca_policy description: TCA Policy JSON - entry_schema: - type: onap.datatypes.monitoring.tca_policy data_types: onap.datatypes.monitoring.metricsPerEventName: derived_from: tosca.datatypes.Root diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java index 270bc6c77..ef4123084 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java @@ -40,7 +40,6 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraintLogical; import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraintValidValues; import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataType; -import org.onap.policy.models.tosca.simple.concepts.JpaToscaEntrySchema; import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyType; import org.onap.policy.models.tosca.simple.concepts.JpaToscaProperty; import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate; @@ -170,12 +169,9 @@ public class MonitoringPolicyTypeSerializationTest { assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", property.getKey().getParentKeyName()); assertEquals(VERSION_100, property.getKey().getParentKeyVersion()); assertEquals("tca_policy", property.getKey().getLocalName()); - assertEquals("map", property.getType().getName()); + assertEquals(TCA, property.getType().getName()); assertEquals("TCA Policy JSON", property.getDescription()); - JpaToscaEntrySchema entrySchema = property.getEntrySchema(); - assertEquals(TCA, entrySchema.getType().getName()); - // Check data_types Map dataTypesConceptMap = serviceTemplate.getDataTypes().getConceptMap(); assertTrue(dataTypesConceptMap.size() == 3); -- cgit 1.2.3-korg