1 files changed, 26 insertions, 22 deletions
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
index c817cee6..b8df0f60 100644
--- a/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
+++ b/platform-logic/optical-service/src/main/xml/optical-service_aai-delete-service-handling.xml
@@ -21,40 +21,44 @@ pfx='aai.service'      local-only='false'></get-resource>
                 <parameter name="field2" value="`$aai.service.orchestration-status`"/>
                 <parameter name="field3" value="`$aai.service.relationship-list.relationship_length`"/>
             </record>
-            <for index='idx' start='1' end='`$aai.service.relationship-list.relationship_length`' >
-                <block atomic='true'>
-                    <set>
-                        <parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />
-                        <parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />
-                    </set>
-                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                        <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
-                        <parameter name="level" value="info" />
-                        <parameter name="field1" value="Inside Revert PInterface details"/>
-                        <parameter name="field2" value="`$pnf-name`"/>
-                        <parameter name="field3" value="`$pinterface-name`"/>
-                    </record>
-                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+            <for index='idx' start='0' end='`$aai.service.relationship-list.relationship_length`' >
+                <switch test="`$aai.service.relationship-list.relationship[$idx].related-to == 'p-interface'`">
+                    <outcome value='true'>
+                        <block>
+                            <set>
+                                <parameter name='pnf-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[0].relationship-value`' />
+                                <parameter name='pinterface-name' value='`$aai.service.relationship-list.relationship[$idx].relationship-data[1].relationship-value`' />
+                            </set>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/async-notif.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Inside Revert PInterface details"/>
+                                <parameter name="field2" value="`$pnf-name`"/>
+                                <parameter name="field3" value="`$pinterface-name`"/>
+                            </record>
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 resource="p-interface"
      key='pnf.pnf-name = $pnf-name AND
      p-interface.interface-name = $pinterface-name ' 
 pfx='p.in.details'      local-only='false'></get-resource>
-                    <set>
-                        <parameter name='new-rate' value='`$p.in.details.speed-value`' />
-                    </set>
-                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
+                            <set>
+                                <parameter name='new-rate' value='`$p.in.details.speed-value`' />
+                            </set>
+                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' 
 force='true'
 resource='p-interface'
      key='pnf.pnf-name = $pnf-name AND
      p-interface.interface-name = $pinterface-name '
       local-only='false'>
-                        <parameter name='available-capacity' value='`$new-rate`' />
-                    </update>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
+                                <parameter name='available-capacity' value='`$new-rate`' />
+                            </update>
+                            <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 resource='SQL' 
 key='UPDATE TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE SET rate = $new-rate WHERE interface_name = $pinterface-name '
 force='true' pfx='save-result'></save>
-                </block>
+                        </block>
+                    </outcome>
+                </switch>
             </for>
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 resource="service-instance"