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
---
 ...IC-RESOURCE-API_network-topology-operation.json | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
index c122c541..2440c43c 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json
@@ -2140,8 +2140,8 @@
     {
         "id": "2daf54e0.ce83cc",
         "type": "switchNode",
-        "name": "switch:vendor",
-        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
         "x": 2033.5001487731934,
@@ -2172,7 +2172,7 @@
     {
         "id": "b35e15c3.b29238",
         "type": "switchNode",
-        "name": "switch:vendor value",
+        "name": "switch:manufacturer value",
         "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
@@ -2252,8 +2252,8 @@
     {
         "id": "1fcee7a4.020b98",
         "type": "switchNode",
-        "name": "switch:vendor",
-        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
         "x": 2062.4994201660156,
@@ -2284,7 +2284,7 @@
     {
         "id": "949f9c2f.46255",
         "type": "switchNode",
-        "name": "switch:vendor value",
+        "name": "switch:manufacturer value",
         "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
@@ -2351,7 +2351,7 @@
         "id": "247872c4.a3df6e",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid vendor,please check!'`\" />",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`\" />",
         "comments": "",
         "x": 3051.666831970215,
         "y": 2025.6670513153076,
@@ -2377,8 +2377,8 @@
     {
         "id": "94d7db37.7a3d78",
         "type": "switchNode",
-        "name": "switch:vendor",
-        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
         "x": 1813.833023071289,
@@ -2409,7 +2409,7 @@
     {
         "id": "30948650.291b5a",
         "type": "switchNode",
-        "name": "switch:vendor value",
+        "name": "switch:manufacturer value",
         "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
@@ -2475,8 +2475,8 @@
     {
         "id": "da232470.f93ec8",
         "type": "switchNode",
-        "name": "switch:vendor",
-        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
         "x": 2058.832878112793,
@@ -2507,7 +2507,7 @@
     {
         "id": "247f3edd.baaa82",
         "type": "switchNode",
-        "name": "switch:vendor value",
+        "name": "switch:manufacturer value",
         "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
@@ -2573,8 +2573,8 @@
     {
         "id": "3c9fb8cf.9cb2f8",
         "type": "switchNode",
-        "name": "switch:vendor",
-        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vendor'`\">\n",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
         "x": 2030.833065032959,
@@ -2605,7 +2605,7 @@
     {
         "id": "2f27817.d741d7e",
         "type": "switchNode",
-        "name": "switch:vendor value",
+        "name": "switch:manufacturer value",
         "xml": "<switch test='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-- 
cgit 1.2.3-korg