\r
\r
</set><set>\r
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\r
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource='\r
+ $tmp.ar.allotted-resource-id\r
- + '/allotted-resource-data/tunnelxconn-topology/'` " />\r
+ + '/allotted-resource-data/tunnelxconn-topology?content=config'` " />\r
\r
</set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
<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
\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
<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
<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
<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
</return></outcome></execute><set>\r
<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\r
<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>\r
-<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
+<parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='\r
+ $brg-topology-operation-input.service-information.service-instance-id\r
- + '/service-data/service-topology/'`"/>\r
+ + '/service-data/service-topology?content=config'`"/>\r
\r
</set><return status='success'>\r
<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>
\ No newline at end of file
+</return></block></outcome></get-resource></block></method></service-logic>\r