1 files changed, 54 insertions, 0 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
index 9d50feef..3b983651 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
@@ -142,6 +142,60 @@
                                 </block>
                             </for>
                         </for>
+                        <for silentFailure='true' index='rix' start='0' end="`$aai.service-instance.metadata.metadatum_length`" >
+                            <switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>
+                                <outcome value='remote-id'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='controller-service-id'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='cvlan'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='svlan'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='expected-ont-id'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
                     </block>
                 </outcome>
             </get-resource>