1 files changed, 2 insertions, 9 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java
index 6c4c5fafe1..006c5c22d3 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CapabiltyRequirementConvertor.java
@@ -187,7 +187,7 @@ public class CapabiltyRequirementConvertor {
 					String sourceCapName;
 					if(ToscaUtils.isComplexVfc(component)){
 						fullReqName = r.getName();
-						sourceCapName = getSourceCvfcDataTypeName(r.getName(), r.getOwnerName());
+						sourceCapName = r.getParentName();
 					} else {
 						fullReqName = getRequirementPath(r);
 						sourceCapName = getSubPathByFirstDelimiterAppearance(fullReqName);
@@ -205,13 +205,6 @@ public class CapabiltyRequirementConvertor {
 		return toscaRequirements;
 	}
 
-	private String getSourceCvfcDataTypeName(String name, String ownerName) {
-		if(name.contains(ownerName)){
-			return name.substring(0, name.length() - ownerName.length() - 1);
-		}
-		return null;
-	}
-
 	private String getRequirementPath(RequirementDefinition r) {
 		List<String> pathArray = Lists.reverse(r.getPath().stream()
 				.map(path -> ValidationUtils.normalizeComponentInstanceName(getSubPathByLastDelimiterAppearance(path)))
@@ -275,7 +268,7 @@ public class CapabiltyRequirementConvertor {
 					String sourceReqName;
 					if(ToscaUtils.isComplexVfc(component)){
 						fullCapName = c.getName();
-						sourceReqName = getSourceCvfcDataTypeName(c.getName(), c.getOwnerName());
+						sourceReqName = c.getParentName();
 					} else {
 						fullCapName = getCapabilityPath(c);
 						sourceReqName = getSubPathByFirstDelimiterAppearance(fullCapName);