X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml;h=4d75a2fba665736b6f4a04f640c2b8cae6724c21;hb=695b770064bd338191803296d67d9482e0951771;hp=00d3df3e4534724e52d3cb5bfad18e4518264606;hpb=c3e2005d4a8bc51460a8ad9661c8961ad8c6eaf4;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
index 00d3df3e..4d75a2fb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml
@@ -2,7 +2,7 @@
 <block atomic="true"><set>
 <parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
 <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-<parameter name='tmp.ar.sz-vnf-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.tunnelxconn-vnf-id`' />
+<parameter name='tmp.ar.brg-vnf-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.tunnelxconn-vnf-id`' />
 
 
 </set><set>
@@ -14,7 +14,7 @@
     <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
     <parameter name='contextPrefix' value='prop' />
 </execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-    <parameter name="source" value="`$prop.restapi.sz-allottedresource`"/>
+    <parameter name="source" value="`$prop.restapi.tx-allottedresource`"/>
     <parameter name="outputPath" value="tmp.ar-url"/>
     <parameter name="target" value="{allotted-resource-id}"/>
     <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
@@ -29,51 +29,66 @@
 <outcome value='success'>
 <block atomic="true">
 <set>
-<parameter name='bk-sz-ar' value='$mdsal-ar.' />
+<parameter name='bk-tx-ar' value='$mdsal-ar.' />
 </set><switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>
 <outcome value='1'>
 <block atomic='true'>
 <set>
-<parameter name='sz-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />
-</set><switch test='`$sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />
+</set><switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
 <outcome value='Created'>
 <block>
 </block></outcome><outcome value='Other'>
 <block>
 </block></outcome></switch><set>
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
 
 </set></block></outcome></switch></block></outcome><outcome value='Other'>
 <block atomic="true">
 </block></outcome></execute><set>
-<parameter name='sz-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-<parameter name='sz-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
-<parameter name='sz-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
-<parameter name='sz-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+<parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+<parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
+<parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
+<parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
     <parameter name="outputPath" value="tmp.current-time" />
 
 </execute><set>
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
-<parameter name='sz-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
+<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
+<parameter name='tx-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 = $tunnelxconn-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $tunnelxconn-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $tunnelxconn-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="operational-status" value="in-service-path" />
+
+
+<!--
+
+<set>
+$tunnelxconn-topology-operation-input.service-information.global-customer-id
+$tunnelxconn-topology-operation-input.service-information.subscription-service-type
+
 		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
 			allotted-resource.id = $tmp.ar.allotted-resource-id"
-        pfx='pfx' local-only='false' force='false'>
-	<parameter name="operational-status" value="in-service-path" />
-<outcome value='failure'>
+			
+			$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id
+			
+--><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
@@ -84,7 +99,7 @@
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="AAI failed" />
 </return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sz.templatefile`" />
+    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`" />
     <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
     <parameter name='restapiUser' value='`$prop.controller.user`' />
     <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
@@ -115,4 +130,4 @@
 <parameter name="ack-final-indicator" value="Y" />
 <parameter name="error-code" value="200" />
 <parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file
+</return></block></method></service-logic>