Merge branch 'master' of github.com:sonic-net/sonic-buildimage into sonic-mgmt-dash

Author: theasianpianist

device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/platform_reboot

@@ -44,6 +44,6 @@ sleep 2
 echo "w" > /dev/watchdog
 kick_date=`date -u`
 echo "last watchdog kick $kick_date" > /var/log/nokia-watchdog-last.log
-rm -f /sys/firmware/efi/efivars/dump-*
+# rm -f /sys/firmware/efi/efivars/dump-*
 sync
 exec /sbin/reboot $@

device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot

@@ -33,7 +33,7 @@ sleep 2
 echo "w" > /dev/watchdog
 kick_date=`date -u`
 echo "last watchdog kick $kick_date" > /var/log/nokia-watchdog-last.log
-rm -f /sys/firmware/efi/efivars/dump-*
+# rm -f /sys/firmware/efi/efivars/dump-*
 echo "Shutdown midplane"
 ifconfig xe0 down
 sync

files/build_templates/bmp.service.j2

@@ -0,0 +1,16 @@
+[Unit]
+Description=BMP container
+Requires=database{% if multi_instance == 'true' %}@%i{% endif %}.service
+After=database{% if multi_instance == 'true' %}@%i{% endif %}.service
+Before=ntp-config.service
+BindsTo=sonic.target
+After=sonic.target
+StartLimitIntervalSec=1200
+StartLimitBurst=3
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStartPre=/usr/local/bin/{{docker_container_name}}.sh start{% if multi_instance == 'true' %} %i{% endif %}
+ExecStart=/usr/local/bin/{{docker_container_name}}.sh wait{% if multi_instance == 'true' %} %i{% endif %}
+ExecStop=/usr/local/bin/{{docker_container_name}}.sh stop{% if multi_instance == 'true' %} %i{% endif %}
+RestartSec=30

files/build_templates/per_namespace/bmp.service.j2

@@ -417,7 +417,7 @@ def parse_platform_json_file(hwsku_json_file, platform_json_file):
 
     for intf in port_dict[INTF_KEY]:
         if intf not in hwsku_dict[INTF_KEY]:
-            raise Exception("{} is not available in hwsku_dict".format(intf))
+            continue
 
         # take default_brkout_mode from hwsku.json
         brkout_mode = hwsku_dict[INTF_KEY][intf][BRKOUT_MODE]

src/sonic-config-engine/portconfig.py

@@ -163,6 +163,7 @@
                 "PORT": {
                     "FLEX_COUNTER_STATUS": "enable",
                     "BULK_CHUNK_SIZE": 100,
+                    "BULK_CHUNK_SIZE_PER_PREFIX": "SAI_PORT_STAT_IF_OUT_QLEN:0;SAI_PORT_STAT_IF_IN_FEC:32",
                     "POLL_INTERVAL": 1000
                 },
                 "PORT_BUFFER_DROP": {

src/sonic-swss-common

@@ -47,6 +47,11 @@ module sonic-flex_counter {
                 }
             }
 
+            typedef bulk_chunk_size_per_prefix {
+                type string;
+                description "Bulk chunk size per counter name prefix";
+            }
+
             description "FLEX_COUNTER_TABLE part of config_db.json";
 
             /* below are in alphabetical order */
@@ -111,6 +116,9 @@ module sonic-flex_counter {
                 leaf BULK_CHUNK_SIZE {
                     type bulk_chunk_size;
                 }
+                leaf BULK_CHUNK_SIZE_PER_PREFIX {
+                    type bulk_chunk_size_per_prefix;
+                }
             }
 
             container PG_WATERMARK {
@@ -127,6 +135,9 @@ module sonic-flex_counter {
                 leaf BULK_CHUNK_SIZE {
                     type bulk_chunk_size;
                 }
+                leaf BULK_CHUNK_SIZE_PER_PREFIX {
+                    type bulk_chunk_size_per_prefix;
+                }
             }
 
             container PORT {
@@ -143,6 +154,9 @@ module sonic-flex_counter {
                 leaf BULK_CHUNK_SIZE {
                     type bulk_chunk_size;
                 }
+                leaf BULK_CHUNK_SIZE_PER_PREFIX {
+                    type bulk_chunk_size_per_prefix;
+                }
             }
 
             container PORT_RATES {
@@ -169,6 +183,9 @@ module sonic-flex_counter {
                 leaf BULK_CHUNK_SIZE {
                     type bulk_chunk_size;
                 }
+                leaf BULK_CHUNK_SIZE_PER_PREFIX {
+                    type bulk_chunk_size_per_prefix;
+                }
             }
 
             container QUEUE {
@@ -185,6 +202,9 @@ module sonic-flex_counter {
                 leaf BULK_CHUNK_SIZE {
                     type bulk_chunk_size;
                 }
+                leaf BULK_CHUNK_SIZE_PER_PREFIX {
+                    type bulk_chunk_size_per_prefix;
+                }
             }
 
             container QUEUE_WATERMARK {
@@ -201,6 +221,9 @@ module sonic-flex_counter {
                 leaf BULK_CHUNK_SIZE {
                     type bulk_chunk_size;
                 }
+                leaf BULK_CHUNK_SIZE_PER_PREFIX {
+                    type bulk_chunk_size_per_prefix;
+                }
             }
 
             container RIF {