@@ -202,32 +202,6 @@ void BufferMgrDynamic::transformSeperator(string &name)
202
202
name.replace (pos, 1 , " :" );
203
203
}
204
204
205
- void BufferMgrDynamic::transformReference (string &name)
206
- {
207
- auto references = tokenize (name, list_item_delimiter);
208
- int ref_index = 0 ;
209
-
210
- name = " " ;
211
-
212
- for (auto &reference : references)
213
- {
214
- if (ref_index != 0 )
215
- name += list_item_delimiter;
216
- ref_index ++;
217
-
218
- auto keys = tokenize (reference, config_db_key_delimiter);
219
- int key_index = 0 ;
220
- for (auto &key : keys)
221
- {
222
- if (key_index == 0 )
223
- name += key + " _TABLE" ;
224
- else
225
- name += delimiter + key;
226
- key_index ++;
227
- }
228
- }
229
- }
230
-
231
205
// For string "TABLE_NAME|objectname", returns "objectname"
232
206
string BufferMgrDynamic::parseObjectNameFromKey (const string &key, size_t pos = 0 )
233
207
{
@@ -240,13 +214,6 @@ string BufferMgrDynamic::parseObjectNameFromKey(const string &key, size_t pos =
240
214
return keys[pos];
241
215
}
242
216
243
- // For string "[foo]", returns "foo"
244
- string BufferMgrDynamic::parseObjectNameFromReference (const string &reference)
245
- {
246
- auto objName = reference.substr (1 , reference.size () - 2 );
247
- return parseObjectNameFromKey (objName, 1 );
248
- }
249
-
250
217
string BufferMgrDynamic::getDynamicProfileName (const string &speed, const string &cable, const string &mtu, const string &threshold, const string &gearbox_model, long lane_count)
251
218
{
252
219
string buffer_profile_key;
@@ -619,17 +586,14 @@ void BufferMgrDynamic::updateBufferProfileToDb(const string &name, const buffer_
619
586
620
587
// profile threshold field name
621
588
mode += " _th" ;
622
- string pg_pool_reference = string (APP_BUFFER_POOL_TABLE_NAME) +
623
- m_applBufferProfileTable.getTableNameSeparator () +
624
- INGRESS_LOSSLESS_PG_POOL_NAME;
625
589
626
590
fvVector.emplace_back (" xon" , profile.xon );
627
591
if (!profile.xon_offset .empty ()) {
628
592
fvVector.emplace_back (" xon_offset" , profile.xon_offset );
629
593
}
630
594
fvVector.emplace_back (" xoff" , profile.xoff );
631
595
fvVector.emplace_back (" size" , profile.size );
632
- fvVector.emplace_back (" pool" , " [ " + pg_pool_reference + " ] " );
596
+ fvVector.emplace_back (" pool" , INGRESS_LOSSLESS_PG_POOL_NAME );
633
597
fvVector.emplace_back (mode, profile.threshold );
634
598
635
599
m_applBufferProfileTable.set (name, fvVector);
@@ -646,15 +610,7 @@ void BufferMgrDynamic::updateBufferPgToDb(const string &key, const string &profi
646
610
647
611
fvVector.clear ();
648
612
649
- string profile_ref = string (" [" ) +
650
- APP_BUFFER_PROFILE_TABLE_NAME +
651
- m_applBufferPgTable.getTableNameSeparator () +
652
- profile +
653
- " ]" ;
654
-
655
- fvVector.clear ();
656
-
657
- fvVector.push_back (make_pair (" profile" , profile_ref));
613
+ fvVector.push_back (make_pair (" profile" , profile));
658
614
m_applBufferPgTable.set (key, fvVector);
659
615
}
660
616
else
@@ -1779,8 +1735,7 @@ task_process_status BufferMgrDynamic::handleBufferProfileTable(KeyOpFieldsValues
1779
1735
{
1780
1736
if (!value.empty ())
1781
1737
{
1782
- transformReference (value);
1783
- auto poolName = parseObjectNameFromReference (value);
1738
+ auto poolName = value;
1784
1739
if (poolName.empty ())
1785
1740
{
1786
1741
SWSS_LOG_ERROR (" BUFFER_PROFILE: Invalid format of reference to pool: %s" , value.c_str ());
@@ -1953,8 +1908,7 @@ task_process_status BufferMgrDynamic::handleOneBufferPgEntry(const string &key,
1953
1908
{
1954
1909
// Headroom override
1955
1910
pureDynamic = false ;
1956
- transformReference (value);
1957
- string profileName = parseObjectNameFromReference (value);
1911
+ string profileName = value;
1958
1912
if (profileName.empty ())
1959
1913
{
1960
1914
SWSS_LOG_ERROR (" BUFFER_PG: Invalid format of reference to profile: %s" , value.c_str ());
@@ -2170,12 +2124,6 @@ task_process_status BufferMgrDynamic::doBufferTableTask(KeyOpFieldsValuesTuple &
2170
2124
for (auto i : kfvFieldsValues (tuple))
2171
2125
{
2172
2126
// Transform the separator in values from "|" to ":"
2173
- if (fvField (i) == " pool" )
2174
- transformReference (fvValue (i));
2175
- if (fvField (i) == " profile" )
2176
- transformReference (fvValue (i));
2177
- if (fvField (i) == " profile_list" )
2178
- transformReference (fvValue (i));
2179
2127
fvVector.emplace_back (fvField (i), fvValue (i));
2180
2128
SWSS_LOG_INFO (" Inserting field %s value %s" , fvField (i).c_str (), fvValue (i).c_str ());
2181
2129
}
0 commit comments