Changed name of vlan -> vlan_id

vadymhlushko-mlnx · vadymhlushko-mlnx · commit e991d2953611 · 2021-12-06T11:50:33.000Z
Signed-off-by: Vadym Hlushko &lt;vadymh@nvidia.com&gt;
diff --git a/orchagent/nvgreorch.cpp b/orchagent/nvgreorch.cpp
@@ -416,7 +416,7 @@ bool NvgreTunnelMapOrch::addOperation(const Request& request)
         return true;
     }
 
-    sai_vlan_id_t vlan_id = (sai_vlan_id_t) request.getAttrVlan("vlan");
+    sai_vlan_id_t vlan_id = (sai_vlan_id_t) request.getAttrVlan("vlan_id");
     Port port;
 
     if (!gPortsOrch->getVlanByVlanId(vlan_id, port))
diff --git a/orchagent/nvgreorch.h b/orchagent/nvgreorch.h
@@ -137,9 +137,9 @@ const request_description_t nvgre_tunnel_map_request_description = {
             { REQ_T_STRING, REQ_T_STRING },
             {
                 { "vsid",  REQ_T_UINT },
-                { "vlan", REQ_T_VLAN },
+                { "vlan_id", REQ_T_VLAN },
             },
-            { "vsid", "vlan" }
+            { "vsid", "vlan_id" }
 };
 
 class NvgreTunnelMapRequest : public Request
diff --git a/tests/test_nvgre_tunnel.py b/tests/test_nvgre_tunnel.py
@@ -194,7 +194,7 @@ def create_nvgre_tunnel_map_entry(self, dvs, tunnel_name, tunnel_map_entry_name,
             NVGRE_TUNNEL_MAP, '|', f'{tunnel_name}|{tunnel_map_entry_name}',
             [
                 ('vsid', vsid),
-                ('vlan', f'Vlan{vlan_id}'),
+                ('vlan_id', f'Vlan{vlan_id}'),
             ],
         )
         time.sleep(1)

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ bool NvgreTunnelMapOrch::addOperation(const Request& request)`
`416`	`416`	`return true;`
`417`	`417`	`}`
`418`	`418`
`419`		`- sai_vlan_id_t vlan_id = (sai_vlan_id_t) request.getAttrVlan("vlan");`
	`419`	`+ sai_vlan_id_t vlan_id = (sai_vlan_id_t) request.getAttrVlan("vlan_id");`
`420`	`420`	`Port port;`
`421`	`421`
`422`	`422`	`if (!gPortsOrch->getVlanByVlanId(vlan_id, port))`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ def create_nvgre_tunnel_map_entry(self, dvs, tunnel_name, tunnel_map_entry_name,`
`194`	`194`	`NVGRE_TUNNEL_MAP, '\|', f'{tunnel_name}\|{tunnel_map_entry_name}',`
`195`	`195`	`[`
`196`	`196`	`('vsid', vsid),`
`197`		`- ('vlan', f'Vlan{vlan_id}'),`
	`197`	`+ ('vlan_id', f'Vlan{vlan_id}'),`
`198`	`198`	`],`
`199`	`199`	`)`
`200`	`200`	`time.sleep(1)`