Fix tunnelxconn DGs

[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 e318c7c..7eeb374 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
@@ -2,7 +2,6 @@
 <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
 \r
 \r
 </set><set>\r
@@ -14,95 +13,64 @@
     <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
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-    <parameter name="source" value="`$prop.restapi.vnf-provided-allottedresource`" />\r
-    <parameter name="outputPath" value="tmp.vnf-p-ar-url" />\r
-    <parameter name="target" value="{service-instance-id}" />\r
-    <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`" />\r
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
-    <parameter name="source" value="`$tmp.vnf-p-ar-url`" />\r
-    <parameter name="outputPath" value="tmp.vnf-p-ar-url" />\r
-    <parameter name="target" value="{vnf-id}"/>\r
-    <parameter name="replacement" value="`$tmp.ar.sz-vnf-id`"/>\r
-</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\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
-    <parameter name='format' value='json' />\r
-    <parameter name='httpMethod' value='GET' />\r
-    <parameter name="responsePrefix" value="mdsal-ar" />\r
-\r
+</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' >\r
 <outcome value='success'>\r
-<block atomic="true">\r
-<set>\r
-<parameter name='bk-sz-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
-<outcome value='Created'>\r
-<return status='failure'>\r
-       <parameter name='ack-final' value='Y'/>\r
-       <parameter name="error-code" value="500" />\r
-    <parameter name="error-message" \r
-    value="`'Existing tunnelxconn-allotted-resource with order status of ' + $sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />\r
-</return></outcome><outcome value='PendingDelete'>\r
 <return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" \r
-    value="`'Existing tunnelxconn-allotted-resource with order status of ' + $sz-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />\r
-</return></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
-\r
-</set></block></outcome></switch></block></outcome><outcome value='Other'>\r
+    value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.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='GENERIC-RESOURCE-API' key='services/service/$tmp.ar.parent-service-instance-id' pfx='mdsal-parent-service-instance' >\r
+<outcome value='success'>\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><set>\r
-<parameter name='sz-ar-identifiers.consuming-service-instance-id' value="`$tunnelxconn-topology-operation-input.service-information.service-instance-id` " />\r
-<parameter name='sz-ar-identifiers.parent-service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />\r
-<parameter name='sz-ar-identifiers.allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />\r
-<parameter name='sz-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />\r
+<set>\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><set>\r
+<parameter name='tx-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='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$sz-ar.allotted-resource-status.rpc-action`' />\r
+<parameter name='tx-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
+\r
+</set><set>\r
+<parameter name='tx-ar-identifiers.consuming-service-instance-id' value="`$tunnelxconn-topology-operation-input.service-information.service-instance-id` " />\r
+<parameter name='tx-ar-identifiers.parent-service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />\r
+<parameter name='tx-ar-identifiers.allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />\r
+<parameter name='tx-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />\r
 \r
 </set><set>\r
-<parameter name='sz-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \r
 value="`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`" />\r
 \r
 \r
 </set><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\r
 <outcome value=''>\r
 <set>\r
-<parameter name='sz-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \r
 value="`$ar-model.invariant-uuid`" />\r
 \r
 \r
 </set></outcome></switch><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\r
 <outcome value=''>\r
 <set>\r
-<parameter name='sz-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \r
 value="`$ar-model.uuid`" />\r
 \r
 \r
 </set></outcome></switch><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\r
 <outcome value=''>\r
 <set>\r
-<parameter name='sz-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \r
 value="`$ar-model.version`" />\r
 \r
 \r
@@ -110,7 +78,7 @@ value="`$ar-model.version`" />
 <outcome value='Y'>\r
 <block atomic="true">\r
 <switch test='`$ar-model.naming-policy`'>\r
-<outcome value='oam_security_zone_name'>\r
+<outcome value='oam_network_policy'>\r
 <block atomic='true'>\r
 <set>\r
 <parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\r
@@ -127,7 +95,7 @@ value="`$ar-model.version`" />
     <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>\r
 \r
 </execute><set>\r
-<parameter name='sz-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\r
+<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\r
 </set></block></outcome><outcome value='Other'>\r
 <block atomic='true'>\r
 <set>\r
@@ -145,7 +113,7 @@ value="`$ar-model.version`" />
     <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>\r
 \r
 </execute><set>\r
-<parameter name='sz-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\r
+<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\r
 </set></block></outcome></switch></block></outcome><outcome value='Other'>\r
 <return status='failure'>\r
        <parameter name='ack-final' value='Y'/>\r
@@ -153,25 +121,31 @@ value="`$ar-model.version`" />
     <parameter name="error-message" value="Error in allotted-resource-model data.  Ecomp-generated-naming should be true" />\r
 \r
 </return></outcome></switch><set>\r
-<parameter name='sz-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' \r
-value="`$sz-ar-identifiers.`" />\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' \r
+value="`$tx-ar-identifiers.`" />\r
 \r
 \r
 </set><set>\r
-<parameter name='sz-ar-assignments.vlan-tag' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag` " />\r
-<parameter name='sz-ar-assignments.trusted-network-role' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role` " />\r
-<parameter name='sz-ar-assignments.untrusted-network-role' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role` " />\r
-<parameter name='sz-ar-assignments.tunnelxconn-service-instance-id' value="`$tmp.ar.parent-service-instance-id` " />\r
-\r
-</set><call module='GENERIC-RESOURCE-API' rpc='generate-panorama-name' mode='sync' >\r
-</call><set>\r
-<parameter name='sz-ar-assignments.tunnelxconn-name-untrusted' value="`$tmp.untrust-sz` " />\r
-<parameter name='sz-ar-assignments.tunnelxconn-name-trusted' value="`$tmp.trust-sz` " />\r
-\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><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`' >\r
+<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'>\r
+<outcome value='vGMUX_Bearer_IP'>\r
+<set>\r
+<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`'>\r
+`' />\r
+</set></outcome><outcome value='vGMUX_LAN_IP'>\r
+<set>\r
+<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`'>\r
+`' />\r
+</set></outcome></switch></for><set>\r
+<parameter name='tx-ar-assignments.vni' value='`$tmp.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
 \r
 </set><set>\r
-<parameter name='sz-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \r
-value="`$sz-ar-assignments.`" />\r
+<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \r
+value="`$tx-ar-assignments.`" />\r
 \r
 \r
 </set><switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\r
@@ -278,4 +252,10 @@ value="`$sz-ar-assignments.`" />
 <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></outcome><outcome value='Other'>\r
+<return status='failure'>\r
+       <parameter name='ack-final' value='Y'/>\r
+       <parameter name="error-code" value="500" />\r
+    <parameter name="error-message" \r
+    value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />\r
+</return></outcome></get-resource></outcome></get-resource></block></method></service-logic>
\ No newline at end of file