diff --git a/dockers/docker-orchagent/enable_counters.py b/dockers/docker-orchagent/enable_counters.py index 53b9568cf9ec..a0309b02e85c 100755 --- a/dockers/docker-orchagent/enable_counters.py +++ b/dockers/docker-orchagent/enable_counters.py @@ -18,9 +18,6 @@ def enable_counter_group(db, name): info = {} info['FLEX_COUNTER_STATUS'] = 'enable' db.mod_entry("FLEX_COUNTER_TABLE", name, info) - else: - entry_info.update({"FLEX_COUNTER_DELAY_STATUS":"false"}) - db.mod_entry("FLEX_COUNTER_TABLE", name, entry_info) def enable_rates(): # set the default interval for rates @@ -39,7 +36,7 @@ def enable_rates(): def enable_counters(): db = swsscommon.ConfigDBConnector() db.connect() - default_enabled_counters = ['PORT', 'RIF', 'QUEUE', 'PFCWD', 'PG_WATERMARK', 'PG_DROP', + default_enabled_counters = ['PORT', 'RIF', 'QUEUE', 'PFCWD', 'PG_WATERMARK', 'PG_DROP', 'QUEUE_WATERMARK', 'BUFFER_POOL_WATERMARK', 'PORT_BUFFER_DROP', 'ACL'] dpu_counters = ["ENI"] @@ -52,11 +49,6 @@ def enable_counters(): for key in dpu_counters: enable_counter_group(db, key) - # Set FLEX_COUNTER_DELAY_STATUS to false for those non-default counters - keys = db.get_keys('FLEX_COUNTER_TABLE') - for key in keys: - if key not in default_enabled_counters: - enable_counter_group(db, key) enable_rates() diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2 index f8083f040541..8e59d674c903 100644 --- a/files/build_templates/init_cfg.json.j2 +++ b/files/build_templates/init_cfg.json.j2 @@ -24,7 +24,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "enable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } }, diff --git a/src/sonic-config-engine/config_samples.py b/src/sonic-config-engine/config_samples.py index d72925c843c0..353e28e94ace 100644 --- a/src/sonic-config-engine/config_samples.py +++ b/src/sonic-config-engine/config_samples.py @@ -16,7 +16,6 @@ def generate_common_config(data): data['FLEX_COUNTER_TABLE'] = { 'ACL': { 'FLEX_COUNTER_STATUS': 'disable', - 'FLEX_COUNTER_DELAY_STATUS': 'true', 'POLL_INTERVAL': '10000' } } @@ -270,4 +269,3 @@ def get_available_config(): def generate_sample_config(data, setting_name): data = generate_common_config(data) return _sample_generators[setting_name.lower()](data) - diff --git a/src/sonic-config-engine/data/l1intf.j2 b/src/sonic-config-engine/data/l1intf.j2 index 68ffc3ee4ece..b2f218ea82cb 100644 --- a/src/sonic-config-engine/data/l1intf.j2 +++ b/src/sonic-config-engine/data/l1intf.j2 @@ -7,7 +7,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } }, @@ -30,4 +29,3 @@ } } - diff --git a/src/sonic-config-engine/data/l2switch.j2 b/src/sonic-config-engine/data/l2switch.j2 index 37c343867a10..359525763f71 100644 --- a/src/sonic-config-engine/data/l2switch.j2 +++ b/src/sonic-config-engine/data/l2switch.j2 @@ -3,7 +3,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } }, diff --git a/src/sonic-config-engine/data/l3intf.j2 b/src/sonic-config-engine/data/l3intf.j2 index 45fba9f692ef..06cc720bc1b4 100644 --- a/src/sonic-config-engine/data/l3intf.j2 +++ b/src/sonic-config-engine/data/l3intf.j2 @@ -7,7 +7,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } }, diff --git a/src/sonic-config-engine/tests/data/rsyslog/config_db.json b/src/sonic-config-engine/tests/data/rsyslog/config_db.json index 7cc58a131576..ede8d7f6600a 100644 --- a/src/sonic-config-engine/tests/data/rsyslog/config_db.json +++ b/src/sonic-config-engine/tests/data/rsyslog/config_db.json @@ -393,7 +393,6 @@ }, "FLEX_COUNTER_TABLE": { "ACL": { - "FLEX_COUNTER_DELAY_STATUS": "false", "FLEX_COUNTER_STATUS": "enable", "POLL_INTERVAL": "10000" } @@ -911,4 +910,3 @@ } } } - diff --git a/src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json b/src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json index 634b936fede0..b789c792069b 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json +++ b/src/sonic-config-engine/tests/sample_output/py2/l1_intfs.json @@ -261,7 +261,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/py2/l2switch.json b/src/sonic-config-engine/tests/sample_output/py2/l2switch.json index 5c38ba7201fd..de774b0ae58d 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/l2switch.json +++ b/src/sonic-config-engine/tests/sample_output/py2/l2switch.json @@ -268,7 +268,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json b/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json index 606a30672d9e..f09874d6e645 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py2/l2switch_dualtor.json @@ -647,7 +647,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json b/src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json index 7357c28fbef1..81dd3afeab33 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json +++ b/src/sonic-config-engine/tests/sample_output/py2/l3_intfs.json @@ -301,7 +301,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json b/src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json index 634b936fede0..b789c792069b 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json +++ b/src/sonic-config-engine/tests/sample_output/py3/l1_intfs.json @@ -261,7 +261,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/py3/l2switch.json b/src/sonic-config-engine/tests/sample_output/py3/l2switch.json index fa3363ab749c..0ed50c624b25 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/l2switch.json +++ b/src/sonic-config-engine/tests/sample_output/py3/l2switch.json @@ -268,7 +268,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json b/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json index 606a30672d9e..f09874d6e645 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json +++ b/src/sonic-config-engine/tests/sample_output/py3/l2switch_dualtor.json @@ -647,7 +647,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json b/src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json index 7357c28fbef1..81dd3afeab33 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json +++ b/src/sonic-config-engine/tests/sample_output/py3/l3_intfs.json @@ -301,7 +301,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } } diff --git a/src/sonic-config-engine/tests/sample_output/t1-smartswitch-dpu.json b/src/sonic-config-engine/tests/sample_output/t1-smartswitch-dpu.json index 9421f40c3493..400d36127a7a 100644 --- a/src/sonic-config-engine/tests/sample_output/t1-smartswitch-dpu.json +++ b/src/sonic-config-engine/tests/sample_output/t1-smartswitch-dpu.json @@ -20,7 +20,6 @@ "FLEX_COUNTER_TABLE": { "ACL": { "FLEX_COUNTER_STATUS": "disable", - "FLEX_COUNTER_DELAY_STATUS": "true", "POLL_INTERVAL": "10000" } }, diff --git a/src/sonic-config-engine/tests/sample_output/t1-smartswitch.json b/src/sonic-config-engine/tests/sample_output/t1-smartswitch.json index fc305243fb0e..c6232d7f8be0 100644 --- a/src/sonic-config-engine/tests/sample_output/t1-smartswitch.json +++ b/src/sonic-config-engine/tests/sample_output/t1-smartswitch.json @@ -374,7 +374,6 @@ }, "FLEX_COUNTER_TABLE": { "ACL": { - "FLEX_COUNTER_DELAY_STATUS": "true", "FLEX_COUNTER_STATUS": "disable", "POLL_INTERVAL": "10000" } diff --git a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang index 11e09f9f2a9f..9a7cd4aabef5 100644 --- a/src/sonic-yang-models/yang-models/sonic-flex_counter.yang +++ b/src/sonic-yang-models/yang-models/sonic-flex_counter.yang @@ -50,9 +50,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -63,9 +60,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } } container ENI { @@ -73,9 +67,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -86,9 +77,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } } container PG_DROP { @@ -96,9 +84,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -109,9 +94,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -122,9 +104,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -135,9 +114,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } } container PORT_BUFFER_DROP { @@ -145,9 +121,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -158,9 +131,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -171,9 +141,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -184,9 +151,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -197,9 +161,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } } container ACL { @@ -207,9 +168,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -220,9 +178,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -233,9 +188,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -246,9 +198,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -259,9 +208,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; } @@ -272,9 +218,6 @@ module sonic-flex_counter { leaf FLEX_COUNTER_STATUS { type flex_status; } - leaf FLEX_COUNTER_DELAY_STATUS { - type flex_delay_status; - } leaf POLL_INTERVAL { type poll_interval; }