Fix error in service substitution

Signed-off-by: MichaelMorris <michael.morris@est.tech>
Issue-ID: SDC-3440
Change-Id: I3de45ac5f940a3ac24dec2b5520bdf8d297e63c4

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 fd4feeb..0057b71 100644 (file)
--- 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 4832e8b..afcc0e6 100644 (file)
--- 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) {