Changed name of vlan -> vlan_id

Signed-off-by: Vadym Hlushko <[email protected]>
sonic-net · Dec 6, 2021 · e991d29 · e991d29
1 parent 621b12a
commit e991d29
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
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)