From: c00149107 <chenchuanyu@huawei.com>
Date: Mon, 6 Nov 2017 08:41:52 +0000 (+0800)
Subject: Add Relationship between e2eservice and ns
X-Git-Tag: v1.1.0~13^2~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F22275%2F1;p=so.git

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 41d7edbebc..06cf8c3cd1 100644
--- 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) {
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
         utils.log("INFO"," ***** addNSRelationship *****",  isDebugEnabled)
-        String operationStatus = execution.getVariable("operationStatus")
-        if(operationStatus != "finished"){
+        String nsInstanceId = execution.getVariable("nsInstanceId")
+        if(nsInstanceId == null || nsInstanceId == ""){
             utils.log("INFO"," create NS failed, so do not need to add relationship",  isDebugEnabled)
             return
         }
         String globalSubscriberId = execution.getVariable("globalSubscriberId")
         String serviceType = execution.getVariable("serviceType")
         String serviceId = execution.getVariable("serviceId")
-        String nsInstanceId = execution.getVariable("nsInstanceId")
         String addRelationPayload = """<relationship xmlns="http://org.openecomp.aai.inventory/v11">
                                             <related-to>service-instance</related-to>
                                             <related-link>/aai/v11/business/customers/customer/${globalSubscriberId}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${nsInstanceId}</related-link>