From 2f1d6225bef920a217a25441b7dcaeb457113dc5 Mon Sep 17 00:00:00 2001 From: sarada prasad sahoo Date: Tue, 23 Apr 2019 10:16:13 +0530 Subject: enabled NFV Affinity and Anti-affinity Rules Fix the issue tosca.policies.nfv.AffinityRule and tosca.policies.nfv.AntiAffinityRule which was getting failed at first attempt with 404 error Change-Id: I6630193343729051b41e4eb880832dee85b098ee Issue-ID: SDC-2231 Signed-off-by: sarada prasad sahoo --- .../openecomp/sdc/be/components/impl/PolicyTypeImportManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'catalog-be/src/main/java') diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java index 5aedb4ee0e..edd3b936a2 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PolicyTypeImportManager.java @@ -97,9 +97,6 @@ public class PolicyTypeImportManager { if (result.isLeft()) { for (String targetId : policyType.getTargets()) { boolean isValid = toscaOperationFacade.getLatestByToscaResourceName(targetId).isLeft(); - if (!isValid) { - isValid = groupOperation.isGroupExist(targetId, false); - } if (!isValid) { // check if it is a groupType final Either groupTypeFound = groupTypeOperation @@ -107,6 +104,10 @@ public class PolicyTypeImportManager { isValid = groupTypeFound.isLeft() && !groupTypeFound.left().value().isEmpty(); } + if (!isValid) { + isValid = groupOperation.isGroupExist(targetId, false); + } + if (!isValid) { ResponseFormat responseFormat = componentsUtils.getResponseFormat(ActionStatus.TARGETS_NON_VALID, policyType.getType(), targetId); result = Either.right(responseFormat); -- cgit 1.2.3-korg