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-assign.xml;h=666caad60509f23fc311f98325a06ff928a6dafb;hb=ff9bbad4bde78468e40f8433972d4964a5fbd72f;hp=3c85b1b9788a689dc5f18dc9212cfe805a95ffdb;hpb=067ac3647384f53d9bdad34f4e0267859ccd75f0;p=sdnc%2Foam.git

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 3c85b1b9..666caad6 100644
--- 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
@@ -17,15 +17,23 @@
     <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='tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/$tunnelxconn-topology-operation-input.alloted-resource-information.allotted-resource-id' pfx='mdsal-ar' >
+</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+    <parameter name='restapiUser' value='`$prop.controller.user`' />
+    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+    <parameter name='format' value='json' />
+    <parameter name='httpMethod' value='GET' />
+    <parameter name="responsePrefix" value="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 tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+    value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
 </return></outcome><outcome value='Other'>
-<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id' pfx='mdsal-parent-service-instance' >
+
+<call module='GENERIC-RESOURCE-API' rpc='get-vnf-api-parent-instance' mode='sync' >
 <outcome value='success'>
 <block atomic="true">
 <set>
@@ -121,27 +129,46 @@ value="`$ar-model.version`" />
     <parameter name="error-message" value="Error in allotted-resource-model data.  Ecomp-generated-naming should be true" />
 
 </return></outcome></switch><set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' 
-value="`$tx-ar-identifiers.`" />
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value="`$tx-ar-identifiers.`" />
 
 
 </set><set>
 <parameter name='tmp.vni' value='123' />
 <parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />
-<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' /></set><for index='curparm' start='0' end='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param_length`' >
-<switch test='$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].name'>
-<outcome value='vGMUX_Bearer_IP'>
+<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 != ''`">
+<outcome value='true'>
+<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >
+<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>
+<outcome value='vgmux_private_ip_0'>
 <set>
-<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].value`'>
-`' />
-</set></outcome><outcome value='vGMUX_LAN_IP'>
+<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
+
+</set></outcome><outcome value='vgmux_private_ip_2'>
 <set>
-<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnfs.vnf[0].vnf-data.vf-modules.vf-module[0].vf-module-data.vf-module-topology.vf-module-parameter.param[$curparm].value`'>
-`' />
-</set></outcome></switch></for><set>
-<parameter name='tx-ar-assignments.vni' value='`$tmp.vni`'/>
-<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip'/>
+<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
+
+</set></outcome></switch></for></outcome></switch><set>
+<parameter name='tmp.manageVni.action' value='reserve' />
+<parameter name='tmp.manageIpaddr.action' value='reserve' />
+<parameter name='tmp.manageVni.pool' value='VNI'/>
+<parameter name='tmp.manageIpaddr.pool' value='VGW'/></set><call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >
+</call><call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >
+</call><set>
+<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>
+<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>
 <parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>
+<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>
+
+</set><set>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_2'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_0'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>
 
 </set><set>
 <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' 
@@ -163,8 +190,7 @@ value="`$tx-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>
-</break></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
+<parameter name='tmp.found-cidx' value='true' /></set></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`' />
@@ -183,7 +209,13 @@ value="`$tx-ar-assignments.`" />
 <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" 
+</set><set>
+<parameter name='service-data.service-information.global-customer-id' value='`$tunnelxconn-topology-operation-input.service-information.global-customer-id`' />
+<parameter name='service-data.service-information.subscription-service-type' value='`$tunnelxconn-topology-operation-input.service-information.subscription-service-type`' />
+<!--
+<parameter name='service-data.service-information.service-instance-id' value='`$tunnelxconn-topology-operation-input.service-information.service-instance-id`' />
+-->
+<parameter name='service-data.service-information.service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`"/></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
@@ -194,8 +226,7 @@ value="`$tx-ar-assignments.`" />
 	<parameter name="selflink" value="`$tmp.ar.self-link`" />
 	<parameter name="model-invariant-id" value="`$ar-model.invariant-uuid`" />
 	<parameter name="model-version-id" value="`$ar-model.uuid`" />
-	<parameter name="operational-status" value="null" />
-<outcome value='failure'>
+	<parameter name="operational-status" value="null" /><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
@@ -214,24 +245,9 @@ value="`$tx-ar-assignments.`" />
     <parameter name='httpMethod' value='PUT' />
     <parameter name="responsePrefix" value="mdsal-ar" />
 
-<outcome value='success'>
-<block>
-<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-    <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
-    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />
-    <parameter name='restapiUser' value='`$prop.controller.user`' />
-    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
-    <parameter name='format' value='json' />
-    <parameter name='httpMethod' value='DELETE' />
-    <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'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
@@ -258,4 +274,4 @@ value="`$tx-ar-assignments.`" />
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" 
     value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />
-</return></outcome></get-resource></outcome></get-resource></block></method></service-logic>
\ No newline at end of file
+</return></outcome></call></outcome></execute></block></method></service-logic>