Fix tunnelxconn assign issues

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
index 963e5cd..c4b49c3 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
@@ -32,7 +32,7 @@
     <parameter name="error-message" \r
     value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />\r
 </return></outcome><outcome value='Other'>\r
-<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/' pfx='parent-service-instance' >\r
+<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >\r
 <outcome value='success'>\r
 <block atomic="true">\r
 <set>\r
@@ -134,29 +134,40 @@ value="`$ar-model.version`" />
 </set><set>\r
 <parameter name='tmp.vni' value='123' />\r
 <parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />\r
-<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' /></set><switch test="$parent-service-instance.service-data.vnf-topology.vnf-parameters_length != ''">\r
+<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' /></set><switch test="`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`">\r
 <outcome value='true'>\r
-<for index='curparm' start='0' end='`$parent-service-instance.service-data.vnf-topology.vnf-parameters_length`' >\r
-<switch test='$parent-service-instance.service-data.vnf-topology.vnf-parameters[$curidx].vnf-parameter-name'>\r
+<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >\r
+<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>\r
 <outcome value='vgmux_private_ip_0'>\r
 <set>\r
-<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology.vnf-parameters[$curidx].vnf-parameter-value`'/>\r
+<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\r
 \r
 </set></outcome><outcome value='vgmux_private_ip_2'>\r
 <set>\r
-<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology.vnf-parameters[$curidx].vnf-parameter-value`'/>\r
+<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\r
 \r
 </set></outcome></switch></for></outcome></switch><set>\r
-<parameter name='tmp.manage-vni.action' value='reserve' />\r
-<parameter name='tmp.manage-ipaddr.action' value='reserve' />\r
-<parameter name='tmp.manage-vni.pool' value='VNI'/>\r
-<parameter name='tmp.manage-ipaddr.pool' value='VGW'/></set><call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >\r
+<parameter name='tmp.manageVni.action' value='reserve' />\r
+<parameter name='tmp.manageIpaddr.action' value='reserve' />\r
+<parameter name='tmp.manageVni.pool' value='VNI'/>\r
+<parameter name='tmp.manageIpaddr.pool' value='VGW'/></set><call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >\r
 </call><call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >\r
 </call><set>\r
-<parameter name='tx-ar-assignments.vni' value='`$tmp.manage-vni.vni`'/>\r
+<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>\r
 <parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>\r
 <parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>\r
-<parameter name='tx-ar-assignments.vgw-private-ip-0' value='`$tmp.manage-ipaddr.ip`'/>\r
+<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>\r
+\r
+</set><set>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_0'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_2'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>\r
 \r
 </set><set>\r
 <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \r
@@ -228,24 +239,9 @@ value="`$tx-ar-assignments.`" />
     <parameter name='httpMethod' value='PUT' />\r
     <parameter name="responsePrefix" value="mdsal-ar" />\r
 \r
-<outcome value='success'>\r
-<block>\r
-<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />\r
-    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\r
-    <parameter name='restapiUser' value='`$prop.controller.user`' />\r
-    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\r
-    <parameter name='format' value='json' />\r
-    <parameter name='httpMethod' value='DELETE' />\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
 <return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r