Using RestApiCallNode instead of RestconfApiCallNode and updating templates accordingly.
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sotn_nni / GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml
index 7a4eedf..d8e111c 100644 (file)
@@ -1,65 +1,63 @@
-<service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
-    <method rpc='sotn-vf-operation-uni-activate' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">\r
+    <method rpc="sotn-vf-operation-uni-activate" mode="sync">\r
         <block atomic="true">\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
+            <switch test="`$service-data.vnfs.vnf_length`">\r
+                <outcome value="">\r
+                    <return status="failure">\r
+                        <parameter name="ack-final" value="Y"/>\r
+                        <parameter name="error-code" value="500"/>\r
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data"/>\r
                     </return>\r
                 </outcome>\r
             </switch>\r
-            <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
+            <for index="idx" start="0" end="`$service-data.vnfs.vnf_length`">\r
                 <switch test="`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`">\r
-                    <outcome value='true'>\r
+                    <outcome value="true">\r
                         <block atomic="true">\r
                             <set>\r
-                                <parameter name='vnf-index' value='`$idx`' />\r
+                                <parameter name="vnf-index" value="`$idx`"/>\r
                             </set>\r
                             <set>\r
-                                <parameter name='tmp.vnf-id' value='`$vf-module-topology-operation-input.vnf-information.vnf-id`' />\r
+                                <parameter name="tmp.vnf-id" value="`$vf-module-topology-operation-input.vnf-information.vnf-id`"/>\r
                             </set>\r
                         </block>\r
                     </outcome>\r
                 </switch>\r
             </for>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
-                <parameter name='contextPrefix' value='prop' />\r
+            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">\r
+                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>\r
+                <parameter name="contextPrefix" value="prop"/>\r
             </execute>\r
-            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
-                <outcome value='0'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
+            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`">\r
+                <outcome value="0">\r
+                    <return status="failure">\r
+                        <parameter name="ack-final" value="Y"/>\r
+                        <parameter name="error-code" value="500"/>\r
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data"/>\r
                     </return>\r
                 </outcome>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
+                <outcome value="">\r
+                    <return status="failure">\r
+                        <parameter name="ack-final" value="Y"/>\r
+                        <parameter name="error-code" value="500"/>\r
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data"/>\r
                     </return>\r
                 </outcome>\r
-                <outcome value='Other'>\r
+                <outcome value="Other">\r
                     <block atomic="true">\r
                         <set>\r
-                            <parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\r
+                            <parameter name="vf-module-length" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`"/>\r
                         </set>\r
-                        <for index='idx' start='0' end='`$vf-module-length`' >\r
+                        <for index="idx" start="0" end="`$vf-module-length`">\r
                             <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`">\r
-                                <outcome value='true'>\r
+                                <outcome value="true">\r
                                     <block atomic="true">\r
                                         <set>\r
-                                            <parameter name='tmp.vidx' value='`$idx`' />\r
-                                            <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\r
+                                            <parameter name="tmp.vidx" value="`$idx`"/>\r
+                                            <parameter name="ctx.vf-module-data." value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`"/>\r
                                         </set>\r
                                         <set>\r
-                                            <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\r
+                                            <parameter name="vf-module-request-input." value="`$ctx.vf-module-data.vf-module-request-input.`"/>\r
                                         </set>\r
                                     </block>\r
                                 </outcome>\r
                     </block>\r
                 </outcome>\r
             </switch>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="generic-vnf" \r
-               key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id"\r
-        pfx='tmp.aai.generic-vnf' local-only='false' >\r
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id" pfx="tmp.aai.generic-vnf" local-only="false">\r
                 <!--AND depth = '0'"-->\r
-                <outcome value='success'>\r
+                <outcome value="success">\r
                     <block>\r
-                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >\r
-                            <switch test='`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`'>\r
-                                <outcome value='uni'>\r
+                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.generic-vnf.relationship-list.relationship_length`">\r
+                            <switch test="`$tmp.aai.generic-vnf.relationship-list.relationship[$vidx].related-to`">\r
+                                <outcome value="uni">\r
                                     <block atomic="true">\r
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="uni" \r
-               key="uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value"\r
-        pfx='tmp.aai.uni' local-only='false' >\r
-                                            <outcome value='success'>\r
+                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="uni" key="uni.id = $tmp.aai.generic-vnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value" pfx="tmp.aai.uni" local-only="false">\r
+                                            <outcome value="success">\r
                                                 <block>\r
                                                     <set>\r
-                                                        <!--<parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />-->\r
-                                                        <parameter name='`tmp.unis.uni[$vidx].`' value="`$tmp.aai.uni.`" />\r
+                                                        <!--\r
+                                                        <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />\r
+                                                        -->\r
+                                                        <parameter name="`tmp.unis.uni[$vidx].`" value="`$tmp.aai.uni.`"/>\r
                                                     </set>\r
-                                                    <!--<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >-->\r
-                                                    <!--<parameter name="original_string" value='`tmp.unis.uni[$vidx].tp-id`'/>-->\r
-                                                    <!--<parameter name="regex" value="nodeId"/>-->\r
-                                                    <!--<parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>-->\r
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                                                        <parameter name="original_string" value='`tmp.aai.uni.tp-id`'/>\r
-                                                        <parameter name="regex" value="nodeId"/>\r
-                                                        <parameter name="tmp.aai.uni.pnf-name" value=""/>\r
-                                                        <outcome value='success'>\r
+                                                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">\r
+                                                        <parameter name="original_string" value="`tmp.aai.uni.tp-id`"/>\r
+                                                        <parameter name="regex" value="[^-]+$"/>\r
+                                                        <parameter name="ctx_memory_result_key" value="param-prefix"/>\r
+                                                        <outcome value="success">\r
                                                             <set>\r
-                                                                <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />\r
-                                                                <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />\r
+                                                                <parameter name="tmp.src.ltpId" value="`$param-prefix[$param-prefix_length -1]`"/>\r
                                                             </set>\r
                                                         </outcome>\r
-                                                        <outcome value='failure'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='error-code' value='' />\r
-                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />\r
+                                                        <outcome value="failure">\r
+                                                            <return status="failure">\r
+                                                                <parameter name="error-code" value=""/>\r
+                                                                <parameter name="error-message" value="An error occured while splitting sna1_route"/>\r
                                                             </return>\r
                                                         </outcome>\r
                                                     </execute>\r
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="pnf" \r
-               key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'\r
-               AND depth = '0'"\r
-        pfx='tmp.aai.pnf' local-only='false' >\r
-                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->\r
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name' AND depth = '0'" pfx="tmp.aai.pnf" local-only="false">\r
+                                                        <!--\r
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                        -->\r
                                                         <!--           resource="generic-vnf" -->\r
-                                                        <!--           key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->\r
+                                                        <!--\r
+                                                                key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'\r
+                                                        -->\r
                                                         <!--           AND depth = '0'"-->\r
-                                                        <!--        pfx='tmp.aai.generic-vnf' local-only='false' >-->\r
-                                                        <outcome value='success'>\r
+                                                        <!--\r
+                                                                pfx='tmp.aai.generic-vnf' local-only='false' >\r
+                                                        -->\r
+                                                        <outcome value="success">\r
                                                             <block>\r
                                                                 <set>\r
-                                                                    <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />\r
+                                                                    <parameter name="`$tmp.unis.uni[$vidx].node-id`" value="`$tmp.aai.pnf.pnf-id`"/>\r
                                                                 </set>\r
-                                                                <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >\r
-                                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>\r
-                                                                        <outcome value='thirdparty-controller'>\r
+                                                                <for silentFailure="true" index="ridx" start="0" end="`$tmp.aai.pnf.relationship-list.relationship_length`">\r
+                                                                    <switch test="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`">\r
+                                                                        <outcome value="thirdparty-controller">\r
                                                                             <block atomic="true">\r
                                                                                 <set>\r
-                                                                                    <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                                    <parameter name="`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`" value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`"/>\r
                                                                                 </set>\r
                                                                             </block>\r
                                                                         </outcome>\r
-                                                                        <outcome value='network-resource'>\r
+                                                                        <outcome value="network-resource">\r
                                                                             <block atomic="true">\r
                                                                                 <set>\r
-                                                                                    <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                                                    <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`"/>\r
                                                                                 </set>\r
-                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="network-resource" \r
-               key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'\r
-               AND depth = '0'"\r
-        pfx='tmp.aai.network-resource' local-only='false' >\r
-                                                                                    <outcome value='success'>\r
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id' AND depth = '0'" pfx="tmp.aai.network-resource" local-only="false">\r
+                                                                                    <outcome value="success">\r
                                                                                         <set>\r
-                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />\r
-                                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />\r
-                                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />\r
-                                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />\r
-                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`"/>\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`"/>\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`"/>\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`"/>\r
+                                                                                            <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`"/>\r
                                                                                         </set>\r
                                                                                     </outcome>\r
                                                                                 </get-resource>\r
                                 </outcome>\r
                             </switch>\r
                         </for>\r
-                        <switch test='`$tmp.unis.uni_length &lt; 2`' >\r
-                            <outcome value='true'>\r
-                                <return status='success'>\r
-                                    <parameter name="ack-final-indicator" value="Y" />\r
-                                    <parameter name="error-code" value="200" />\r
-                                    <parameter name="error-message" value="`$error-message`" />\r
+                        <switch test="`$tmp.unis.uni_length < 2`">\r
+                            <outcome value="true">\r
+                                <return status="success">\r
+                                    <parameter name="ack-final-indicator" value="Y"/>\r
+                                    <parameter name="error-code" value="200"/>\r
+                                    <parameter name="error-message" value="`$error-message`"/>\r
                                 </return>\r
                             </outcome>\r
                         </switch>\r
                     </block>\r
                 </outcome>\r
             </get-resource>\r
-            <call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>\r
-            <set>\r
-                <parameter name='tmp.unis.uni[0].id' value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />\r
-                <parameter name='tmp.unis.uni[0].tp-id' value="networkId-providerId-5555-clientId-6666-topologyId-11-nodeId-0.190.0.1" />\r
-                <parameter name='tmp.unis.uni[0].access-provider-id' value="`$domain-A.provider-id`" />\r
-                <parameter name='tmp.unis.uni[0].access-client-id' value="`$domain-A.client-id`" />\r
-                <parameter name='tmp.unis.uni[0].access-topology-id' value="`$domain-A.topology-id`" />\r
-                <parameter name='tmp.unis.uni[0].access-node-id' value="0.190.0.1" />\r
-                <parameter name='tmp.unis.uni[0].src-access-ltp-id' value="1234" />\r
-                <parameter name='tmp.unis.uni[0].dst-access-ltp-id' value="5678" />\r
-                <parameter name='tmp.unis.uni[0].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />\r
-                <parameter name='tmp.unis.uni[1].id' value="5642e9dd-496c-4ef6-be97-5caf4e9beec9" />\r
-                <parameter name='tmp.unis.uni[1].tp-id' value="networkId-domain2-providerId-5555-clientId-6666-topologyId-11-nodeId-0.191.0.4" />\r
-                <parameter name='tmp.unis.uni[1].access-provider-id' value="`$domain-B.provider-id`" />\r
-                <parameter name='tmp.unis.uni[1].access-client-id' value="`$domain-B.client-id`" />\r
-                <parameter name='tmp.unis.uni[1].access-topology-id' value="`$domain-B.topology-id`" />\r
-                <parameter name='tmp.unis.uni[1].access-node-id' value="0.190.0.3" />\r
-                <parameter name='tmp.unis.uni[1].src-access-ltp-id' value="9123" />\r
-                <parameter name='tmp.unis.uni[1].dst-access-ltp-id' value="4567" />\r
-                <parameter name='tmp.unis.uni[1].network-id' value="domain2-providerId-5555-clientId-6666-topologyId-11" />\r
-                <parameter name='tmp.unis.uni_length' value="2" />\r
-            </set>\r
-            <for index='vidx' start='0' end='`$tmp.unis.uni_length`' >\r
+            <call module="GENERIC-RESOURCE-API" rpc="sotn-get-otn-tunnel-path-from-oof" mode="sync"/>\r
+            <for index="vidx" start="0" end="`$tmp.unis.uni_length`">\r
                 <block atomic="true">\r
                     <set>\r
-                        <parameter name='oof.vpn.' value='`$tmp.unis.uni[$vidx].`' />\r
+                        <parameter name="oof.vpn." value="`$tmp.unis.uni[$vidx].`"/>\r
                     </set>\r
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="network-resource" \r
-               key="network-resource.network-id = $oof.vpn.network-id"\r
-        pfx='tmp.aai.network-resource' local-only='false' >\r
-                        <outcome value='success'>\r
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $oof.vpn.network-id" pfx="tmp.aai.network-resource" local-only="false">\r
+                        <outcome value="success">\r
                             <block>\r
-                                <for index='ridx' start='0' end='`$tmp.aai.network-resource.relationship-list.relationship_length`' >\r
-                                    <switch test='`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`'>\r
-                                        <outcome value='esr-thirdparty-sdnc'>\r
+                                <for index="ridx" start="0" end="`$tmp.aai.network-resource.relationship-list.relationship_length`">\r
+                                    <switch test="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].related-to`">\r
+                                        <outcome value="esr-thirdparty-sdnc">\r
                                             <set>\r
-                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.id' value="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />\r
+                                                <parameter name="prop.sdncRestApi.thirdpartySdnc.id" value="`$tmp.aai.network-resource.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`"/>\r
                                             </set>\r
                                         </outcome>\r
                                     </switch>\r
                                 </for>\r
                             </block>\r
                         </outcome>\r
-                        <outcome value='not-found'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                        <outcome value="not-found">\r
+                            <return status="failure">\r
+                                <parameter name="ack-final" value="Y"/>\r
+                                <parameter name="error-code" value="500"/>\r
+                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                             </return>\r
                         </outcome>\r
-                        <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" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                        <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" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>\r
                             </return>\r
                         </outcome>\r
                     </get-resource>\r
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \r
-                    depth = '1'"\r
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
-                        <outcome value='success'>\r
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">\r
+                        <outcome value="success">\r
                             <set>\r
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
-                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
-                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
-                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`"/>\r
+                                <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`"/>\r
+                                <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`"/>\r
+                                <!--\r
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                -->\r
+                                <!--\r
+                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />\r
+                                -->\r
+                                <!--\r
+                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                -->\r
+                                <!--\r
+                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                -->\r
                                 <!--<parameter name="format" value="json"/>-->\r
                                 <!--<parameter name="httpMethod" value="get"/>-->\r
-                                <!--<parameter name="responsePrefix" value="topology"/>-->\r
-                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
-                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
-                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
-                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                <!--\r
+                                <parameter name="responsePrefix" value="topology"/>\r
+                                -->\r
+                                <!--\r
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                -->\r
+                                <!--\r
+                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                -->\r
+                                <!--\r
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                -->\r
+                                <!--\r
+                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                -->\r
                             </set>\r
                         </outcome>\r
-                        <outcome value='not-found'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
+                        <outcome value="not-found">\r
+                            <return status="failure">\r
+                                <parameter name="ack-final" value="Y"/>\r
+                                <parameter name="error-code" value="500"/>\r
+                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>\r
                             </return>\r
                         </outcome>\r
-                        <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" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
+                        <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" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>\r
                             </return>\r
                         </outcome>\r
                     </get-resource>\r
-                    <call module='GENERIC-RESOURCE-API' rpc='sotn-create-otn-tunnel' mode='sync' ></call>\r
+                    <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`"/>\r
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`"/>\r
+                        <parameter name="format" value="json"/>\r
+                        <parameter name="httpMethod" value="post"/>\r
+                        <parameter name="responsePrefix" value="token-result"/>\r
+                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                        <parameter name="trustStorePassword" value="adminadmin"/>\r
+                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                        <outcome value="success">\r
+                            <set>\r
+                                <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/>\r
+                            </set>\r
+                        </outcome>\r
+                        <outcome value="failure">\r
+                            <return status="failure">\r
+                                <parameter name="ack-final" value="Y"/>\r
+                                <parameter name="error-code" value="500"/>\r
+                                <parameter name="error-message" value="Error executing get token rest api"/>\r
+                            </return>\r
+                        </outcome>\r
+                    </execute>\r
+                    <call module="GENERIC-RESOURCE-API" rpc="sotn-create-otn-tunnel" mode="sync"/>\r
+                    <set>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type" value="ietf-eth-tran-types:mef-10-bwp"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type" value="ietf-eth-tran-types:p2p-svc"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status" value="ietf-te-types:tunnel-state-up"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id" value="0"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type" value="ietf-eth-tran-types:port-classification"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id" value="1"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type" value="ietf-eth-tran-types:port-classification"/>\r
+                    </set>\r
                     <set>\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\r
-                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id" value="`$oof.vpn.access-provider-id`"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id" value="`$oof.vpn.access-client-id`"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id" value="`$oof.vpn.access-topology-id`"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id" value="`$oof.vpn.access-node-id`"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id" value="`$oof.vpn.src-access-ltp-id`"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id" value="`$oof.vpn.access-node-id`"/>\r
+                        <parameter name="ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id" value="`$oof.vpn.dst-access-ltp-id`"/>\r
                     </set>\r
+                    <switch test="`$prop.sdncRestApi.token_id`">\r
+                        <outcome value="">\r
+                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode" method="sendRequest">\r
+                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`"/>\r
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`"/>\r
+                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
+                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
+                                <parameter name="format" value="json"/>\r
+                                <parameter name="httpMethod" value="patch"/>\r
+                                <parameter name="dirPath" value="/opt/onap/sdnc/restconfapi/yang"/>\r
+                                <parameter name="responsePrefix" value="vpn-result"/>\r
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                <outcome value="failure">\r
+                                    <return status="failure">\r
+                                        <parameter name="ack-final" value="Y"/>\r
+                                        <parameter name="error-code" value="500"/>\r
+                                        <parameter name="error-message" value="Error executing Create vpn rest api"/>\r
+                                    </return>\r
+                                </outcome>\r
+                                <outcome value="success">\r
+                                    <block atomic="true"/>\r
+                                </outcome>\r
+                            </execute>\r
+                        </outcome>\r
+                        <outcome value="Other">\r
+                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestApiCallNode" method="sendRequest">\r
+                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`"/>\r
+                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`"/>\r
+                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
+                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
+                                <parameter name="format" value="json"/>\r
+                                <parameter name="httpMethod" value="patch"/>\r
+                                <parameter name="dirPath" value="/opt/onap/sdnc/restconfapi/yang"/>\r
+                                <parameter name="responsePrefix" value="vpn-result"/>\r
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>\r
+                                <outcome value="failure">\r
+                                    <return status="failure">\r
+                                        <parameter name="ack-final" value="Y"/>\r
+                                        <parameter name="error-code" value="500"/>\r
+                                        <parameter name="error-message" value="Error executing Create vpn rest api"/>\r
+                                    </return>\r
+                                </outcome>\r
+                                <outcome value="success">\r
+                                    <block atomic="true"/>\r
+                                </outcome>\r
+                            </execute>\r
+                        </outcome>\r
+                    </switch>\r
                 </block>\r
             </for>\r
-            <return status='success'>\r
-                <parameter name="ack-final-indicator" value="Y" />\r
-                <parameter name="error-code" value="200" />\r
-                <parameter name="error-message" value="`$error-message`" />\r
+            <return status="success">\r
+                <parameter name="ack-final-indicator" value="Y"/>\r
+                <parameter name="error-code" value="200"/>\r
+                <parameter name="error-message" value="`$error-message`"/>\r
             </return>\r
         </block>\r
     </method>\r