Fixes for 11-17 tests

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

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