From 5208de19caa325f6ddf82966616673d03f4dee63 Mon Sep 17 00:00:00 2001 From: mazora Date: Wed, 20 Mar 2024 16:45:45 +0200 Subject: [PATCH 01/10] Additions to Dockerfile and Supervisord Include running schedulermgrd and cron from supervisord and install cron in the dockerfile for swss/orchagent --- dockers/docker-orchagent/Dockerfile.j2 | 4 ++- .../docker-orchagent/critical_processes.j2 | 2 ++ dockers/docker-orchagent/supervisord.conf.j2 | 30 +++++++++++++++++++ platform/vs/docker-sonic-vs/start.sh | 4 +++ .../vs/docker-sonic-vs/supervisord.conf.j2 | 22 ++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2 index fb90b4f09c2..563a943415d 100755 --- a/dockers/docker-orchagent/Dockerfile.j2 +++ b/dockers/docker-orchagent/Dockerfile.j2 @@ -22,7 +22,9 @@ RUN apt-get update && \ pciutils \ # Needed for installing netifaces Python package build-essential \ - python3-dev + python3-dev \ + # Used for schedulermgrd + cron {% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %} # Fix for gcc/python/iputils-ping not found in arm docker diff --git a/dockers/docker-orchagent/critical_processes.j2 b/dockers/docker-orchagent/critical_processes.j2 index b9bad74089b..e2caa51660d 100644 --- a/dockers/docker-orchagent/critical_processes.j2 +++ b/dockers/docker-orchagent/critical_processes.j2 @@ -19,4 +19,6 @@ program:nbrmgrd program:vxlanmgrd program:coppmgrd program:tunnelmgrd +program:schedulermgrd +program:cron {%- endif %} diff --git a/dockers/docker-orchagent/supervisord.conf.j2 b/dockers/docker-orchagent/supervisord.conf.j2 index eee121f1c68..826056c83b2 100644 --- a/dockers/docker-orchagent/supervisord.conf.j2 +++ b/dockers/docker-orchagent/supervisord.conf.j2 @@ -340,3 +340,33 @@ dependent_startup_wait_for=swssconfig:exited environment=ASAN_OPTIONS="log_path=/var/log/asan/fdbsyncd-asan.log{{ asan_extra_options }}" {% endif %} {%- endif %} + +{% if is_fabric_asic == 0 %} +[program:schedulermgrd] +command=/usr/bin/schedulermgrd +priority=18 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +dependent_startup=true +dependent_startup_wait_for=swssconfig:exited +{% if ENABLE_ASAN == "y" %} +environment=ASAN_OPTIONS="log_path=/var/log/asan/schedulermgrd-asan.log{{ asan_extra_options }}" +{% endif %} +{%- endif %} + +{% if is_fabric_asic == 0 %} +[program:cron] +command=/usr/sbin/cron -f -L 15 +priority=18 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +dependent_startup=true +dependent_startup_wait_for=swssconfig:exited +{% if ENABLE_ASAN == "y" %} +environment=ASAN_OPTIONS="log_path=/var/log/asan/cron-asan.log{{ asan_extra_options }}" +{% endif %} +{%- endif %} \ No newline at end of file diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index f7dbde8dcff..5dbe6a4cc8d 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -180,6 +180,10 @@ supervisorctl start tunnelmgrd supervisorctl start fabricmgrd +supervisorctl start schedulermgrd + +supervisorctl start cron + # Start arp_update when VLAN exists VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` if [ "$VLAN" != "" ]; then diff --git a/platform/vs/docker-sonic-vs/supervisord.conf.j2 b/platform/vs/docker-sonic-vs/supervisord.conf.j2 index a394d29d406..6f3e1cb0498 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf.j2 +++ b/platform/vs/docker-sonic-vs/supervisord.conf.j2 @@ -405,3 +405,25 @@ stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/fabricmgrd-asan.log{{ asan_extra_options }}" {% endif %} + +[program:schedulermgrd] +command=/usr/bin/schedulermgrd +priority=27 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +{% if ENABLE_ASAN == "y" %} +environment=ASAN_OPTIONS="log_path=/var/log/asan/schedulermgrd-asan.log{{ asan_extra_options }}" +{% endif %} + +[program:cron] +command=/usr/sbin/cron -f -L 15 +priority=27 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +{% if ENABLE_ASAN == "y" %} +environment=ASAN_OPTIONS="log_path=/var/log/asan/cron-asan.log{{ asan_extra_options }}" +{% endif %} \ No newline at end of file From b2e6a25f1a2222fab95bad048812a84b896754ad Mon Sep 17 00:00:00 2001 From: mazora Date: Wed, 3 Apr 2024 09:45:35 +0300 Subject: [PATCH 02/10] Change schedulermgrd to timerangemgrd & add timebasedconfigmgrd renamed, and added new timebasedconfigmgrd to supervisorctl management --- platform/vs/docker-sonic-vs/start.sh | 4 +++- .../vs/docker-sonic-vs/supervisord.conf.j2 | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index 5dbe6a4cc8d..d918209cb9e 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -180,7 +180,9 @@ supervisorctl start tunnelmgrd supervisorctl start fabricmgrd -supervisorctl start schedulermgrd +supervisorctl start timerangemgrd + +supervisorctl start timebasedconfigmgrd supervisorctl start cron diff --git a/platform/vs/docker-sonic-vs/supervisord.conf.j2 b/platform/vs/docker-sonic-vs/supervisord.conf.j2 index 6f3e1cb0498..6dd23ef3dd1 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf.j2 +++ b/platform/vs/docker-sonic-vs/supervisord.conf.j2 @@ -406,17 +406,29 @@ stderr_syslog=true environment=ASAN_OPTIONS="log_path=/var/log/asan/fabricmgrd-asan.log{{ asan_extra_options }}" {% endif %} -[program:schedulermgrd] -command=/usr/bin/schedulermgrd +[program:timerangemgrd] +command=/usr/bin/timerangemgrd priority=27 autostart=false autorestart=false stdout_logfile=syslog stderr_logfile=syslog {% if ENABLE_ASAN == "y" %} -environment=ASAN_OPTIONS="log_path=/var/log/asan/schedulermgrd-asan.log{{ asan_extra_options }}" +environment=ASAN_OPTIONS="log_path=/var/log/asan/timerangemgrd-asan.log{{ asan_extra_options }}" {% endif %} +[program:timebasedconfigmgrd] +command=/usr/bin/timebasedconfigmgrd +priority=27 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +{% if ENABLE_ASAN == "y" %} +environment=ASAN_OPTIONS="log_path=/var/log/asan/timebasedconfigmgrd-asan.log{{ asan_extra_options }}" +{% endif %} + + [program:cron] command=/usr/sbin/cron -f -L 15 priority=27 From 4214e227a74fac3265926a1c7eaddc72c40912cf Mon Sep 17 00:00:00 2001 From: mazora Date: Tue, 16 Apr 2024 13:34:56 +0300 Subject: [PATCH 03/10] Updated Name from timebasedconfigmgrd to scheduledconfigmgrd --- dockers/docker-orchagent/Dockerfile.j2 | 2 +- .../docker-orchagent/critical_processes.j2 | 3 ++- dockers/docker-orchagent/supervisord.conf.j2 | 21 ++++++++++++++++--- platform/vs/docker-sonic-vs/start.sh | 2 +- .../vs/docker-sonic-vs/supervisord.conf.j2 | 6 +++--- 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2 index 563a943415d..48d5848619e 100755 --- a/dockers/docker-orchagent/Dockerfile.j2 +++ b/dockers/docker-orchagent/Dockerfile.j2 @@ -23,7 +23,7 @@ RUN apt-get update && \ # Needed for installing netifaces Python package build-essential \ python3-dev \ - # Used for schedulermgrd + # Used for scheduledconfigmgrd cron {% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %} diff --git a/dockers/docker-orchagent/critical_processes.j2 b/dockers/docker-orchagent/critical_processes.j2 index e2caa51660d..bc79f4d5790 100644 --- a/dockers/docker-orchagent/critical_processes.j2 +++ b/dockers/docker-orchagent/critical_processes.j2 @@ -19,6 +19,7 @@ program:nbrmgrd program:vxlanmgrd program:coppmgrd program:tunnelmgrd -program:schedulermgrd +program:timerangemgrd +program:scheduledconfigmgrd program:cron {%- endif %} diff --git a/dockers/docker-orchagent/supervisord.conf.j2 b/dockers/docker-orchagent/supervisord.conf.j2 index 826056c83b2..34b2dbca1ce 100644 --- a/dockers/docker-orchagent/supervisord.conf.j2 +++ b/dockers/docker-orchagent/supervisord.conf.j2 @@ -342,8 +342,8 @@ environment=ASAN_OPTIONS="log_path=/var/log/asan/fdbsyncd-asan.log{{ asan_extra_ {%- endif %} {% if is_fabric_asic == 0 %} -[program:schedulermgrd] -command=/usr/bin/schedulermgrd +[program:timerangemgrd] +command=/usr/bin/timerangemgrd priority=18 autostart=false autorestart=false @@ -352,7 +352,22 @@ stderr_logfile=syslog dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} -environment=ASAN_OPTIONS="log_path=/var/log/asan/schedulermgrd-asan.log{{ asan_extra_options }}" +environment=ASAN_OPTIONS="log_path=/var/log/asan/timerangemgrd-asan.log{{ asan_extra_options }}" +{% endif %} +{%- endif %} + +{% if is_fabric_asic == 0 %} +[program:scheduledconfigmgrd] +command=/usr/bin/scheduledconfigmgrd +priority=18 +autostart=false +autorestart=false +stdout_logfile=syslog +stderr_logfile=syslog +dependent_startup=true +dependent_startup_wait_for=swssconfig:exited +{% if ENABLE_ASAN == "y" %} +environment=ASAN_OPTIONS="log_path=/var/log/asan/scheduledconfigmgrd-asan.log{{ asan_extra_options }}" {% endif %} {%- endif %} diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index d918209cb9e..a202df434d6 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -182,7 +182,7 @@ supervisorctl start fabricmgrd supervisorctl start timerangemgrd -supervisorctl start timebasedconfigmgrd +supervisorctl start scheduledconfigmgrd supervisorctl start cron diff --git a/platform/vs/docker-sonic-vs/supervisord.conf.j2 b/platform/vs/docker-sonic-vs/supervisord.conf.j2 index 6dd23ef3dd1..301cd58b7f3 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf.j2 +++ b/platform/vs/docker-sonic-vs/supervisord.conf.j2 @@ -417,15 +417,15 @@ stderr_logfile=syslog environment=ASAN_OPTIONS="log_path=/var/log/asan/timerangemgrd-asan.log{{ asan_extra_options }}" {% endif %} -[program:timebasedconfigmgrd] -command=/usr/bin/timebasedconfigmgrd +[program:scheduledconfigmgrd] +command=/usr/bin/scheduledconfigmgrd priority=27 autostart=false autorestart=false stdout_logfile=syslog stderr_logfile=syslog {% if ENABLE_ASAN == "y" %} -environment=ASAN_OPTIONS="log_path=/var/log/asan/timebasedconfigmgrd-asan.log{{ asan_extra_options }}" +environment=ASAN_OPTIONS="log_path=/var/log/asan/scheduledconfigmgrd-asan.log{{ asan_extra_options }}" {% endif %} From 4c551e0aa6ca7f95758e3c75400004b69e411286 Mon Sep 17 00:00:00 2001 From: mazora Date: Tue, 30 Apr 2024 10:57:53 +0300 Subject: [PATCH 04/10] Marvell Rule Changes --- .gitignore | 6 ++++++ rules/config | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 855e940c689..97cc4736424 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,9 @@ sources.list.* # Generated mirror configs apt-retries-count + +# Python venv +venv/** + +src/protobuf/** +fsroot-vs/** \ No newline at end of file diff --git a/rules/config b/rules/config index 0ab40596ad3..1c55c051449 100644 --- a/rules/config +++ b/rules/config @@ -10,7 +10,7 @@ # SONIC_CONFIG_BUILD_JOBS - set number of jobs for parallel build. # Corresponding -j argument will be passed to make command inside docker # container. -SONIC_CONFIG_BUILD_JOBS = 1 +SONIC_CONFIG_BUILD_JOBS = 12 # SONIC_CONFIG_MAKE_JOBS - set number of parallel make jobs per package. # Corresponding -j argument will be passed to make/dpkg commands that build separate packages @@ -49,7 +49,7 @@ SMARTSWITCH ?= 0 DEFAULT_USERNAME = admin # DEFAULT_PASSWORD - default password for installer build -DEFAULT_PASSWORD = YourPaSsWoRd +DEFAULT_PASSWORD = Marv12\#$ # ENABLE_ZTP - installs Zero Touch Provisioning support. # ENABLE_ZTP = y @@ -153,7 +153,7 @@ INCLUDE_RESTAPI ?= n INCLUDE_NAT = y # INCLUDE_DHCP_RELAY - build and install dhcp-relay package -INCLUDE_DHCP_RELAY = y +INCLUDE_DHCP_RELAY = n # INCLUDE_DHCP_SERVER - build and install dhcp-server package INCLUDE_DHCP_SERVER ?= n From d095f03045ab88b78910befccff2d39d0d9c1ad0 Mon Sep 17 00:00:00 2001 From: mazora Date: Thu, 16 May 2024 15:10:10 +0300 Subject: [PATCH 05/10] Added Yang Models Added yang models for: - scheduledConfigurations - timeRange --- .../sonic-scheduled-configurations.yang | 44 ++++++++++++++++ .../yang-models/sonic-timerange.yang | 52 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang create mode 100644 src/sonic-yang-models/yang-models/sonic-timerange.yang diff --git a/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang b/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang new file mode 100644 index 00000000000..3f323a48650 --- /dev/null +++ b/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang @@ -0,0 +1,44 @@ +module sonic-scheduled-configurations { + + yang-version 1.1; + + namespace "http://github.com/sonic-net/sonic-scheduled-configurations"; + prefix scheduled-configurations; + + description "SCHEDULED_CONFIGURATIONS YANG Module for SONiC OS Used for Scheduled Configuration"; + + revision 2024-05-09 { + description "First Revision"; + } + + container sonic-scheduled-configurations { + + container SCHEDULED_CONFIGURATIONS { + + description "TIME_RANGE part of config_db.json"; + + list SCHEDULED_CONFIGURATIONS_LIST { + description "List of scheduled configurations, each identified by unique name" + + key "name"; + + leaf time_range { + mandatory true; + type string { + length 1..255; + } + description "time range this configuration is bound to"; + } + + leaf configuration { + type string; + description "configuration to be applied to APPL_DB in JSON format"; + } + } /* end of list SCHEDULED_CONFIGURATIONS_LIST */ + + } /* end of container SCHEDULED_CONFIGURATIONS */ + + } /* end of top level container */ + +} /* end of module sonic-scheduled-configurations */ + diff --git a/src/sonic-yang-models/yang-models/sonic-timerange.yang b/src/sonic-yang-models/yang-models/sonic-timerange.yang new file mode 100644 index 00000000000..df043404bf5 --- /dev/null +++ b/src/sonic-yang-models/yang-models/sonic-timerange.yang @@ -0,0 +1,52 @@ +module sonic-timerange { + + yang-version 1.1; + + namespace "http://github.com/sonic-net/sonic-timerage"; + prefix timerange; + + description "TIME_RANGE YANG Module for SONiC OS Used for Scheduled Configuration"; + + revision 2024-05-09 { + description "First Revision"; + } + + container sonic-timerange { + + container TIME_RANGE { + + description "TIME_RANGE part of config_db.json"; + + list TIME_RANGE_LIST { + description "List of time ranges, each identified by unique name" + + key "name"; + + leaf start { + mandatory true; + type string { + length 1..255; + } + description "start time for time range"; + } + + leaf end { + type string { + length 1..255; + } + description "end time for time range"; + } + + leaf runOnce { + type boolean; + default "false"; + description "Indicates whether the time range should trigger only once."; + } + } /* end of list TIME_RANGE_LIST */ + + } /* end of container TIME_RANGE */ + + } /* end of top level container */ + +} /* end of module sonic-timerange */ + From a22d8bba016ec85ed4968815e349ace31f3291c3 Mon Sep 17 00:00:00 2001 From: mazora Date: Wed, 22 May 2024 14:22:08 +0300 Subject: [PATCH 06/10] Fixed Yang Models - Fixed minor syntax errors in timerange and scheduled-configurations yang models --- .../sonic-scheduled-configurations.yang | 14 ++++++++----- .../yang-models/sonic-timerange.yang | 20 +++++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang b/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang index 3f323a48650..28e6744adce 100644 --- a/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang +++ b/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang @@ -18,21 +18,26 @@ module sonic-scheduled-configurations { description "TIME_RANGE part of config_db.json"; list SCHEDULED_CONFIGURATIONS_LIST { - description "List of scheduled configurations, each identified by unique name" + description "List of scheduled configurations, each identified by unique name"; key "name"; + leaf name { + type string; + description "Unique name for the scheduled configuration"; + } + leaf time_range { mandatory true; type string { - length 1..255; + length "1..255"; } - description "time range this configuration is bound to"; + description "Time range this configuration is bound to"; } leaf configuration { type string; - description "configuration to be applied to APPL_DB in JSON format"; + description "Configuration to be applied to APPL_DB in JSON format"; } } /* end of list SCHEDULED_CONFIGURATIONS_LIST */ @@ -41,4 +46,3 @@ module sonic-scheduled-configurations { } /* end of top level container */ } /* end of module sonic-scheduled-configurations */ - diff --git a/src/sonic-yang-models/yang-models/sonic-timerange.yang b/src/sonic-yang-models/yang-models/sonic-timerange.yang index df043404bf5..7cbb6d2152d 100644 --- a/src/sonic-yang-models/yang-models/sonic-timerange.yang +++ b/src/sonic-yang-models/yang-models/sonic-timerange.yang @@ -2,7 +2,7 @@ module sonic-timerange { yang-version 1.1; - namespace "http://github.com/sonic-net/sonic-timerage"; + namespace "http://github.com/sonic-net/sonic-timerange"; prefix timerange; description "TIME_RANGE YANG Module for SONiC OS Used for Scheduled Configuration"; @@ -18,29 +18,34 @@ module sonic-timerange { description "TIME_RANGE part of config_db.json"; list TIME_RANGE_LIST { - description "List of time ranges, each identified by unique name" + description "List of time ranges, each identified by unique name"; key "name"; + leaf name { + type string; + description "Unique name for the time range"; + } + leaf start { mandatory true; type string { - length 1..255; + length "1..255"; } - description "start time for time range"; + description "Start time for time range"; } leaf end { type string { - length 1..255; + length "1..255"; } - description "end time for time range"; + description "End time for time range"; } leaf runOnce { type boolean; default "false"; - description "Indicates whether the time range should trigger only once."; + description "Indicates whether the time range should trigger only once."; } } /* end of list TIME_RANGE_LIST */ @@ -49,4 +54,3 @@ module sonic-timerange { } /* end of top level container */ } /* end of module sonic-timerange */ - From e044e367ff17ab7ce12924b3b86c398029ee9dde Mon Sep 17 00:00:00 2001 From: mazora Date: Sun, 30 Jun 2024 17:28:39 +0300 Subject: [PATCH 07/10] Replace runOnce option with start_year and end_year in yang --- .../yang-models/sonic-timerange.yang | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/sonic-yang-models/yang-models/sonic-timerange.yang b/src/sonic-yang-models/yang-models/sonic-timerange.yang index 7cbb6d2152d..b71139c14d8 100644 --- a/src/sonic-yang-models/yang-models/sonic-timerange.yang +++ b/src/sonic-yang-models/yang-models/sonic-timerange.yang @@ -36,16 +36,21 @@ module sonic-timerange { } leaf end { + mandatory true; type string { length "1..255"; } description "End time for time range"; } - leaf runOnce { - type boolean; - default "false"; - description "Indicates whether the time range should trigger only once."; + leaf start_year { + type integer; + description "Indicates what year this time range will begin running"; + } + + leaf end_year { + type integer; + description "Indicates what year this time range will end"; } } /* end of list TIME_RANGE_LIST */ From 4d9de4a602a5bf5de68493e0dfb84fe5d7c62f85 Mon Sep 17 00:00:00 2001 From: mazora Date: Mon, 2 Sep 2024 15:55:24 +0300 Subject: [PATCH 08/10] Update sonic-scheduled-configurations.yang - Include deactivation_configuration --- .../yang-models/sonic-scheduled-configurations.yang | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang b/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang index 28e6744adce..f17a2959617 100644 --- a/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang +++ b/src/sonic-yang-models/yang-models/sonic-scheduled-configurations.yang @@ -36,8 +36,16 @@ module sonic-scheduled-configurations { } leaf configuration { + mandatory true; + type string; + description "Configuration to be applied to CONFIG_DB in JSON format"; + } + + leaf deactivation_configuration { + mandatory true; type string; - description "Configuration to be applied to APPL_DB in JSON format"; + description "A configuration to be applied at deactivation, or the string 'remove' to simply remove the configuration at deactivation"; + } } /* end of list SCHEDULED_CONFIGURATIONS_LIST */ @@ -45,4 +53,4 @@ module sonic-scheduled-configurations { } /* end of top level container */ -} /* end of module sonic-scheduled-configurations */ +} /* end of module sonic-scheduled-configurations */ \ No newline at end of file From 67eaff9e574cba5785317756509fc92ffc7110f4 Mon Sep 17 00:00:00 2001 From: mazora Date: Wed, 4 Dec 2024 18:15:27 +0200 Subject: [PATCH 09/10] fix sonic-timerange.yang error --- src/sonic-yang-models/yang-models/sonic-timerange.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-yang-models/yang-models/sonic-timerange.yang b/src/sonic-yang-models/yang-models/sonic-timerange.yang index b71139c14d8..6cb9be61239 100644 --- a/src/sonic-yang-models/yang-models/sonic-timerange.yang +++ b/src/sonic-yang-models/yang-models/sonic-timerange.yang @@ -44,12 +44,12 @@ module sonic-timerange { } leaf start_year { - type integer; + type uint16; description "Indicates what year this time range will begin running"; } leaf end_year { - type integer; + type uint16; description "Indicates what year this time range will end"; } } /* end of list TIME_RANGE_LIST */ From ed3f8ab587f4e4862801559f5eb1f8449854fd25 Mon Sep 17 00:00:00 2001 From: Amir Mazor Date: Tue, 31 Dec 2024 12:52:10 +0200 Subject: [PATCH 10/10] add DYNAMIC_DB --- dockers/docker-database/database_config.json.j2 | 8 +++++++- platform/vs/docker-sonic-vs/database_config.json | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dockers/docker-database/database_config.json.j2 b/dockers/docker-database/database_config.json.j2 index b97589d3733..a79e1a8dc70 100644 --- a/dockers/docker-database/database_config.json.j2 +++ b/dockers/docker-database/database_config.json.j2 @@ -115,7 +115,13 @@ "id" : 14, "separator": ":", "instance" : "redis" - } + }, + "DYNAMIC_DB" : { + "id" : 21, + "separator": "|", + "instance" : "redis" + } + {% if DATABASE_TYPE is defined and DATABASE_TYPE == "dpudb" %} , "DPU_APPL_DB" : { diff --git a/platform/vs/docker-sonic-vs/database_config.json b/platform/vs/docker-sonic-vs/database_config.json index 04cb3d3aaae..275699d1cd2 100644 --- a/platform/vs/docker-sonic-vs/database_config.json +++ b/platform/vs/docker-sonic-vs/database_config.json @@ -77,7 +77,12 @@ "id" : 14, "separator": ":", "instance" : "redis" - } + }, + "DYNAMIC_DB" : { + "id" : 21, + "separator": "|", + "instance" : "redis" + } }, "VERSION" : "1.0" }