Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into Remove_SKU_ACS-SN4280
Browse files Browse the repository at this point in the history
  • Loading branch information
ram25794 committed Feb 14, 2025
2 parents 51efa3c + 5e8e658 commit 01f7d70
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/docker-sonic-mgmt-py3-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ stages:
clean: true
- bash: |
set -xe
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=n target/docker-sonic-mgmt.gz
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/docker-sonic-mgmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ stages:
clean: true
- bash: |
set -xe
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data
git submodule update --init --recursive -- src/sonic-platform-daemons src/sonic-genl-packet src/sonic-sairedis src/ptf src/sonic-device-data src/sonic-dash-api
make SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y configure PLATFORM=generic
make -f Makefile.work BLDENV=bullseye SONIC_BUILD_JOBS=$(nproc) DEFAULT_CONTAINER_REGISTRY=publicmirror.azurecr.io ENABLE_DOCKER_BASE_PULL=y LEGACY_SONIC_MGMT_DOCKER=y target/docker-sonic-mgmt.gz
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
2 changes: 1 addition & 1 deletion device/nokia/x86_64-nokia_ixr7250e_sup-r0/platform_reboot
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-config-engine/portconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
23 changes: 23 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-flex_counter.yang
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down

0 comments on commit 01f7d70

Please sign in to comment.