orchagent: Adding VLAN_PREFIX macro

madhanmellanox · Jun 22, 2016 · 45140ae · 45140ae
1 parent 6b10f95
commit 45140ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/doc/swss-schema.md b/doc/swss-schema.md
@@ -101,7 +101,7 @@ For example (reorder output)
 ###VLAN_TABLE
     ;Defines VLANs and the interfaces which are members of the vlan
     ;Status: work in progress
-    key                 = VLAN_TABLE:"vlan"vlanid ; DIGIT 0-4095 with prefix "vlan"
+    key                 = VLAN_TABLE:"vlan"vlanid ; DIGIT 0-4095 with prefix "Vlan"
     admin_status        = "down" / "up"        ; admin status
     oper_status         = "down" / "up"        ; operating status
     mtu                 = 1*4DIGIT             ; MTU for the IP interface of the VLAN

diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
@@ -15,6 +15,8 @@ extern sai_vlan_api_t *sai_vlan_api;
 extern sai_lag_api_t *sai_lag_api;
 extern sai_hostif_api_t* sai_hostif_api;
 
+#define VLAN_PREFIX "Vlan"
+
 PortsOrch::PortsOrch(DBConnector *db, vector<string> tableNames) :
         Orch(db, tableNames)
 {
@@ -300,8 +302,8 @@ void PortsOrch::doVlanTask(Consumer &consumer)
 
         string key = kfvKey(t);
 
-        /* Assert the key starts with "vlan" */
-        assert(!strncmp(key.c_str(), "vlan", 4));
+        /* Assert the key starts with "Vlan" */
+        assert(!strncmp(key.c_str(), VLAN_PREFIX, 4));
 
         key = key.substr(4);
         size_t found = key.find(':');
@@ -315,7 +317,7 @@ void PortsOrch::doVlanTask(Consumer &consumer)
             port_alias = key.substr(found+1);
         }
 
-        vlan_alias = "vlan" + to_string(vlan_id);
+        vlan_alias = VLAN_PREFIX + to_string(vlan_id);
         string op = kfvOp(t);
 
         /* Manipulate VLAN when port_alias is empty */