diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2017-11-06 12:09:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-06 12:09:22 +0000 |
| commit | a0652c47e1dc06e4e91857072c2701ced9bcacc3 (patch) | |
| tree | eae85fe0d8dc828846741768af2ae85791570ee4 /bpmn/MSOInfrastructureBPMN/src/main/groovy/org | |
| parent | eb1ffb9557c20594e639116c75eb6862ca7fe0b9 (diff) | |
| parent | 4887944fca29960af6876205056affebc5a5b978 (diff) | |
Merge "Add Relationship between e2eservice and ns"
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy/org')
| -rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy | 5 |
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>
|