Fixes from Integration 11-16

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index 191556d..21f0efb 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
@@ -17,14 +17,8 @@
     <parameter name="outputPath" value="tmp.ar-url"/>\r
     <parameter name="target" value="{allotted-resource-id}"/>\r
     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>\r
-</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.alloted-resource-information.allotted-resource-id' pfx='mdsal-ar' >\r
-<outcome value='success'>\r
-<return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" \r
-    value="`'Existing brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />\r
-</return></outcome><outcome value='Other'>\r
+</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\r
+<outcome value='Other'>\r
 <block atomic="true">\r
 <set>\r
 <parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />\r
@@ -124,7 +118,7 @@ value="`$brg-ar-identifiers.`" />
 \r
 \r
 </set><set>\r
-<parameter name='brg-ar-assignments.vbrg-wan-ip' value='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address`'/>\r
+<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>\r
 </set><set>\r
 <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' \r
 value="`$brg-ar-assignments.`" />\r
@@ -145,7 +139,7 @@ value="`$brg-ar-assignments.`" />
 <block atomic="true"><set>\r
 <parameter name='tmp.cidx' value='`$cidx`' />\r
 <parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\r
-<parameter name='tmp.found-cidx' value='true' /></set><break/></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>\r
+<parameter name='tmp.found-cidx' value='true' /></set><break></break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>\r
 <outcome value='false'>\r
 <block atomic="true"><set>\r
 <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\r
@@ -166,9 +160,9 @@ value="`$brg-ar-assignments.`" />
 <parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\r
 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="allotted-resource" \r
-               key="customer.global-customer-id = $service-data.service-information.global-customer-id AND\r
-                       service-subscription.service-type = $service-data.service-information.subscription-service-type AND\r
-                       service-instance.service-instance-id = $service-data.service-information.service-instance-id AND\r
+               key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $brg-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\r
                        allotted-resource.id = $tmp.ar.allotted-resource-id"\r
         pfx='pfx' local-only='false' force='false'>\r
        <parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />\r
@@ -207,12 +201,9 @@ value="`$brg-ar-assignments.`" />
     <parameter name="responsePrefix" value="parent" />\r
 \r
 <outcome value='success'>\r
-<block>\r
-</block></outcome><outcome value='failure'>\r
-<block>\r
-</block></outcome><outcome value='not-found'>\r
-<block>\r
-</block></outcome></execute></block></outcome><outcome value='failure'>\r
+<block></block></outcome><outcome value='failure'>\r
+<block></block></outcome><outcome value='not-found'>\r
+<block></block></outcome></execute></block></outcome><outcome value='failure'>\r
 <return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
@@ -233,4 +224,4 @@ value="`$brg-ar-assignments.`" />
 <parameter name="ack-final-indicator" value="Y" />\r
 <parameter name="error-code" value="200" />\r
 <parameter name="error-message" value="`$error-message`" />\r
-</return></block></outcome></get-resource></block></method></service-logic>
+</return></block></outcome></get-resource></block></method></service-logic>\r