From 4ca2a11af79c4adc905637f68fad627a9e754173 Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Thu, 21 Dec 2023 20:46:42 +0000
Subject: [PATCH] [YANG] update sonic DB version string format
Old format: version_a_b_c
New format: version_<branch>_<nn>
sonic-utilities:
* 20d1495b 2023-12-21 | [db_migrator] add db migrator version space for 202305/202311 branch (#3081) (HEAD -> master, github/master) [Ying Xie]
* a68d3d3a 2023-12-20 | Collect module EEPROM data in dump (#3009) [Junchao-Mellanox]
* e7a8def6 2023-12-19 | Enhanced route_check.py for multi_asic platforms (#3077) [Deepak Singhal]
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
src/sonic-utilities | 2 +-
src/sonic-yang-models/yang-models/sonic-versions.yang | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 19ea84933885..20d1495b6f7e 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 19ea8493388536921ad204833157dac2cd2bf3ba
+Subproject commit 20d1495b6f7e82c4d9aa377c3c281d8d0d9d8594
diff --git a/src/sonic-yang-models/yang-models/sonic-versions.yang b/src/sonic-yang-models/yang-models/sonic-versions.yang
index ad9b95f94180..9c405e4def29 100644
--- a/src/sonic-yang-models/yang-models/sonic-versions.yang
+++ b/src/sonic-yang-models/yang-models/sonic-versions.yang
@@ -23,7 +23,7 @@ module sonic-versions {
leaf VERSION {
type string {
length 1..255;
- pattern 'version_([1-9]|[1-9]{1}[0-9]{1})_([0-9]{1,2})_([0-9]{1,2})';
+ pattern 'version_(([1-9]|[1-9]{1}[0-9]{1})_([0-9]{1,2})_([0-9]{1,2})|([1-9]{1}[0-9]{5})_([0-9]{2}))';
}
}
}