Reverse service direction for AAI AddRelationShip

fix deleteNSRelationship comments bug

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0644f7
Issue-ID: SO-578
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>

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 1ec1df1..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
@@ -241,7 +241,7 @@ public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
         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

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
index f0ecbab..d3e89df 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
@@ -107,7 +107,7 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
      */\r
     public void deleteNSRelationship(DelegateExecution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
-        utils.log("INFO"," ***** addNSRelationship *****",  isDebugEnabled)\r
+        utils.log("INFO"," ***** deleteNSRelationship *****",  isDebugEnabled)\r
         String nsInstanceId = execution.getVariable("resourceInstanceId")\r
         if(nsInstanceId == null || nsInstanceId == ""){\r
             utils.log("INFO"," Delete NS failed",  isDebugEnabled)\r
@@ -133,13 +133,13 @@ public class DoDeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
                                             </relationship-data>           \r
                                         </relationship>"""\r
         String endpoint = execution.getVariable("URN_aai_endpoint")\r
-        utils.log("INFO","Add Relationship req:\n" + deleteRelationPayload,  isDebugEnabled)\r
+        utils.log("INFO","Delete Relationship req:\n" + deleteRelationPayload,  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
 \r
         APIResponse aaiRsp = executeAAIDeleteCall(execution, url, deleteRelationPayload)\r
         utils.log("INFO","aai response status code:" + aaiRsp.getStatusCode(),  isDebugEnabled)\r
         utils.log("INFO","aai response content:" + aaiRsp.getResponseBodyAsString(),  isDebugEnabled)\r
-        utils.log("INFO"," *****Exit addNSRelationship *****",  isDebugEnabled)\r
+        utils.log("INFO"," *****Exit deleteNSRelationship *****",  isDebugEnabled)\r
     }\r
 \r
     public APIResponse executeAAIDeleteCall(DelegateExecution execution, String url, String payload){\r