diff options
| author |   MichaelMorris <michael.morris@est.tech> | 2021-01-19 16:04:14 +0000 |
|---|---|---|
| committer |   Christophe Closset <christophe.closset@intl.att.com> | 2021-01-20 10:35:51 +0000 |
| commit | baf6ff4f604f44062bdf4963aed8591d95bb6389 (patch) | |
| tree | c58ee6d8a7cbd40ee31783b26145a75b20ac4e67 | |
| parent | 502142a7334ec31add9a72c239f260893f3022cb (diff) | |
Fix error in service substitution
Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3440
Change-Id: I3de45ac5f940a3ac24dec2b5520bdf8d297e63c4
2 files changed, 5 insertions, 1 deletions
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java index fd4feeb035..0057b71a27 100644 --- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java +++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/ComponentInstance.java @@ -70,7 +70,7 @@ public class ComponentInstance extends ComponentInstanceDataDefinition implement } public String getActualComponentUid() { - return getIsProxy() ? getSourceModelUid() : getComponentUid(); + return getIsProxy() || isServiceSubstitution() ? getSourceModelUid() : getComponentUid(); } public boolean isArtifactExists(ArtifactGroupTypeEnum groupType, String artifactLabel) { diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java index 4832e8b690..afcc0e6d9f 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/ComponentInstanceDataDefinition.java @@ -289,6 +289,10 @@ public class ComponentInstanceDataDefinition extends ToscaDataDefinition { Boolean isProxy = (Boolean) getToscaPresentationValue(JsonPresentationFields.CI_IS_PROXY); return (isProxy != null) ? isProxy : false; } + + public Boolean isServiceSubstitution() { + return getOriginType() == OriginTypeEnum.ServiceSubstitution; + } public void setOriginArchived(Boolean originArchived) { if (originArchived == null) { |