Revert "[ACL] enable ACL FC when genereting config from minigraph but…

… disable by default (sonic-net#8908)" This reverts commit a2c2d67.
alexrallen · Nov 25, 2021 · c3a8efe · c3a8efe
1 parent 5a5a5e7
commit c3a8efe
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 100 deletions.
diff --git a/dockers/docker-orchagent/enable_counters.py b/dockers/docker-orchagent/enable_counters.py
@@ -45,7 +45,6 @@ def enable_counters():
     enable_counter_group(db, 'QUEUE_WATERMARK')
     enable_counter_group(db, 'BUFFER_POOL_WATERMARK')
     enable_counter_group(db, 'PORT_BUFFER_DROP')
-    enable_counter_group(db, 'ACL')
     enable_rates()
 
 

diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2
@@ -19,13 +19,6 @@
 {% endfor %}
         }
     },
-    "FLEX_COUNTER_TABLE": {
-        "ACL": {
-            "FLEX_COUNTER_STATUS": "enable",
-            "FLEX_COUNTER_DELAY_STATUS": "true",
-            "POLL_INTERVAL": "10000"
-        }
-    },
 {%- set features = [("bgp", "enabled", false, "enabled"),
                    ("database", "always_enabled", false, "always_enabled"),
                    ("lldp", "enabled", false, "enabled"),

diff --git a/src/sonic-config-engine/config_samples.py b/src/sonic-config-engine/config_samples.py
@@ -10,16 +10,6 @@
 else:
     UNICODE_TYPE = unicode
 
-def generate_common_config(data):
-    data['FLEX_COUNTER_TABLE'] = {
-        'ACL': {
-            'FLEX_COUNTER_STATUS': 'disable',
-            'FLEX_COUNTER_DELAY_STATUS': 'true',
-            'POLL_INTERVAL': '10000'
-        }
-    }
-    return data
-
 # The following config generation methods exits:
 #    't1': generate_t1_sample_config,
 #    'l2': generate_l2_config,
@@ -170,6 +160,5 @@ def get_available_config():
     return list(_sample_generators.keys())
 
 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
@@ -1,15 +1,8 @@
 {
     "DEVICE_METADATA": {
         "localhost" : {
-            "hwsku" : "{{ DEVICE_METADATA.localhost.hwsku }}"
-        }
-    },
-    "FLEX_COUNTER_TABLE": {
-        "ACL": {
-            "FLEX_COUNTER_STATUS": "disable",
-            "FLEX_COUNTER_DELAY_STATUS": "true",
-            "POLL_INTERVAL": "10000"
-        }
+        "hwsku" : "{{ DEVICE_METADATA.localhost.hwsku }}"
+    }
     },
     {% set ns = {'firstPrinted': False} -%}
     "PORT": {

diff --git a/src/sonic-config-engine/data/l2switch.j2 b/src/sonic-config-engine/data/l2switch.j2
@@ -1,12 +1,5 @@
 {
     "DEVICE_METADATA": {{ DEVICE_METADATA | tojson }},
-    "FLEX_COUNTER_TABLE": {
-        "ACL": {
-            "FLEX_COUNTER_STATUS": "disable",
-            "FLEX_COUNTER_DELAY_STATUS": "true",
-            "POLL_INTERVAL": "10000"
-        }
-    },
     {% set ns = {'firstPrinted': False} -%}
     "PORT": {
         {%- for key, value in PORT.items() -%}

diff --git a/src/sonic-config-engine/data/l3intf.j2 b/src/sonic-config-engine/data/l3intf.j2
@@ -1,15 +1,8 @@
 {
     "DEVICE_METADATA": {
         "localhost" : {
-            "hwsku" : "{{ DEVICE_METADATA.localhost.hwsku }}"
-        }
-    },
-    "FLEX_COUNTER_TABLE": {
-        "ACL": {
-            "FLEX_COUNTER_STATUS": "disable",
-            "FLEX_COUNTER_DELAY_STATUS": "true",
-            "POLL_INTERVAL": "10000"
-        }
+        "hwsku" : "{{ DEVICE_METADATA.localhost.hwsku }}"
+    }
     },
     {% set ns = {'firstPrinted': False} -%}
     "PORT": {

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
@@ -257,12 +257,5 @@
             "mtu": "9100",
             "speed": "100000"
         }
-    },
-    "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
@@ -264,12 +264,5 @@
         "Vlan1000|Ethernet24": {
             "tagging_mode": "untagged"
         }
-    },
-    "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
@@ -643,12 +643,5 @@
             "server_ipv6": "fc02:1000::19/128",
             "state": "auto"
         }
-    },
-    "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
@@ -297,12 +297,5 @@
         "Ethernet29": {},
         "Ethernet30": {},
         "Ethernet31": {}
-    },
-    "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
@@ -257,12 +257,5 @@
             "mtu": "9100",
             "speed": "100000"
         }
-    },
-    "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
@@ -264,12 +264,5 @@
         "Vlan1000|Ethernet124": {
             "tagging_mode": "untagged"
         }
-    },
-    "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
@@ -643,12 +643,5 @@
             "server_ipv6": "fc02:1000::19/128",
             "state": "auto"
         }
-    },
-    "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
@@ -297,12 +297,5 @@
         "Ethernet29": {},
         "Ethernet30": {},
         "Ethernet31": {}
-    },
-    "FLEX_COUNTER_TABLE": {
-        "ACL": {
-            "FLEX_COUNTER_STATUS": "disable",
-            "FLEX_COUNTER_DELAY_STATUS": "true",
-            "POLL_INTERVAL": "10000"
-        }
     }
 }