test

sonic-net · May 28, 2021 · 42b15cb · 42b15cb
1 parent f5ef92e
commit 42b15cb
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 78 deletions.
diff --git a/cfgmgr/buffermgr.cpp b/cfgmgr/buffermgr.cpp
@@ -106,7 +106,7 @@ Create/update two tables: profile (in m_cfgBufferProfileTable) and port buffer (
 
     "BUFFER_PROFILE": {
         "pg_lossless_100G_300m_profile": {
-            "pool":"[BUFFER_POOL_TABLE:ingress_lossless_pool]",
+            "pool":"ingress_lossless_pool",
             "xon":"18432",
             "xon_offset":"2496",
             "xoff":"165888",
@@ -116,7 +116,7 @@ Create/update two tables: profile (in m_cfgBufferProfileTable) and port buffer (
     }
     "BUFFER_PG" :{
         Ethernet44|3-4": {
-            "profile" : "[BUFFER_PROFILE:pg_lossless_100000_300m_profile]"
+            "profile" : "pg_lossless_100000_300m_profile"
         }
     }
 */

diff --git a/doc/Configuration.md b/doc/Configuration.md
@@ -343,13 +343,13 @@ When the system is running in traditional buffer model, profiles needs to explic
 {
 "BUFFER_PG": {
     "Ethernet0|3-4": {
-        "profile": "[BUFFER_PROFILE|pg_lossless_40000_5m_profile]"
+        "profile": "pg_lossless_40000_5m_profile"
     },
     "Ethernet1|3-4": {
-        "profile": "[BUFFER_PROFILE|pg_lossless_40000_5m_profile]"
+        "profile": "pg_lossless_40000_5m_profile"
     },
     "Ethernet2|3-4": {
-        "profile": "[BUFFER_PROFILE|pg_lossless_40000_5m_profile]"
+        "profile": "pg_lossless_40000_5m_profile"
     }
   }
 }
@@ -371,7 +371,7 @@ When the system is running in dynamic buffer model, profiles can be:
         "profile": "NULL"
     },
     "Ethernet2|3-4": {
-        "profile": "[BUFFER_PROFILE|static_profile]"
+        "profile": "static_profile"
     }
   }
 }
@@ -437,33 +437,33 @@ When the system is running in dynamic buffer model, the size of some of the buff
 "BUFFER_PROFILE": {
     "egress_lossless_profile": {
         "static_th": "3995680",
-        "pool": "[BUFFER_POOL|egress_lossless_pool]",
+        "pool": "egress_lossless_pool",
         "size": "1518"
     },
     "egress_lossy_profile": {
         "dynamic_th": "3",
-        "pool": "[BUFFER_POOL|egress_lossy_pool]",
+        "pool": "egress_lossy_pool",
         "size": "1518"
     },
     "ingress_lossy_profile": {
         "dynamic_th": "3",
-        "pool": "[BUFFER_POOL|ingress_lossless_pool]",
+        "pool": "ingress_lossless_pool",
         "size": "0"
     },
     "pg_lossless_40000_5m_profile": {
         "xon_offset": "2288",
         "dynamic_th": "-3",
         "xon": "2288",
         "xoff": "66560",
-        "pool": "[BUFFER_POOL|ingress_lossless_pool]",
+        "pool": "ingress_lossless_pool",
         "size": "1248"
     },
     "pg_lossless_40000_40m_profile": {
         "xon_offset": "2288",
         "dynamic_th": "-3",
         "xon": "2288",
         "xoff": "71552",
-        "pool": "[BUFFER_POOL|ingress_lossless_pool]",
+        "pool": "ingress_lossless_pool",
         "size": "1248"
     }
   }
@@ -491,13 +491,13 @@ This kind of profiles will be handled by buffer manager and won't be applied to
 {
 "BUFFER_QUEUE": {
     "Ethernet50,Ethernet52,Ethernet54,Ethernet56|0-2": {
-        "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        "profile": "egress_lossy_profile"
     },
     "Ethernet50,Ethernet52,Ethernet54,Ethernet56|3-4": {
-        "profile": "[BUFFER_PROFILE|egress_lossless_profile]"
+        "profile": "egress_lossless_profile"
     },
     "Ethernet50,Ethernet52,Ethernet54,Ethernet56|5-6": {
-        "profile": "[BUFFER_PROFILE|egress_lossy_profile]"
+        "profile": "egress_lossy_profile"
     }
   }
 }
@@ -1104,12 +1104,12 @@ name as object key and member list as attribute.
 {
 "PORT_QOS_MAP": {
     "Ethernet50,Ethernet52,Ethernet54,Ethernet56": {
-        "tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]", 
-        "tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]", 
+        "tc_to_pg_map": "AZURE", 
+        "tc_to_queue_map": "AZURE", 
         "pfc_enable": "3,4", 
-        "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]", 
-        "dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
-        "scheduler": "[SCHEDULER|scheduler.port]"
+        "pfc_to_queue_map": "AZURE", 
+        "dscp_to_tc_map": "AZURE",
+        "scheduler": "scheduler.port"
     }
   }
 }  
@@ -1120,14 +1120,14 @@ name as object key and member list as attribute.
 {
 "QUEUE": {
 	"Ethernet56|4": {
-        "wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]", 
-        "scheduler": "[SCHEDULER|scheduler.1]"
+        "wred_profile": "AZURE_LOSSLESS", 
+        "scheduler": "scheduler.1"
     }, 
     "Ethernet56|5": {
-        "scheduler": "[SCHEDULER|scheduler.0]"
+        "scheduler": "scheduler.0"
     }, 
     "Ethernet56|6": {
-        "scheduler": "[SCHEDULER|scheduler.0]"
+        "scheduler": "scheduler.0"
     }
   }
 }

diff --git a/doc/swss-schema.md b/doc/swss-schema.md
@@ -35,9 +35,9 @@ Stores information for physical switch ports managed by the switch chip. Ports t
     Example:
     127.0.0.1:6379> hgetall PORT_TABLE:ETHERNET4
     1) "dscp_to_tc_map"
-    2) "[DSCP_TO_TC_MAP_TABLE:AZURE]"
+    2) "AZURE"
     3) "tc_to_queue_map"
-    4) "[TC_TO_QUEUE_MAP_TABLE:AZURE]"
+    4) "AZURE"
 
 ---------------------------------------------
 ### INTF_TABLE
@@ -209,9 +209,9 @@ and reflects the LAG ports into the redis under: `LAG_TABLE:<team0>:port`
     Example:
     127.0.0.1:6379> hgetall QUEUE_TABLE:ETHERNET4:1
     1) "scheduler"
-    2) "[SCHEDULER_TABLE:BEST_EFFORT]"
+    2) "BEST_EFFORT"
     3) "wred_profile"
-    4) "[WRED_PROFILE_TABLE:AZURE]"
+    4) "AZURE"
 
 ---------------------------------------------
 ### TC\_TO\_QUEUE\_MAP\_TABLE

diff --git a/orchagent/bufferorch.cpp b/orchagent/bufferorch.cpp
@@ -904,7 +904,7 @@ task_process_status BufferOrch::processPriorityGroup(KeyOpFieldsValuesTuple &tup
 }
 
 /*
-Input sample:"[BUFFER_PROFILE_TABLE:i_port.profile0],[BUFFER_PROFILE_TABLE:i_port.profile1]"
+Input sample:"i_port.profile0,i_port.profile1"
 */
 task_process_status BufferOrch::processIngressBufferProfileList(KeyOpFieldsValuesTuple &tuple)
 {
@@ -962,7 +962,7 @@ task_process_status BufferOrch::processIngressBufferProfileList(KeyOpFieldsValue
 }
 
 /*
-Input sample:"[BUFFER_PROFILE_TABLE:e_port.profile0],[BUFFER_PROFILE_TABLE:e_port.profile1]"
+Input sample:"e_port.profile0,e_port.profile1"
 */
 task_process_status BufferOrch::processEgressBufferProfileList(KeyOpFieldsValuesTuple &tuple)
 {

diff --git a/orchagent/orch.cpp b/orchagent/orch.cpp
@@ -301,7 +301,7 @@ bool Orch::bake()
 }
 
 /*
-- Validates reference has proper format which is [table_name:object_name]
+- Validates reference has proper format which is not ABNF [table_name:object_name]
 - validates table_name exists
 - validates object with object_name exists
 
@@ -557,7 +557,7 @@ ref_resolve_status Orch::resolveFieldRefArray(
     vector<sai_object_id_t> &sai_object_arr,
     string &object_name_list)
 {
-    // example: [BUFFER_PROFILE_TABLE:e_port.profile0],[BUFFER_PROFILE_TABLE:e_port.profile1]
+    // example: e_port.profile0,e_port.profile1
     SWSS_LOG_ENTER();
     size_t count = 0;
     sai_object_arr.clear();

diff --git a/swssconfig/sample/sample.json b/swssconfig/sample/sample.json
@@ -18,8 +18,8 @@
 		},
 		{
 			"QOS_TABLE:PORT_TABLE:ETHERNET4": {
-				"dscp_to_tc_map" : "[DSCP_TO_TC_MAP_TABLE:AZURE]",
-				"tc_to_queue_map": "[TC_TO_QUEUE_MAP_TABLE:AZURE]"		
+				"dscp_to_tc_map" : "AZURE",
+				"tc_to_queue_map": "AZURE"		
 			},
 			"OP": "SET"		
 		},
@@ -46,9 +46,9 @@
 		},
 		{
 			"QUEUE_TABLE:ETHERNET4:1" : {
-				"scheduler"		:	"[SCHEDULER_TABLE:BEST_EFFORT]",
-				"wred_profile"	: 	"[WRED_PROFILE_TABLE:AZURE]"
+				"scheduler"		:	"BEST_EFFORT",
+				"wred_profile"	: 	"AZURE"
 			},
 			"OP": "SET"
 		}
-	]
+	]
diff --git a/swssconfig/sample/sample.json.output.txt b/swssconfig/sample/sample.json.output.txt
@@ -67,14 +67,14 @@ hgetall WRED_PROFILE_TABLE:AZURE
 10) "8"
 127.0.0.1:6379> hgetall QUEUE_TABLE:ETHERNET4:1
 1) "scheduler"
-2) "[SCHEDULER_TABLE:BEST_EFFORT]"
+2) "BEST_EFFORT"
 3) "wred_profile"
-4) "[WRED_PROFILE_TABLE:AZURE]"
+4) "AZURE"
 127.0.0.1:6379> hgetall PORT_TABLE:ETHERNET4
 1) "dscp_to_tc_map"
-2) "[DSCP_TO_TC_MAP_TABLE:AZURE]"
+2) "AZURE"
 3) "tc_to_queue_map"
-4) "[TC_TO_QUEUE_MAP_TABLE:AZURE]"
+4) "AZURE"
 127.0.0.1:6379>
 
 hgetall TC_TO_QUEUE_MAP_TABLE:AZURE

diff --git a/tests/buffer_model.py b/tests/buffer_model.py
@@ -69,7 +69,7 @@ def disable_dynamic_buffer(config_db, cmd_runner):
         pgs = config_db.get_keys('BUFFER_PG')
         for key in pgs:
             pg = config_db.get_entry('BUFFER_PG', key)
-            if pg['profile'] != '[BUFFER_PROFILE|ingress_lossy_profile]':
+            if pg['profile'] != 'ingress_lossy_profile':
                 config_db.delete_entry('BUFFER_PG', key)
 
         # Remove all the non-default profiles