From b4f25510c8e71554cbbecf1cf1d9c21326d2d249 Mon Sep 17 00:00:00 2001 From: brunomilitzer Date: Thu, 30 Sep 2021 17:36:44 +0100 Subject: Fixed Service Template Parsing Issue-Id: POLICY-3691 Change-Id: Ie04711cd01e4140b0842e8d0d4ffbbe8e1b83361 Signed-off-by: brunomilitzer --- .../runtime/commissioning/CommissioningProvider.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'runtime-controlloop/src') diff --git a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java index 72c153b6d..d055ba266 100644 --- a/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java +++ b/runtime-controlloop/src/main/java/org/onap/policy/clamp/controlloop/runtime/commissioning/CommissioningProvider.java @@ -262,11 +262,19 @@ public class CommissioningProvider { * @return the tosca service template * @throws PfModelException on errors getting tosca service template */ - public String getToscaServiceTemplateReduced(String name, String version) throws PfModelException { + public String getToscaServiceTemplateReduced(String name, String version) + throws PfModelException { var serviceTemplateList = serviceTemplateProvider.getServiceTemplateList(name, version); - ToscaServiceTemplate fullTemplate = filterToscaNodeTemplateInstance(serviceTemplateList).get(0); + List filteredServiceTemplateList = filterToscaNodeTemplateInstance( + serviceTemplateList); + + if (filteredServiceTemplateList.isEmpty()) { + throw new PfModelException(Status.BAD_REQUEST, "Invalid Service Template"); + } + + ToscaServiceTemplate fullTemplate = filteredServiceTemplateList.get(0); var template = new HashMap(); template.put("tosca_definitions_version", fullTemplate.getToscaDefinitionsVersion()); -- cgit 1.2.3-korg