X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_brg-topology-operation-assign.xml;h=21f0efb45ae3b8616d081aa0c2c0e63191a5daa4;hb=refs%2Fheads%2Fmaster;hp=191556dbf2981d085c5fbebffd074885a2a04d9e;hpb=191aaa5c7057a62b98899c911e316fd7d364de21;p=sdnc%2Foam.git

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 191556db..a8074bda 100644
--- 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
@@ -5,9 +5,9 @@
 
 
 </set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
+<parameter name='tmp.ar.self-link' value="`'rests/data/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource='
  + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ + '/allotted-resource-data/tunnelxconn-topology?content=config'` " />
 
 </set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
@@ -17,14 +17,8 @@
     <parameter name="outputPath" value="tmp.ar-url"/>
     <parameter name="target" value="{allotted-resource-id}"/>
     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-</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' >
-<outcome value='success'>
-<return status='failure'>
-	<parameter name='ack-final' value='Y'/>
-	<parameter name="error-code" value="500" />
-    <parameter name="error-message" 
-    value="`'Existing brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-</return></outcome><outcome value='Other'>
+</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' >
+<outcome value='Other'>
 <block atomic="true">
 <set>
 <parameter name='brg-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
@@ -124,7 +118,7 @@ value="`$brg-ar-identifiers.`" />
 
 
 </set><set>
-<parameter name='brg-ar-assignments.vbrg-wan-ip' value='`$brg-topology-operation-input.brg-request-input.brg-wan-ip-address`'/>
+<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>
 </set><set>
 <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' 
 value="`$brg-ar-assignments.`" />
@@ -145,7 +139,7 @@ value="`$brg-ar-assignments.`" />
 <block atomic="true"><set>
 <parameter name='tmp.cidx' value='`$cidx`' />
 <parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
-<parameter name='tmp.found-cidx' value='true' /></set><break/></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
+<parameter name='tmp.found-cidx' value='true' /></set><break></break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
 <outcome value='false'>
 <block atomic="true"><set>
 <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
@@ -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`' />
 </set><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="allotted-resource" 
-		key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
-			service-subscription.service-type = $service-data.service-information.subscription-service-type AND
-			service-instance.service-instance-id = $service-data.service-information.service-instance-id AND
+		key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $brg-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
         pfx='pfx' local-only='false' force='false'>
 	<parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
@@ -207,12 +201,9 @@ value="`$brg-ar-assignments.`" />
     <parameter name="responsePrefix" value="parent" />
 
 <outcome value='success'>
-<block>
-</block></outcome><outcome value='failure'>
-<block>
-</block></outcome><outcome value='not-found'>
-<block>
-</block></outcome></execute></block></outcome><outcome value='failure'>
+<block></block></outcome><outcome value='failure'>
+<block></block></outcome><outcome value='not-found'>
+<block></block></outcome></execute></block></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
@@ -225,12 +216,12 @@ value="`$brg-ar-assignments.`" />
 </return></outcome></execute><set>
 <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
 <parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
-<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+<parameter name='service-object-path' value="`'rests/data/GENERIC-RESOURCE-API:services/service='
  + $brg-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
+ + '/service-data/service-topology?content=config'`"/>
  
 </set><return status='success'>
 <parameter name="ack-final-indicator" value="Y" />
 <parameter name="error-code" value="200" />
 <parameter name="error-message" value="`$error-message`" />
-</return></block></outcome></get-resource></block></method></service-logic>
+</return></block></outcome></get-resource></block></method></service-logic>