aboutsummaryrefslogtreecommitdiffstats
path: root/services/services-onappf/src/test
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@est.tech>2020-01-29 09:50:33 +0000
committera.sreekumar <ajith.sreekumar@est.tech>2020-01-30 12:15:09 +0000
commit393e00b78140a27232d961fcdae70b99af2cdbbe (patch)
tree9ece796dd23034536a3ae9e64ed5e03c71d73f1c /services/services-onappf/src/test
parent18e4f9625363459dac24be15b74210e2886097b9 (diff)
Remove content section from ToscaPolicy properties in APEX
Currently APEX specific information is placed under properties|content in ToscaPolicy. Avoid keeping under "content" and keep the information directly under properties. Change-Id: Ic437271c9a2d71104013b5568af5525df4a4bb56 Issue-ID: POLICY-2332 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Diffstat (limited to 'services/services-onappf/src/test')
-rw-r--r--services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestListenerUtils.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestListenerUtils.java b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestListenerUtils.java
index 78d9d769b..21d0137f3 100644
--- a/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestListenerUtils.java
+++ b/services/services-onappf/src/test/java/org/onap/policy/apex/services/onappf/comm/TestListenerUtils.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,8 +71,10 @@ public class TestListenerUtils {
toscaPolicy.setVersion(policyVersion);
toscaPolicy.setName(policyName);
final Map<String, Object> propertiesMap = new LinkedHashMap<>();
- Object properties = new StandardCoder().decode(new File(policyFilePath), JsonObject.class);
- propertiesMap.put("content", properties);
+ JsonObject properties = new StandardCoder().decode(new File(policyFilePath), JsonObject.class);
+ properties.entrySet().forEach(entry -> {
+ propertiesMap.put(entry.getKey(), entry.getValue());
+ });
toscaPolicy.setProperties(propertiesMap);
return toscaPolicy;
}