Add Relationship between e2eservice and ns

Add Relationship between e2eservice and ns

Change-Id: Ib79fe952560789b2a1113e93eea1179b6c5088e7
Issue-ID:SO-307
Signed-off-by: c00149107 <chenchuanyu@huawei.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
index 41d7edb..06cf8c3 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
@@ -208,15 +208,14 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces
     public void addNSRelationship(Execution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
         utils.log("INFO"," ***** addNSRelationship *****",  isDebugEnabled)\r
-        String operationStatus = execution.getVariable("operationStatus")\r
-        if(operationStatus != "finished"){\r
+        String nsInstanceId = execution.getVariable("nsInstanceId")\r
+        if(nsInstanceId == null || nsInstanceId == ""){\r
             utils.log("INFO"," create NS failed, so do not need to add relationship",  isDebugEnabled)\r
             return\r
         }\r
         String globalSubscriberId = execution.getVariable("globalSubscriberId")\r
         String serviceType = execution.getVariable("serviceType")\r
         String serviceId = execution.getVariable("serviceId")\r
-        String nsInstanceId = execution.getVariable("nsInstanceId")\r
         String addRelationPayload = """<relationship xmlns="http://org.openecomp.aai.inventory/v11">\r
                                             <related-to>service-instance</related-to>\r
                                             <related-link>/aai/v11/business/customers/customer/${globalSubscriberId}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${nsInstanceId}</related-link>\r