Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / main / groovy / org / openecomp / mso / bpmn / infrastructure / scripts / CreateVFCNSResource.groovy

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
index 5390ee9..fd819fd 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy
@@ -238,10 +238,10 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
         }\r
         String globalSubscriberId = execution.getVariable("globalSubscriberId")\r
         String serviceType = execution.getVariable("serviceType")\r
-        String serviceId = execution.getVariable("serviceId")\r
+        String serviceId = execution.getVariable("serviceInstanceId")\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
+                                            <related-link>/aai/v11/business/customers/customer/${globalSubscriberId}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceId}</related-link>\r
                                             <relationship-data>\r
                                                 <relationship-key>customer.global-customer-id</relationship-key>\r
                                                 <relationship-value>${globalSubscriberId}</relationship-value>\r
@@ -252,12 +252,12 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
                                             </relationship-data>\r
                                            <relationship-data>\r
                                                 <relationship-key>service-instance.service-instance-id</relationship-key>\r
-                                                <relationship-value>${nsInstanceId}</relationship-value>\r
+                                                <relationship-value>${serviceId}</relationship-value>\r
                                             </relationship-data>           \r
                                         </relationship>"""\r
         String endpoint = execution.getVariable("URN_aai_endpoint")  \r
         utils.log("INFO","Add Relationship req:\n" + addRelationPayload,  isDebugEnabled)\r
-        String url = endpoint + "/aai/v11/business/customers/customer/" + globalSubscriberId + "/service-subscriptions/service-subscription/" + serviceType + "/service-instances/service-instance/" + serviceId + "/relationship-list/relationship"\r
+        String url = endpoint + "/aai/v11/business/customers/customer/" + globalSubscriberId + "/service-subscriptions/service-subscription/" + serviceType + "/service-instances/service-instance/" + nsInstanceId + "/relationship-list/relationship"\r
         APIResponse aaiRsp = executeAAIPutCall(execution, url, addRelationPayload)\r
         utils.log("INFO","aai response status code:" + aaiRsp.getStatusCode(),  isDebugEnabled)\r
         utils.log("INFO","aai response content:" + aaiRsp.getResponseBodyAsString(),  isDebugEnabled)\r