X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fsotn_nni%2FGENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml;h=1517e95ab46dc84123bc73194dfa38fd1e35a346;hb=e4338c03378d0e4ea9c580603768056c27d0679d;hp=8bf518e2b9777cd76ecbc8d3c94b90c1d26f640b;hpb=3d8bd451ab2814ed0a27b892892e1d65907b434c;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
index 8bf518e2..1517e95a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml
@@ -1,11 +1,13 @@
-<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
-    <method rpc="sotn-get-otn-tunnel-path-from-oof" mode="sync">
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    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}'>
+    <method rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync'>
         <block atomic="true">
-            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`"/>
-                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`"/>
-                <parameter name="restapiUser" value="`$prop.oof.user`"/>
-                <parameter name="restapiPassword" value="`$prop.oof.password`"/>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
+                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
+                <parameter name="restapiUser" value="`$prop.oof.user`" />
+                <parameter name="restapiPassword" value="`$prop.oof.password`" />
                 <parameter name="format" value="json"/>
                 <parameter name="httpMethod" value="post"/>
                 <parameter name="responsePrefix" value="otn-oof"/>
@@ -13,81 +15,95 @@
                 <parameter name="trustStorePassword" value="adminadmin"/>
                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
                 <parameter name="keyStorePassword" value="adminadmin"/>
-                <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>
-                <outcome value="failure">
-                    <return status="failure">
-                        <parameter name="ack-final" value="Y"/>
-                        <parameter name="error-code" value="500"/>
-                        <parameter name="error-message" value="Error executing OOF api"/>
+                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error executing OOF api" />
                     </return>
                 </outcome>
-                <outcome value="success">
-                    <block/>
+                <outcome value='success'>
+                    <block></block>
                 </outcome>
             </execute>
-            <for index="vidx" start="0" end="`$otn-oof.solutions_length`">
+            <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
                 <block atomic="true">
                     <set>
-                        <parameter name="otn-oof.link-name" value="`$otn-oof.solutions[$vidx].link`"/>
+                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />
                     </set>
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $otn-oof.link-name" pfx="tmp.aai.cross-link" local-only="false">
+                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="logical-link" 
+		key="logical-link.link-name = $otn-oof.link-name"
+        pfx='tmp.aai.cross-link' local-only='false' >
                         <!--AND depth = '0'"-->
-                        <outcome value="success">
+                        <outcome value='success'>
                             <block>
-                                <switch test="`$tmp.aai.cross-link.link-role`">
-                                    <outcome value="cross-domain">
+                                <switch test='`$tmp.aai.cross-link.link-role`'>
+                                    <outcome value='cross-domain'>
                                         <block atomic="true">
-                                            <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">
-                                                <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">
-                                                    <outcome value="p-interface">
+                                            <for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >
+                                                <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>
+                                                    <outcome value='p-interface'>
                                                         <block>
                                                             <set>
-                                                                <parameter name="tmp.cross-link.src-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`"/>
-                                                                <parameter name="tmp.cross-link.dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`"/>
-                                                                <parameter name="tmp.src-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`"/>
-                                                                <parameter name="tmp.dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>
+                                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
+                                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`" />
+                                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`" />
                                                             </set>
                                                             <break/>
                                                         </block>
                                                     </outcome>
                                                 </switch>
                                             </for>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $tmp.src-pnf-name AND p-interface.interface-name = $tmp.cross-link.src-ltpId" pfx="tmp.aai.src-tp" local-only="false">
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="p-interface" 
+		key="pnf.pnf-name = $tmp.src-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
+        pfx='tmp.aai.src-tp' local-only='false' >
                                                 <!--AND depth = '0'"-->
-                                                <outcome value="success">
+                                                <outcome value='success'>
                                                     <block>
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $tmp.src-pnf-name" pfx="tmp.aai.src-pnf" local-only="false">
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $tmp.src-pnf-name"
+        pfx='tmp.aai.src-pnf' local-only='false' >
                                                             <!--AND depth = '0'"-->
-                                                            <outcome value="success">
+                                                            <outcome value='success'>
                                                                 <block>
                                                                     <set>
-                                                                        <parameter name="domain-A.node-id" value="`$tmp.aai.src-pnf.pnf-id`"/>
-                                                                        <parameter name="domain-A.tpn" value="1"/>
+                                                                        <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                        <parameter name='domain-A.tpn' value='1' />
                                                                     </set>
-                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-pnf.relationship-list.relationship_length`">
-                                                                        <switch test="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`">
-                                                                            <outcome value="tunnel-termination-point">
+                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
+                                                                        <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+                                                                            <outcome value='tunnel-termination-point'>
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name="tmp.src-ttp-id" value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
+                                                                                        <parameter name='tmp.src-ttp-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $tmp.src-ttp-id AND depth = '0'" pfx="tmp.aai.src-ttp" local-only="false">
-                                                                                        <outcome value="success">
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="tunnel-termination-point" 
+		key="tunnel-termination-point.ttp-id = $tmp.src-ttp-id 
+		AND depth = '0'"
+        pfx='tmp.aai.src-ttp' local-only='false' >
+                                                                                        <outcome value='success'>
                                                                                             <block atomic="true">
-                                                                                                <switch test="`$tmp.aai.src-ttp.relationship-list.relationship_length`">
-                                                                                                    <outcome value="">
-                                                                                                        <block/>
+                                                                                                <switch test='`$tmp.aai.src-ttp.relationship-list.relationship_length`'>
+                                                                                                    <outcome value=''>
+                                                                                                        <block></block>
                                                                                                     </outcome>
-                                                                                                    <outcome value="0">
-                                                                                                        <block/>
+                                                                                                    <outcome value='0'>
+                                                                                                        <block></block>
                                                                                                     </outcome>
-                                                                                                    <outcome value="Other">
-                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.src-ttp.relationship-list.relationship_length`">
-                                                                                                            <switch test="`$tmp.aai.src-ttp.relationship-list.relationship[$vidx].related-to`">
-                                                                                                                <outcome value="p-interface">
+                                                                                                    <outcome value='Other'>
+                                                                                                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.src-ttp.relationship-list.relationship_length`' >
+                                                                                                            <switch test='`$tmp.aai.src-ttp.relationship-list.relationship[$vidx].related-to`'>
+                                                                                                                <outcome value='p-interface'>
                                                                                                                     <block atomic="true">
                                                                                                                         <set>
-                                                                                                                            <parameter name="domain-A.ttp-id" value="`$tmp.aai.src-ttp.tunnel-tp-id`"/>
+                                                                                                                            <parameter name='domain-A.ttp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
                                                                                                                         </set>
                                                                                                                     </block>
                                                                                                                 </outcome>
@@ -100,19 +116,23 @@
                                                                                     </get-resource>
                                                                                 </block>
                                                                             </outcome>
-                                                                            <outcome value="network-resource">
+                                                                            <outcome value='network-resource'>
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name="tmp.domain-A.network-id" value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
+                                                                                        <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.domain-A.network-id AND depth = '0'" pfx="tmp.aai.src-network-resource" local-only="false">
-                                                                                        <outcome value="success">
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="network-resource" 
+		key="network-resource.network-id = $tmp.domain-A.network-id 
+		AND depth = '0'"
+        pfx='tmp.aai.src-network-resource' local-only='false' >
+                                                                                        <outcome value='success'>
                                                                                             <set>
-                                                                                                <parameter name="domain-A.network-id" value="`$tmp.aai.src-network-resource.network-id`"/>
-                                                                                                <parameter name="domain-A.provider-id" value="`$tmp.aai.src-network-resource.provider-id`"/>
-                                                                                                <parameter name="domain-A.client-id" value="`$tmp.aai.src-network-resource.client-id`"/>
-                                                                                                <parameter name="domain-A.te-topo-id" value="`$tmp.aai.src-network-resource.te-topo-id`"/>
-                                                                                                <parameter name="domain-A.network-type" value="`$tmp.aai.src-network-resource.network-type`"/>
+                                                                                                <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                                <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                                <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                                <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                                <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
                                                                                             </set>
                                                                                         </outcome>
                                                                                     </get-resource>
@@ -122,74 +142,85 @@
                                                                     </for>
                                                                 </block>
                                                             </outcome>
-                                                            <outcome value="not-found">
-                                                                <return status="failure">
-                                                                    <parameter name="ack-final" value="Y"/>
-                                                                    <parameter name="error-code" value="500"/>
-                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                            <outcome value='not-found'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                                 </return>
                                                             </outcome>
-                                                            <outcome value="Other">
-                                                                <return status="failure">
-                                                                    <parameter name="ack-final" value="Y"/>
-                                                                    <parameter name="error-code" value="500"/>
-                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                            <outcome value='Other'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                                 </return>
                                                             </outcome>
                                                         </get-resource>
                                                     </block>
                                                 </outcome>
-                                                <outcome value="not-found">
-                                                    <return status="failure">
-                                                        <parameter name="ack-final" value="Y"/>
-                                                        <parameter name="error-code" value="500"/>
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                     </return>
                                                 </outcome>
-                                                <outcome value="Other">
-                                                    <return status="failure">
-                                                        <parameter name="ack-final" value="Y"/>
-                                                        <parameter name="error-code" value="500"/>
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                     </return>
                                                 </outcome>
                                             </get-resource>
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $tmp.dst-pnf-name AND p-interface.interface-name = $tmp.cross-link.dst-ltpId" pfx="tmp.aai.dst-tp" local-only="false">
+                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="p-interface" 
+		key="pnf.pnf-name = $tmp.dst-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId"
+        pfx='tmp.aai.dst-tp' local-only='false' >
                                                 <!--AND depth = '0'"-->
-                                                <outcome value="success">
+                                                <outcome value='success'>
                                                     <block>
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $tmp.dst-pnf-name" pfx="tmp.aai.dst-pnf" local-only="false">
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="pnf" 
+		key="pnf.pnf-name = $tmp.dst-pnf-name"
+        pfx='tmp.aai.dst-pnf' local-only='false' >
                                                             <!--AND depth = '0'"-->
-                                                            <outcome value="success">
+                                                            <outcome value='success'>
                                                                 <block>
                                                                     <set>
-                                                                        <parameter name="domain-B.node-id" value="`$tmp.aai.dst-pnf.pnf-id`"/>
-                                                                        <parameter name="domain-B.tpn" value="1"/>
+                                                                        <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                        <parameter name='domain-B.tpn' value='1' />
                                                                     </set>
-                                                                    <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-pnf.relationship-list.relationship_length`">
-                                                                        <switch test="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`">
-                                                                            <outcome value="tunnel-termination-point">
+                                                                    <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
+                                                                        <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].related-to`'>
+                                                                            <outcome value='tunnel-termination-point'>
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name="tmp.dst-ttp-id" value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
+                                                                                        <parameter name='tmp.dst-ttp-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $tmp.dst-ttp-id AND depth = '0'" pfx="tmp.aai.dst-ttp" local-only="false">
-                                                                                        <outcome value="success">
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="tunnel-termination-point" 
+		key="tunnel-termination-point.ttp-id = $tmp.dst-ttp-id 
+		AND depth = '0'"
+        pfx='tmp.aai.dst-ttp' local-only='false' >
+                                                                                        <outcome value='success'>
                                                                                             <block atomic="true">
-                                                                                                <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">
-                                                                                                    <outcome value="">
-                                                                                                        <block/>
+                                                                                                <switch test='`$tmp.aai.dst-ttp.relationship-list.relationship_length`'>
+                                                                                                    <outcome value=''>
+                                                                                                        <block></block>
                                                                                                     </outcome>
-                                                                                                    <outcome value="0">
-                                                                                                        <block/>
+                                                                                                    <outcome value='0'>
+                                                                                                        <block></block>
                                                                                                     </outcome>
-                                                                                                    <outcome value="Other">
-                                                                                                        <for silentFailure="true" index="vidx" start="0" end="`$tmp.aai.dst-ttp.relationship-list.relationship_length`">
-                                                                                                            <switch test="`$tmp.aai.dst-ttp.relationship-list.relationship[$vidx].related-to`">
-                                                                                                                <outcome value="p-interface">
+                                                                                                    <outcome value='Other'>
+                                                                                                        <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.dst-ttp.relationship-list.relationship_length`' >
+                                                                                                            <switch test='`$tmp.aai.dst-ttp.relationship-list.relationship[$vidx].related-to`'>
+                                                                                                                <outcome value='p-interface'>
                                                                                                                     <block atomic="true">
                                                                                                                         <set>
-                                                                                                                            <parameter name="domain-B.ttp-id" value="`$tmp.aai.dst-ttp.tunnel-tp-id`"/>
+                                                                                                                            <parameter name='domain-B.ttp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
                                                                                                                         </set>
                                                                                                                     </block>
                                                                                                                 </outcome>
@@ -202,19 +233,23 @@
                                                                                     </get-resource>
                                                                                 </block>
                                                                             </outcome>
-                                                                            <outcome value="network-resource">
+                                                                            <outcome value='network-resource'>
                                                                                 <block atomic="true">
                                                                                     <set>
-                                                                                        <parameter name="tmp.domain-B.network-id" value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`"/>
+                                                                                        <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
                                                                                     </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.domain-B.network-id AND depth = '0'" pfx="tmp.aai.dst-network-resource" local-only="false">
-                                                                                        <outcome value="success">
+                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="network-resource" 
+		key="network-resource.network-id = $tmp.domain-B.network-id 
+		AND depth = '0'"
+        pfx='tmp.aai.dst-network-resource' local-only='false' >
+                                                                                        <outcome value='success'>
                                                                                             <set>
-                                                                                                <parameter name="domain-B.network-id" value="`$tmp.aai.dst-network-resource.network-id`"/>
-                                                                                                <parameter name="domain-B.provider-id" value="`$tmp.aai.dst-network-resource.provider-id`"/>
-                                                                                                <parameter name="domain-B.client-id" value="`$tmp.aai.dst-network-resource.client-id`"/>
-                                                                                                <parameter name="domain-B.te-topo-id" value="`$tmp.aai.dst-network-resource.te-topo-id`"/>
-                                                                                                <parameter name="domain-B.network-type" value="`$tmp.aai.dst-network-resource.network-type`"/>
+                                                                                                <parameter name='domain-B.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                                <parameter name='domain-B.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                                <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                                <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                                <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
                                                                                             </set>
                                                                                         </outcome>
                                                                                     </get-resource>
@@ -224,35 +259,35 @@
                                                                     </for>
                                                                 </block>
                                                             </outcome>
-                                                            <outcome value="not-found">
-                                                                <return status="failure">
-                                                                    <parameter name="ack-final" value="Y"/>
-                                                                    <parameter name="error-code" value="500"/>
-                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                            <outcome value='not-found'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                                 </return>
                                                             </outcome>
-                                                            <outcome value="Other">
-                                                                <return status="failure">
-                                                                    <parameter name="ack-final" value="Y"/>
-                                                                    <parameter name="error-code" value="500"/>
-                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                            <outcome value='Other'>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                                 </return>
                                                             </outcome>
                                                         </get-resource>
                                                     </block>
                                                 </outcome>
-                                                <outcome value="not-found">
-                                                    <return status="failure">
-                                                        <parameter name="ack-final" value="Y"/>
-                                                        <parameter name="error-code" value="500"/>
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                     </return>
                                                 </outcome>
-                                                <outcome value="Other">
-                                                    <return status="failure">
-                                                        <parameter name="ack-final" value="Y"/>
-                                                        <parameter name="error-code" value="500"/>
-                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                                                     </return>
                                                 </outcome>
                                             </get-resource>
@@ -260,18 +295,18 @@
                                         </block>
                                     </outcome>
                                 </switch>
-                                <switch test="`length($tmp.aai.cross-link.relationship-list.relationship) == 0`">
-                                    <outcome value="true"/>
-                                    <outcome value="false">
-                                        <switch test="`$vidx`">
-                                            <outcome value="0">
-                                                <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">
-                                                    <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">
-                                                        <outcome value="p-interface">
+                                <switch test='`length($tmp.aai.cross-link.relationship-list.relationship) == 0`'>
+                                    <outcome value='true'></outcome>
+                                    <outcome value='false'>
+                                        <switch test='`$vidx`'>
+                                            <outcome value='0'>
+                                                <for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >
+                                                    <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>
+                                                        <outcome value='p-interface'>
                                                             <block>
                                                                 <set>
-                                                                    <parameter name="tmp.oofsolutions-first-src-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`"/>
-                                                                    <parameter name="tmp.oofsolutions-first-src-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`"/>
+                                                                    <parameter name='tmp.oofsolutions-first-src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                    <parameter name='tmp.oofsolutions-first-src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
                                                                 </set>
                                                                 <break/>
                                                             </block>
@@ -279,14 +314,14 @@
                                                     </switch>
                                                 </for>
                                             </outcome>
-                                            <outcome value="`$otn-oof.solutions_length - 1`">
-                                                <for index="lridx" start="0" end="`$tmp.aai.cross-link.relationship-list.relationship_length`">
-                                                    <switch test="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`">
-                                                        <outcome value="p-interface">
+                                            <outcome value='`$otn-oof.solutions_length - 1`'>
+                                                <for index='lridx' start='0' end='`$tmp.aai.cross-link.relationship-list.relationship_length`' >
+                                                    <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>
+                                                        <outcome value='p-interface'>
                                                             <block>
                                                                 <set>
-                                                                    <parameter name="tmp.oofsolutions-last-dst-pnf-name" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`"/>
-                                                                    <parameter name="tmp.oofsolutions-last-dst-ltpId" value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`"/>
+                                                                    <parameter name='tmp.oofsolutions-last-dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`" />
+                                                                    <parameter name='tmp.oofsolutions-last-dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`" />
                                                                 </set>
                                                                 <break/>
                                                             </block>
@@ -299,18 +334,18 @@
                                 </switch>
                             </block>
                         </outcome>
-                        <outcome value="not-found">
-                            <return status="failure">
-                                <parameter name="ack-final" value="Y"/>
-                                <parameter name="error-code" value="500"/>
-                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                        <outcome value='not-found'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                             </return>
                         </outcome>
-                        <outcome value="Other">
-                            <return status="failure">
-                                <parameter name="ack-final" value="Y"/>
-                                <parameter name="error-code" value="500"/>
-                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`"/>
+                        <outcome value='Other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
                             </return>
                         </outcome>
                     </get-resource>