Remove PG 3 and 4 for Internal Ports (sonic-net#21797)

Remove PG 3 and 4 for Internal Ports

Author: oleksandrivantsiv

device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/buffers_defaults_objects.j2

@@ -93,8 +93,7 @@
     "BUFFER_PG": {
         "Dpc": {
             "active": {
-                "dynamic": "ingress_lossy_profile",
-                "static": "ingress_lossy_profile"
+                "dynamic": "NULL"
             },
             "inactive": {
                 "dynamic": "ingress_lossy_profile",
@@ -362,12 +361,6 @@
         "{{ port }}|3-4": {
             "profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'dynamic')}}
         },
-{% else %}
-{% if port in PORT_DPC %}
-        "{{ port }}|3-4": {
-            "profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'static')}}
-        },
-{% endif %}
 {% endif %}
         "{{ port }}|0": {
             "profile" : "ingress_lossy_profile"

files/build_templates/buffers_config.j2

@@ -79,7 +79,9 @@ def
             {%- endif %}
         {%- endif %}
     {%- endfor %}
-    {%- if cable_len -%}
+    {%- if port_name in PORT_DPC -%}
+        {{ '0m' }}
+    {%- elif cable_len -%}
         {{ cable_len.0 }}
     {%- else %}
         {%- if 'torrouter' in switch_role.lower() and 'mgmt' not in switch_role.lower()%}

files/build_templates/qos_config.j2

@@ -96,6 +96,18 @@
     {{- generate_tc_to_pg_map_per_sku() }}
 {% else %}
     "TC_TO_PRIORITY_GROUP_MAP": {
+{% if PORT_DPC %}
+        "AZURE_DPC": {
+            "0": "0",
+            "1": "0",
+            "2": "0",
+            "3": "0",
+            "4": "0",
+            "5": "0",
+            "6": "0",
+            "7": "7"
+        },
+{% endif %}
         "AZURE": {
             "0": "0",
             "1": "0",
@@ -351,7 +363,11 @@
 {% endif %}
             "pfcwd_sw_enable" : "3,4",
 {% endif %}
+{% if port not in PORT_DPC %}
             "tc_to_pg_map"    : "AZURE",
+{% else %}
+            "tc_to_pg_map"    : "AZURE_DPC",
+{% endif %}
             "pfc_to_queue_map": "AZURE"
         }{% if not loop.last %},{% endif %}
 

src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4700-o28-t1-smartswitch.json

@@ -14,25 +14,25 @@
         "Ethernet224": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         },
         "Ethernet232": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         },
         "Ethernet240": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         },
         "Ethernet248": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         }
     },
@@ -415,27 +415,15 @@
         "Ethernet216|0": {
             "profile": "ingress_lossy_profile"
         },
-        "Ethernet224|3-4": {
-            "profile": "ingress_lossy_profile"
-        },
         "Ethernet224|0": {
             "profile": "ingress_lossy_profile"
         },
-        "Ethernet232|3-4": {
-            "profile": "ingress_lossy_profile"
-        },
         "Ethernet232|0": {
             "profile": "ingress_lossy_profile"
         },
-        "Ethernet240|3-4": {
-            "profile": "ingress_lossy_profile"
-        },
         "Ethernet240|0": {
             "profile": "ingress_lossy_profile"
         },
-        "Ethernet248|3-4": {
-            "profile": "ingress_lossy_profile"
-        },
         "Ethernet248|0": {
             "profile": "ingress_lossy_profile"
         },

src/sonic-config-engine/tests/sample_output/py3/qos-mellanox4700-o28-t1-smartswitch_dyn.json

@@ -14,25 +14,25 @@
         "Ethernet224": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         },
         "Ethernet232": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         },
         "Ethernet240": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         },
         "Ethernet248": {
             "dscp_to_tc_map": "AZURE",
             "tc_to_queue_map": "AZURE",
-            "tc_to_pg_map": "AZURE",
+            "tc_to_pg_map": "AZURE_DPC",
             "pfc_to_queue_map": "AZURE"
         }
     },
@@ -391,25 +391,25 @@
             "profile": "ingress_lossy_profile"
         },
         "Ethernet224|3-4": {
-            "profile": "ingress_lossy_profile"
+            "profile": "NULL"
         },
         "Ethernet224|0": {
             "profile": "ingress_lossy_profile"
         },
         "Ethernet232|3-4": {
-            "profile": "ingress_lossy_profile"
+            "profile": "NULL"
         },
         "Ethernet232|0": {
             "profile": "ingress_lossy_profile"
         },
         "Ethernet240|3-4": {
-            "profile": "ingress_lossy_profile"
+            "profile": "NULL"
         },
         "Ethernet240|0": {
             "profile": "ingress_lossy_profile"
         },
         "Ethernet248|3-4": {
-            "profile": "ingress_lossy_profile"
+            "profile": "NULL"
         },
         "Ethernet248|0": {
             "profile": "ingress_lossy_profile"