diff options
| author |   franciscovila <javier.paradela.vila@est.tech> | 2023-03-15 15:44:02 +0000 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2023-03-21 16:35:21 +0000 |
| commit | 30e99b484fcc96d2304a05db5d8972d2250f0756 (patch) | |
| tree | f0bb12692c8bcc6da9e6a46c197ba8cb9608cddb /catalog-be | |
| parent | 9c696c0d1787d50a8481f7ccc66f30a3e0b6e197 (diff) | |
Certifying a template with two connected services results in error
Issue-ID: SDC-4437
Signed-off-by: franciscovila <javier.paradela.vila@est.tech>
Change-Id: Iad53c2204b0db48e115f4133c0a68b1f722626fc
Diffstat (limited to 'catalog-be')
| -rw-r--r-- | catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java | 3 | ||||
| -rw-r--r-- | catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java index de35bcf889..773213a80e 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/ToscaExportHandler.java @@ -1579,6 +1579,9 @@ public class ToscaExportHandler { */ private boolean isRequirementBelongToRelation(Component originComponent, RelationshipInfo reqAndRelationshipPair, RequirementDefinition requirement, String fromInstanceId) { + if (originComponent.isService() && requirement.getUniqueId().equals(reqAndRelationshipPair.getRequirementUid())) { + return true; + } if (!StringUtils.equals(requirement.getName(), reqAndRelationshipPair.getRequirement())) { log.debug("Failed to find a requirement with name {} and reqAndRelationshipPair {}", requirement.getName(), reqAndRelationshipPair.getRequirement()); diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java index 7d16c906c4..30585105b0 100644 --- a/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java +++ b/catalog-be/src/test/java/org/openecomp/sdc/be/tosca/ToscaExportHandlerTest.java @@ -121,6 +121,7 @@ class ToscaExportHandlerTest extends BaseConfDependent { private static final String RESOURCE_NAME = "resource"; private static final String TOSCA_VERSION = "tosca_simple_yaml_1_1"; private static final String LOCAL_INTERFACE_TYPE = "Local"; + public static final String UNIQUE_ID = "1L"; @InjectMocks private ToscaExportHandler testSubject; @@ -1623,6 +1624,8 @@ class ToscaExportHandlerTest extends BaseConfDependent { Component originComponent = new Service(); RelationshipInfo reqAndRelationshipPair = new RelationshipInfo(); RequirementDefinition requirement = new RequirementDefinition(); + requirement.setUniqueId(UNIQUE_ID); + reqAndRelationshipPair.setRequirementUid(UNIQUE_ID); String fromInstanceId = ""; boolean result; |