From 2f9b38f29d19b4fd8e31ee0a8c34b9b910b0f4f5 Mon Sep 17 00:00:00 2001
From: BryanGuo <guofengbei@huawei.com>
Date: Wed, 3 Apr 2019 20:28:53 +0800
Subject: Fix bbs dgs bug,replace 'vendor' by 'manufacturer'

Issue-ID: SDNC-698,SDNC-699,SDNC-700

Change-Id: Ida80d2ca97f786be36e4610ed0e4e18fab15773a
Signed-off-by: Gxxxx <guofengbei@huawei.com>

Former-commit-id: 879baef9f68011412253def6a014fcbfe261c4da
---
 ...ctivity-network-topology-operation-delete-huawei.xml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
index e5b59771..732f4f39 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
@@ -26,7 +26,7 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error executing Get token rest api" />
+                        <parameter name="error-message" value="Error failed to call queryTokenID" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -35,7 +35,7 @@
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error executing Get token rest api" />
+                                <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
                             </return>
                         </outcome>
                         <outcome value='Other'>
@@ -59,7 +59,7 @@
                                 <return status='failure'>
                                     <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="invalid network-input-parameters.param in bbs-access-connectivity-network-topology-operation-delete" />
+                                    <parameter name="error-message" value="$network-input-parameters.param[$idx].name  +' value is null, please check it.'" />
                                 </return>
                             </outcome>
                         </switch>
@@ -80,7 +80,7 @@
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
                         <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="invalid network-input-parameters.param in bbs-access-connectivity-network-topology-operation-delete" />
+                        <parameter name="error-message" value="Error failed to call deleteAccessConnectivityService" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -90,11 +90,16 @@
                                 <return status='failure'>
                                     <parameter name='ack-final' value='Y'/>
                                     <parameter name="error-code" value="500" />
-                                    <parameter name="error-message" value="`'Error deleteAccessConnectivityService failed: '+$service-result.errors.error[0].error-message`" />
+                                    <parameter name="error-message" value="`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
                                 </return>
                             </outcome>
                             <outcome value=''>
-                                <block></block>
+                                <block>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/oak/logx.txt" />
+                                        <parameter name="field1" value="deleteAccessConnectivityService success!" />
+                                    </record>
+                                </block>
                             </outcome>
                         </switch>
                     </block>
-- 
cgit 1.2.3-korg