Move common files to another independent PR

Signed-off-by: Stephen Sun <stephens@nvidia.com>
sonic-net · Nov 19, 2021 · 3998724 · 3998724
1 parent e1e95b3
commit 3998724
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 48 deletions.
diff --git a/dockers/docker-orchagent/buffermgrd.sh b/dockers/docker-orchagent/buffermgrd.sh
@@ -3,16 +3,14 @@
 BUFFER_CALCULATION_MODE=$(redis-cli -n 4 hget "DEVICE_METADATA|localhost" buffer_model)
 
 if [ "$BUFFER_CALCULATION_MODE" == "dynamic" ]; then
-    BUFFERMGRD_ARGS="-a /etc/sonic/asic_table.json"
     if [ -f /etc/sonic/peripheral_table.json ]; then
-        BUFFERMGRD_PERIPHERIAL_ARGS=" -p /etc/sonic/peripheral_table.json"
-    fi
-    if [ -f /etc/sonic/zero_profiles.json ]; then
-        BUFFERMGRD_ZERO_PROFILE_ARGS=" -z /etc/sonic/zero_profiles.json"
+        BUFFERMGRD_ARGS="-a /etc/sonic/asic_table.json -p /etc/sonic/peripheral_table.json"
+    else
+        BUFFERMGRD_ARGS="-a /etc/sonic/asic_table.json"
     fi
 else
     # Should we use the fallback MAC in case it is not found in Device.Metadata
     BUFFERMGRD_ARGS="-l /usr/share/sonic/hwsku/pg_profile_lookup.ini"
 fi
 
-exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS} ${BUFFERMGRD_PERIPHERIAL_ARGS} ${BUFFERMGRD_ZERO_PROFILE_ARGS}
+exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS}
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
@@ -96,28 +96,20 @@ def
 {%- set PORT_ALL  = [] %}
 
 {%- if PORT is not defined %}
-    {%- if defs.generate_port_lists is defined %}
-        {%- if defs.generate_port_lists(PORT_ALL) %} {% endif %}
-    {%- endif %}
+    {%- if defs.generate_port_lists(PORT_ALL) %} {% endif %}
 {%- else %}
     {%- for port in PORT %}
         {%- if PORT_ALL.append(port) %}{%- endif %}
     {%- endfor %}
 {%- endif %}
 
 {%- set PORT_ACTIVE  = [] %}
-{%- set PORT_INACTIVE  = [] %}
 {%- if DEVICE_NEIGHBOR is not defined %}
     {%- set PORT_ACTIVE = PORT_ALL %}
 {%- else %}
     {%- for port in DEVICE_NEIGHBOR.keys() %}
         {%- if PORT_ACTIVE.append(port) %}{%- endif %}
     {%- endfor %}
-    {%- for port in PORT_ALL %}
-        {%- if port not in DEVICE_NEIGHBOR.keys() %}
-            {%- if PORT_INACTIVE.append(port) %}{%- endif %}
-        {%- endif %}
-    {%- endfor %}
 {%- endif %}
 
 {%- set port_names_list_active  = [] %}
@@ -126,12 +118,6 @@ def
 {%- endfor %}
 {%- set port_names_active  = port_names_list_active  | join(',') %}
 
-{%- set port_names_list_inactive  = [] %}
-{%- for port in PORT_INACTIVE %}
-    {%- if port_names_list_inactive.append(port) %}{%- endif %}
-{%- endfor %}
-{%- set port_names_inactive  = port_names_list_inactive  | join(',') %}
-
 {
     "CABLE_LENGTH": {
         "AZURE": {
@@ -145,22 +131,14 @@ def
 
 {% if defs.generate_buffer_pool_and_profiles is defined %}
 {{ defs.generate_buffer_pool_and_profiles() }}
-{% elif defs.generate_buffer_pool_and_profiles_with_inactive_ports is defined %}
-{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
 {% endif %}
 
-
-{%- if port_names_active|length > 0 or port_names_inactive|length > 0 -%}
 {%- if defs.generate_profile_lists is defined %}
 {{ defs.generate_profile_lists(port_names_active) }},
-{% elif defs.generate_profile_lists_with_inactive_ports is defined %}
-{{ defs.generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) }},
 {% endif %}
 
 {%- if defs.generate_pg_profils is defined %}
 {{ defs.generate_pg_profils(port_names_active) }}
-{% elif defs.generate_pg_profiles_with_inactive_ports is defined %}
-{{ defs.generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) }},
 {% else %}
     "BUFFER_PG": {
 {% for port in PORT_ACTIVE %}
@@ -179,8 +157,6 @@ def
 
 {% if defs.generate_queue_buffers is defined %}
 {{ defs.generate_queue_buffers(port_names_active) }}
-{% elif defs.generate_queue_buffers_with_inactive_ports is defined %}
-{{ defs.generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) }}
 {% else %}
     "BUFFER_QUEUE": {
 {% for port in PORT_ACTIVE %}
@@ -201,11 +177,8 @@ def
 {% endfor %}
     }
 {% endif %}
-{%- if dynamic_mode is defined -%}
-   ,
-{%- endif -%}
-{%- endif -%}
 {% if dynamic_mode is defined %}
+   ,
     "DEFAULT_LOSSLESS_BUFFER_PARAMETER": {
         "AZURE": {
             "default_dynamic_th": "0"

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
@@ -284,9 +284,6 @@ start() {
     if [ ! -f /etc/sonic/peripheral_table.json ] && [ -f /usr/share/sonic/device/$PLATFORM/port_peripheral_config.j2 ]; then
         sonic-cfggen -d -t /usr/share/sonic/device/$PLATFORM/port_peripheral_config.j2 > /etc/sonic/peripheral_table.json
     fi
-    if [ ! -f /etc/sonic/zero_profiles.json ] && [ -f /usr/share/sonic/templates/zero_profiles.j2 ]; then
-        sonic-cfggen -d -t /usr/share/sonic/device/$PLATFORM/zero_profiles.j2 > /etc/sonic/zero_profiles.json
-    fi
     {%- endif %}
 
     # In Multi ASIC platforms the global database config file database_global.json will exist.

diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
@@ -504,11 +504,6 @@ if [ -f platform/{{ sonic_asic_platform }}/peripheral_table.j2 ]
 then
     sudo cp platform/{{ sonic_asic_platform }}/peripheral_table.j2 $FILESYSTEM_ROOT/usr/share/sonic/templates/peripheral_table.j2
 fi
-
-if [ -f platform/{{ sonic_asic_platform }}/zero_profiles.j2 ]
-then
-    sudo cp platform/{{ sonic_asic_platform }}/zero_profiles.j2 $FILESYSTEM_ROOT/usr/share/sonic/templates/zero_profiles.j2
-fi
 {% endif %}
 
 # Copy hostname configuration scripts

diff --git a/platform/vs/docker-sonic-vs/buffermgrd.sh b/platform/vs/docker-sonic-vs/buffermgrd.sh
@@ -10,8 +10,4 @@ else
     BUFFERMGRD_ARGS="-l /usr/share/sonic/hwsku/pg_profile_lookup.ini"
 fi
 
-if [ -f /etc/sonic/zero_profiles.json ]; then
-    BUFFERMGRD_ZERO_PROFILE_ARGS=" -z /etc/sonic/zero_profiles.json"
-fi
-
-exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS} ${BUFFERMGRD_ZERO_PROFILE_ARGS}
+exec /usr/bin/buffermgrd ${BUFFERMGRD_ARGS}