From 6c60a7db457f277b90b652206a92bb1f7602748b Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Thu, 10 Sep 2020 03:22:02 +0000 Subject: [PATCH] Follow name convention of APPL_DB and STATE_DB: adding suffix "_TABLE" on the table name Signed-off-by: Stephen Sun --- cfgmgr/buffer_check_headroom_mellanox.lua | 4 +- cfgmgr/buffer_pool_mellanox.lua | 8 +-- cfgmgr/buffermgr.cpp | 36 ++++++++-- cfgmgr/buffermgr.h | 3 +- cfgmgr/buffermgrd.cpp | 2 +- cfgmgr/buffermgrdyn.cpp | 38 +++++++++-- cfgmgr/buffermgrdyn.h | 1 + tests/mock_tests/portsorch_ut.cpp | 12 ++-- tests/test_buffer.py | 82 +++++++++++------------ 9 files changed, 121 insertions(+), 65 deletions(-) diff --git a/cfgmgr/buffer_check_headroom_mellanox.lua b/cfgmgr/buffer_check_headroom_mellanox.lua index 34f9d940c52..2f7251b0051 100644 --- a/cfgmgr/buffer_check_headroom_mellanox.lua +++ b/cfgmgr/buffer_check_headroom_mellanox.lua @@ -41,7 +41,7 @@ end -- Fetch the threshold from STATE_DB redis.call('SELECT', state_db) -local max_headroom_size = tonumber(redis.call('HGET', 'BUFFER_MAX_PARAM|' .. port, 'max_headroom_size')) +local max_headroom_size = tonumber(redis.call('HGET', 'BUFFER_MAX_PARAM_TABLE|' .. port, 'max_headroom_size')) if max_headroom_size == nil then return default_ret end @@ -66,7 +66,7 @@ end -- Fetch all the PGs, accumulate the sizes -- Assume there is only one lossless profile configured among all PGs on each port -local pg_keys = redis.call('KEYS', 'BUFFER_PG:' .. port .. '*') +local pg_keys = redis.call('KEYS', 'BUFFER_PG_TABLE:' .. port .. '*') for i = 1, #pg_keys do profile = string.sub(redis.call('HGET', pg_keys[i], 'profile'), 2, -2) if lossless_profile_name ~= nil then diff --git a/cfgmgr/buffer_pool_mellanox.lua b/cfgmgr/buffer_pool_mellanox.lua index 7e5607ae55a..79459aa0280 100644 --- a/cfgmgr/buffer_pool_mellanox.lua +++ b/cfgmgr/buffer_pool_mellanox.lua @@ -61,7 +61,7 @@ local function iterate_all_items(all_items) end profiles[index][2] = profiles[index][2] + size local speed = redis.call('HGET', 'PORT_TABLE:'..port, 'speed') - if speed == '400000' and profile == '[BUFFER_PROFILE:ingress_lossy_profile]' then + if speed == '400000' and profile == '[BUFFER_PROFILE_TABLE:ingress_lossy_profile]' then lossypg_400g = lossypg_400g + size end end @@ -107,10 +107,10 @@ for i = 1, #profiles, 1 do if profiles[i][1] ~= "BUFFER_PROFILE_KEY_SET" and profiles[i][1] ~= "BUFFER_PROFILE_DEL_SET" then local size = tonumber(redis.call('HGET', profiles[i][1], 'size')) if size ~= nil then - if profiles[i][1] == "BUFFER_PROFILE:ingress_lossy_profile" then + if profiles[i][1] == "BUFFER_PROFILE_TABLE:ingress_lossy_profile" then size = size + lossypg_reserved end - if profiles[i][1] == "BUFFER_PROFILE:egress_lossy_profile" then + if profiles[i][1] == "BUFFER_PROFILE_TABLE:egress_lossy_profile" then profiles[i][2] = count_up_port end if size ~= 0 then @@ -131,7 +131,7 @@ accumulative_occupied_buffer = accumulative_occupied_buffer + accumulative_egres -- Fetch mmu_size redis.call('SELECT', state_db) -local mmu_size = tonumber(redis.call('HGET', 'BUFFER_MAX_PARAM|global', 'mmu_size')) +local mmu_size = tonumber(redis.call('HGET', 'BUFFER_MAX_PARAM_TABLE|global', 'mmu_size')) if mmu_size == nil then mmu_size = tonumber(egress_lossless_pool_size) end diff --git a/cfgmgr/buffermgr.cpp b/cfgmgr/buffermgr.cpp index 114c93d4e35..a9f0a955aeb 100644 --- a/cfgmgr/buffermgr.cpp +++ b/cfgmgr/buffermgr.cpp @@ -15,7 +15,7 @@ using namespace std; using namespace swss; -BufferMgr::BufferMgr(DBConnector *cfgDb, DBConnector *stateDb, DBConnector *applDb, string pg_lookup_file, const vector &tableNames) : +BufferMgr::BufferMgr(DBConnector *cfgDb, DBConnector *applDb, string pg_lookup_file, const vector &tableNames) : Orch(cfgDb, tableNames), m_cfgPortTable(cfgDb, CFG_PORT_TABLE_NAME), m_cfgCableLenTable(cfgDb, CFG_PORT_CABLE_LEN_TABLE_NAME), @@ -215,6 +215,33 @@ void BufferMgr::transformSeperator(string &name) while ((pos = name.find("|")) != string::npos) name.replace(pos, 1, ":"); } + +void BufferMgr::transformReference(string &name) +{ + auto references = tokenize(name, list_item_delimiter); + int ref_index = 0; + + name = ""; + + for (auto &reference : references) + { + if (ref_index != 0) + name += list_item_delimiter; + ref_index ++; + + auto keys = tokenize(reference, config_db_key_delimiter); + int key_index = 0; + for (auto &key : keys) + { + if (key_index == 0) + name += key + "_TABLE"; + else + name += delimiter + key; + key_index ++; + } + } +} + /* * This function copies the data from tables in CONFIG_DB to APPL_DB. * With dynamically buffer calculation supported, the following tables @@ -256,13 +283,14 @@ void BufferMgr::doBufferTableTask(Consumer &consumer, ProducerStateTable &applTa for (auto i : kfvFieldsValues(t)) { + SWSS_LOG_INFO("Inserting field %s value %s", fvField(i).c_str(), fvValue(i).c_str()); //transform the separator in values from "|" to ":" if (fvField(i) == "pool") - transformSeperator(fvValue(i)); + transformReference(fvValue(i)); if (fvField(i) == "profile") - transformSeperator(fvValue(i)); + transformReference(fvValue(i)); if (fvField(i) == "profile_list") - transformSeperator(fvValue(i)); + transformReference(fvValue(i)); fvVector.emplace_back(FieldValueTuple(fvField(i), fvValue(i))); SWSS_LOG_INFO("Inserting field %s value %s", fvField(i).c_str(), fvValue(i).c_str()); } diff --git a/cfgmgr/buffermgr.h b/cfgmgr/buffermgr.h index 0d32d933759..5ad88f8901b 100644 --- a/cfgmgr/buffermgr.h +++ b/cfgmgr/buffermgr.h @@ -31,7 +31,7 @@ typedef std::map port_cable_length_t; class BufferMgr : public Orch { public: - BufferMgr(DBConnector *cfgDb, DBConnector *stateDb, DBConnector *applDb, std::string pg_lookup_file, const std::vector &tableNames); + BufferMgr(DBConnector *cfgDb, DBConnector *applDb, std::string pg_lookup_file, const std::vector &tableNames); using Orch::doTask; private: @@ -59,6 +59,7 @@ class BufferMgr : public Orch void doBufferTableTask(Consumer &consumer, ProducerStateTable &applTable); void transformSeperator(std::string &name); + void transformReference(std::string &name); void doTask(Consumer &consumer); }; diff --git a/cfgmgr/buffermgrd.cpp b/cfgmgr/buffermgrd.cpp index 488e9743561..eb5122fc6db 100644 --- a/cfgmgr/buffermgrd.cpp +++ b/cfgmgr/buffermgrd.cpp @@ -196,7 +196,7 @@ int main(int argc, char **argv) CFG_BUFFER_PORT_INGRESS_PROFILE_LIST_NAME, CFG_BUFFER_PORT_EGRESS_PROFILE_LIST_NAME }; - cfgOrchList.emplace_back(new BufferMgr(&cfgDb, &stateDb, &applDb, pg_lookup_file, cfg_buffer_tables)); + cfgOrchList.emplace_back(new BufferMgr(&cfgDb, &applDb, pg_lookup_file, cfg_buffer_tables)); } else { diff --git a/cfgmgr/buffermgrdyn.cpp b/cfgmgr/buffermgrdyn.cpp index 988c454376f..95f24bbe4c0 100644 --- a/cfgmgr/buffermgrdyn.cpp +++ b/cfgmgr/buffermgrdyn.cpp @@ -175,10 +175,36 @@ void BufferMgrDynamic::transformSeperator(string &name) name.replace(pos, 1, ":"); } +void BufferMgrDynamic::transformReference(string &name) +{ + auto references = tokenize(name, list_item_delimiter); + int ref_index = 0; + + name = ""; + + for (auto &reference : references) + { + if (ref_index != 0) + name += list_item_delimiter; + ref_index ++; + + auto keys = tokenize(reference, config_db_key_delimiter); + int key_index = 0; + for (auto &key : keys) + { + if (key_index == 0) + name += key + "_TABLE"; + else + name += delimiter + key; + key_index ++; + } + } +} + // For string "TABLE_NAME|objectname", returns "objectname" string BufferMgrDynamic::parseObjectNameFromKey(const string &key, size_t pos = 0) { - auto keys = tokenize(key, ':'); + auto keys = tokenize(key, delimiter); if (pos >= keys.size()) { SWSS_LOG_ERROR("Failed to fetch %lu-th sector of key %s", pos, key.c_str()); @@ -1177,7 +1203,7 @@ task_process_status BufferMgrDynamic::handleBufferProfileTable(Consumer &consume { if (!value.empty()) { - transformSeperator(value); + transformReference(value); auto poolName = parseObjectNameFromReference(value); auto poolRef = m_bufferPoolLookup.find(poolName); if (poolRef == m_bufferPoolLookup.end()) @@ -1332,7 +1358,7 @@ task_process_status BufferMgrDynamic::handleOneBufferPgEntry(const string &key, { // Headroom override pureDynamic = false; - transformSeperator(value); + transformReference(value); string profileName = parseObjectNameFromReference(value); auto searchRef = m_bufferProfileLookup.find(profileName); if (searchRef == m_bufferProfileLookup.end()) @@ -1511,11 +1537,11 @@ task_process_status BufferMgrDynamic::doBufferTableTask(Consumer &consumer, Prod { //transform the separator in values from "|" to ":" if (fvField(i) == "pool") - transformSeperator(fvValue(i)); + transformReference(fvValue(i)); if (fvField(i) == "profile") - transformSeperator(fvValue(i)); + transformReference(fvValue(i)); if (fvField(i) == "profile_list") - transformSeperator(fvValue(i)); + transformReference(fvValue(i)); fvVector.emplace_back(FieldValueTuple(fvField(i), fvValue(i))); SWSS_LOG_INFO("Inserting field %s value %s", fvField(i).c_str(), fvValue(i).c_str()); } diff --git a/cfgmgr/buffermgrdyn.h b/cfgmgr/buffermgrdyn.h index 0ce4c5d30fa..528b20a744b 100644 --- a/cfgmgr/buffermgrdyn.h +++ b/cfgmgr/buffermgrdyn.h @@ -201,6 +201,7 @@ class BufferMgrDynamic : public Orch // Tool functions to parse keys and references std::string getPgPoolMode(); void transformSeperator(std::string &name); + void transformReference(std::string &name); std::string parseObjectNameFromKey(const std::string &key, size_t pos/* = 1*/); std::string parseObjectNameFromReference(const std::string &reference); std::string getDynamicProfileName(const std::string &speed, const std::string &cable, const std::string &mtu, const std::string &threshold, const std::string &gearbox_model); diff --git a/tests/mock_tests/portsorch_ut.cpp b/tests/mock_tests/portsorch_ut.cpp index 325745edff3..1b2400e4762 100644 --- a/tests/mock_tests/portsorch_ut.cpp +++ b/tests/mock_tests/portsorch_ut.cpp @@ -113,7 +113,7 @@ namespace portsorch_test }); // Create test buffer profile - profileTable.set("test_profile", { { "pool", "[BUFFER_POOL:test_pool]" }, + profileTable.set("test_profile", { { "pool", "[BUFFER_POOL_TABLE:test_pool]" }, { "xon", "14832" }, { "xoff", "14832" }, { "size", "35000" }, @@ -124,7 +124,7 @@ namespace portsorch_test { std::ostringstream ossAppl, ossCfg; ossAppl << it.first << ":3-4"; - pgTable.set(ossAppl.str(), { { "profile", "[BUFFER_PROFILE:test_profile]" } }); + pgTable.set(ossAppl.str(), { { "profile", "[BUFFER_PROFILE_TABLE:test_profile]" } }); ossCfg << it.first << "|3-4"; pgTableCfg.set(ossCfg.str(), { { "profile", "[BUFFER_PROFILE|test_profile]" } }); } @@ -233,7 +233,7 @@ namespace portsorch_test }); // Create test buffer profile - profileTable.set("test_profile", { { "pool", "[BUFFER_POOL:test_pool]" }, + profileTable.set("test_profile", { { "pool", "[BUFFER_POOL_TABLE:test_pool]" }, { "xon", "14832" }, { "xoff", "14832" }, { "size", "35000" }, @@ -244,7 +244,7 @@ namespace portsorch_test { std::ostringstream oss; oss << it.first << ":3-4"; - pgTable.set(oss.str(), { { "profile", "[BUFFER_PROFILE:test_profile]" } }); + pgTable.set(oss.str(), { { "profile", "[BUFFER_PROFILE_TABLE:test_profile]" } }); } // Populate pot table with SAI ports @@ -399,7 +399,7 @@ namespace portsorch_test }); // Create test buffer profile - profileTable.set("test_profile", { { "pool", "[BUFFER_POOL:test_pool]" }, + profileTable.set("test_profile", { { "pool", "[BUFFER_POOL_TABLE:test_pool]" }, { "xon", "14832" }, { "xoff", "14832" }, { "size", "35000" }, @@ -410,7 +410,7 @@ namespace portsorch_test { std::ostringstream oss; oss << it.first << ":3-4"; - pgTable.set(oss.str(), { { "profile", "[BUFFER_PROFILE:test_profile]" } }); + pgTable.set(oss.str(), { { "profile", "[BUFFER_PROFILE_TABLE:test_profile]" } }); } gBufferOrch->addExistingData(&pgTable); gBufferOrch->addExistingData(&poolTable); diff --git a/tests/test_buffer.py b/tests/test_buffer.py index 19e556fcfb2..1b77990c65e 100644 --- a/tests/test_buffer.py +++ b/tests/test_buffer.py @@ -37,7 +37,7 @@ def setup_db(self, dvs): self.cableLenTest2 = "19m" fvs = {"mmu_size": "12766208"} - self.state_db.create_entry("BUFFER_MAX_PARAM", "global", fvs) + self.state_db.create_entry("BUFFER_MAX_PARAM_TABLE", "global", fvs) self.initialized = True @@ -51,14 +51,14 @@ def test_changeSpeed(self, dvs, testlog): dvs.runcmd("config interface speed Ethernet0 " + self.speedToTest1) expectedProfile = self.make_lossless_profile_name(self.speedToTest1, self.originalCableLen) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) # Check whether bufer pg align - bufferPg = self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + bufferPg = self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) # Remove PG dvs.runcmd("config interface buffer priority_group lossless remove Ethernet0 3-4") - self.app_db.wait_for_deleted_entry("BUFFER_PG", "Ethernet0:3-4") + self.app_db.wait_for_deleted_entry("BUFFER_PG_TABLE", "Ethernet0:3-4") # Change speed to speed2 and verify dvs.runcmd("config interface speed Ethernet0 " + self.speedToTest2) @@ -66,18 +66,18 @@ def test_changeSpeed(self, dvs, testlog): # Re-add another PG dvs.runcmd("config interface buffer priority_group lossless add Ethernet0 6") - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:6", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:6", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) # Revert speed and PG to original value dvs.runcmd("config interface buffer priority_group remove Ethernet0 6") - self.app_db.wait_for_deleted_entry("BUFFER_PG", "Ethernet0:6") + self.app_db.wait_for_deleted_entry("BUFFER_PG_TABLE", "Ethernet0:6") dvs.runcmd("config interface speed Ethernet0 " + self.originalSpeed) dvs.runcmd("config interface buffer priority_group add Ethernet0 3-4") expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.originalCableLen) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) def test_changeCableLen(self, dvs, testlog): self.setup_db(dvs) @@ -85,31 +85,31 @@ def test_changeCableLen(self, dvs, testlog): # Change to new cable length dvs.runcmd("config interface cable_length Ethernet0 " + self.cableLenTest1) expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.cableLenTest1) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) # Remove the lossless PGs dvs.runcmd("config interface buffer priority_group remove Ethernet0") - self.app_db.wait_for_deleted_entry("BUFFER_PG", "Ethernet0:3-4") + self.app_db.wait_for_deleted_entry("BUFFER_PG_TABLE", "Ethernet0:3-4") # Change to another cable length dvs.runcmd("config interface cable_length Ethernet0 " + self.cableLenTest2) # Check whether the old profile has been removed - self.app_db.wait_for_deleted_entry("BUFFER_PROFILE", expectedProfile) + self.app_db.wait_for_deleted_entry("BUFFER_PROFILE_TABLE", expectedProfile) # Re-add lossless PGs dvs.runcmd("config interface buffer priority_group add Ethernet0 3-4") expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.cableLenTest2) - # Check the BUFFER_PROFILE and BUFFER_PG - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + # Check the BUFFER_PROFILE_TABLE and BUFFER_PG_TABLE + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) # Revert the cable length dvs.runcmd("config interface cable_length Ethernet0 " + self.originalCableLen) - # Check the BUFFER_PROFILE and BUFFER_PG - self.app_db.wait_for_deleted_entry("BUFFER_PROFILE", expectedProfile) + # Check the BUFFER_PROFILE_TABLE and BUFFER_PG_TABLE + self.app_db.wait_for_deleted_entry("BUFFER_PROFILE_TABLE", expectedProfile) expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.originalCableLen) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) def test_MultipleLosslessPg(self, dvs, testlog): self.setup_db(dvs) @@ -117,38 +117,38 @@ def test_MultipleLosslessPg(self, dvs, testlog): # Add another lossless PG dvs.runcmd("config interface buffer priority_group add Ethernet0 6") expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.originalCableLen) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:6", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:6", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) # change speed and check dvs.runcmd("config interface speed Ethernet0 " + self.speedToTest1) expectedProfile = self.make_lossless_profile_name(self.speedToTest1, self.originalCableLen) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:6", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:6", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) # change cable length and check dvs.runcmd("config interface cable_length Ethernet0 " + self.cableLenTest1) - self.app_db.wait_for_deleted_entry("BUFFER_PROFILE", expectedProfile) + self.app_db.wait_for_deleted_entry("BUFFER_PROFILE_TABLE", expectedProfile) expectedProfile = self.make_lossless_profile_name(self.speedToTest1, self.cableLenTest1) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:6", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:6", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) # revert the speed and cable length and check dvs.runcmd("config interface cable_length Ethernet0 " + self.originalCableLen) dvs.runcmd("config interface speed Ethernet0 " + self.originalSpeed) - self.app_db.wait_for_deleted_entry("BUFFER_PROFILE", expectedProfile) + self.app_db.wait_for_deleted_entry("BUFFER_PROFILE_TABLE", expectedProfile) expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.originalCableLen) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:6", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:6", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) def test_headroomOverride(self, dvs, testlog): self.setup_db(dvs) # Configure static profile dvs.runcmd("config buffer_profile add profile test -xon 18432 -xoff 16384") - self.app_db.wait_for_exact_match("BUFFER_PROFILE", "test", + self.app_db.wait_for_exact_match("BUFFER_PROFILE_TABLE", "test", { "pool" : "[BUFFER_POOL:ingress_lossless_pool]", "xon" : "18432", "xoff" : "16384", @@ -158,23 +158,23 @@ def test_headroomOverride(self, dvs, testlog): dvs.runcmd("config interface cable_length Ethernet0 " + self.cableLenTest1) expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.cableLenTest1) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) dvs.runcmd("config interface buffer priority_group lossless set Ethernet0 3-4 test") - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:test]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:test]"}) dvs.runcmd("config interface headroom_override add Ethernet0 test 6") - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:6", {"profile": "[BUFFER_PROFILE:test]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:6", {"profile": "[BUFFER_PROFILE_TABLE:test]"}) dvs.runcmd("config interface buffer priority_group remove Ethernet0") - self.app_db.wait_for_deleted_entry("BUFFER_PG", "Ethernet0:3-4") - self.app_db.wait_for_deleted_entry("BUFFER_PG", "Ethernet0:6") + self.app_db.wait_for_deleted_entry("BUFFER_PG_TABLE", "Ethernet0:3-4") + self.app_db.wait_for_deleted_entry("BUFFER_PG_TABLE", "Ethernet0:6") dvs.runcmd("config interface buffer priority_group add Ethernet0 3-4") - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"}) dvs.runcmd("config interface cable_length Ethernet0 " + self.originalCableLen) - self.app_db.wait_for_deleted_entry("BUFFER_PROFILE", expectedProfile) + self.app_db.wait_for_deleted_entry("BUFFER_PROFILE_TABLE", expectedProfile) expectedProfile = self.make_lossless_profile_name(self.originalSpeed, self.originalCableLen) - self.app_db.wait_for_entry("BUFFER_PROFILE", expectedProfile) - self.app_db.wait_for_field_match("BUFFER_PG", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE:" + expectedProfile + "]"}) + self.app_db.wait_for_entry("BUFFER_PROFILE_TABLE", expectedProfile) + self.app_db.wait_for_field_match("BUFFER_PG_TABLE", "Ethernet0:3-4", {"profile": "[BUFFER_PROFILE_TABLE:" + expectedProfile + "]"})