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
---
 ...NERIC-RESOURCE-API_network-topology-operation.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
index 06456da7..51d6b6a8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
@@ -380,7 +380,7 @@
                     <switch test='`$network-topology-operation-input.request-information.request-action`'>
                         <outcome value='ChangeInternetProfileInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='HUAWEI'>
@@ -393,7 +393,7 @@
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                         </switch>
@@ -427,7 +427,7 @@
                         </outcome>
                         <outcome value='CreateInternetProfileInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='HUAWEI'>
@@ -440,7 +440,7 @@
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                         </switch>
@@ -450,7 +450,7 @@
                         </outcome>
                         <outcome value='CreateAccessConnectivityInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='HUAWEI'>
@@ -463,7 +463,7 @@
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                         </switch>
@@ -497,14 +497,14 @@
                         </outcome>
                         <outcome value='DeleteAccessConnectivityInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='Other'>
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                             <outcome value='HUAWEI'>
@@ -520,14 +520,14 @@
                         </outcome>
                         <outcome value='DeleteInternetProfileInstance'>
                             <for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >
-                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`">
+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`">
                                     <outcome value='true'>
                                         <switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>
                                             <outcome value='Other'>
                                                 <return status='failure'>
                                                     <parameter name='ack-final' value='Y'/>
                                                     <parameter name="error-code" value="500" />
-                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`" />
+                                                    <parameter name="error-message" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
                                                 </return>
                                             </outcome>
                                             <outcome value='HUAWEI'>
-- 
cgit 1.2.3-korg