integration test issues fix for sdwan and sotn

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
index 29094f7..75d05fa 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
@@ -236,7 +236,7 @@ value="`$connection-attachment-ar-identifiers.`" />
  + $connection-attachment-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="allotted-resource" \r
                key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\r
                        service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\r
@@ -244,17 +244,10 @@ value="`$connection-attachment-ar-identifiers.`" />
                        allotted-resource.id = $tmp.ar.allotted-resource-id"\r
         pfx='pfx' local-only='false' force='false'>\r
                 <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />\r
-                <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />\r
-                <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />\r
-                <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />\r
-                <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />\r
-                <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />\r
-                <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />\r
-                <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />\r
-                <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />\r
+                <parameter name="role" value="`$prop.connection-attachment.role`" />\r
+                <parameter name="vpn-name" value="`$prop.connection-attachment.sdwanVpnName`" />\r
                 <parameter name="selflink" value="`$tmp.ar.self-link`" />\r
-                <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />\r
-                <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />\r
+                <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->\r
                 <parameter name="operational-status" value="Created" />\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
@@ -270,7 +263,7 @@ value="`$connection-attachment-ar-identifiers.`" />
                         <parameter name="error-message" value="AAI failed" />\r
                     </return>\r
                 </outcome>\r
-            </update>\r
+            </save>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r