Fixed UT bugs and YANG model bugs revealed by UTs

assrinivasan · assrinivasan · commit fc440006cf79 · 2024-05-09T04:07:04.000Z
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/stormond.json b/src/sonic-yang-models/tests/yang_model_tests/tests/stormond.json
@@ -12,10 +12,10 @@
     },
     "STORMOND_POLLING_INTVL_BAD_LEN_MAX": {
         "desc": "Configure an invalid daemon polling interval: out of range value",
-        "eStrKey" : "Pattern"
+        "eStrKey" : "InvalidValue"
     },
     "STORMOND_SYNC_INTVL_BAD_LEN_MAX": {
         "desc": "Configure an invalid fsstats file sync interval: out of range value",
-        "eStrKey" : "Pattern"
+        "eStrKey" : "InvalidValue"
     }
 }
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/stormond.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/stormond.json
@@ -14,7 +14,7 @@
         "sonic-stormond-config:sonic-stormond-config": {
             "sonic-stormond-config:STORMOND_CONFIG": {
                 "INTERVALS":{
-                    "daemon_polling_interval" : "",
+                    "daemon_polling_interval" : "-1",
                     "fsstats_sync_interval"   : "86400"
 
                 }
@@ -26,7 +26,7 @@
             "sonic-stormond-config:STORMOND_CONFIG": {
                 "INTERVALS":{
                     "daemon_polling_interval" : "3600",
-                    "fsstats_sync_interval"   : ""
+                    "fsstats_sync_interval"   : "five_thousand_two_hundred_seconds"
 
                 }
             }
diff --git a/src/sonic-yang-models/yang-models/sonic-stormond-config.yang b/src/sonic-yang-models/yang-models/sonic-stormond-config.yang
@@ -22,14 +22,14 @@ module sonic-stormond-config{
                 leaf daemon_polling_interval {
                     description "Polling inerval for Storage Monitoring Daemon in STORMOND_CONFIG table";
                     type string {
-                        length 1..32;
+                        length 1..86400;
                     }
                 }
 
                 leaf fsstats_sync_interval {
                     description "FSSTATS JSON file syncing interval for the Storage Monitoring Daemon in STORMOND_CONFIG table";
                     type string {
-                        length 1..32;
+                        length 1..604800;
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,10 @@`
`12`	`12`	`},`
`13`	`13`	`"STORMOND_POLLING_INTVL_BAD_LEN_MAX": {`
`14`	`14`	`"desc": "Configure an invalid daemon polling interval: out of range value",`
`15`		`- "eStrKey" : "Pattern"`
	`15`	`+ "eStrKey" : "InvalidValue"`
`16`	`16`	`},`
`17`	`17`	`"STORMOND_SYNC_INTVL_BAD_LEN_MAX": {`
`18`	`18`	`"desc": "Configure an invalid fsstats file sync interval: out of range value",`
`19`		`- "eStrKey" : "Pattern"`
	`19`	`+ "eStrKey" : "InvalidValue"`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"sonic-stormond-config:sonic-stormond-config": {`
`15`	`15`	`"sonic-stormond-config:STORMOND_CONFIG": {`
`16`	`16`	`"INTERVALS":{`
`17`		`- "daemon_polling_interval" : "",`
	`17`	`+ "daemon_polling_interval" : "-1",`
`18`	`18`	`"fsstats_sync_interval" : "86400"`
`19`	`19`
`20`	`20`	`}`
`@@ -26,7 +26,7 @@`
`26`	`26`	`"sonic-stormond-config:STORMOND_CONFIG": {`
`27`	`27`	`"INTERVALS":{`
`28`	`28`	`"daemon_polling_interval" : "3600",`
`29`		`- "fsstats_sync_interval" : ""`
	`29`	`+ "fsstats_sync_interval" : "five_thousand_two_hundred_seconds"`
`30`	`30`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@ module sonic-stormond-config{`
`22`	`22`	`leaf daemon_polling_interval {`
`23`	`23`	`description "Polling inerval for Storage Monitoring Daemon in STORMOND_CONFIG table";`
`24`	`24`	`type string {`
`25`		`- length 1..32;`
	`25`	`+ length 1..86400;`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`leaf fsstats_sync_interval {`
`30`	`30`	`description "FSSTATS JSON file syncing interval for the Storage Monitoring Daemon in STORMOND_CONFIG table";`
`31`	`31`	`type string {`
`32`		`- length 1..32;`
	`32`	`+ length 1..604800;`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`}`