aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorc00149107 <chenchuanyu@huawei.com>2017-11-06 16:41:52 +0800
committerc00149107 <chenchuanyu@huawei.com>2017-11-06 16:41:52 +0800
commit4887944fca29960af6876205056affebc5a5b978 (patch)
treec3693e443a52355c402eb4f7fa1ee8727a5b1dda
parent66dc783944bd8883dc8f784c8f223e5f89ee1471 (diff)
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>
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy5
1 files changed, 2 insertions, 3 deletions
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>