Expand pattern for dhcp relay discarding interface (#19430)

zbud-msft · mssonicbld · commit 95ee3d9d1d81 · 2024-07-04T10:04:39.000+08:00
Why I did it
Currently yang pattern is restricting interfaces to those that start with Ethernet however interfaces that discard can start with "eth", "Vlan", "PortChannel", and others as well.

How I did it
Update YANG file and UT

How to verify it
sonic-mgmt test and UT
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-dhcp-relay.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-dhcp-relay.json
@@ -2,7 +2,7 @@
     "SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_DISCARD_INCORRECT_IFNAME": {
         "sonic-events-dhcp-relay:sonic-events-dhcp-relay": {
             "sonic-events-dhcp-relay:dhcp-relay-discard": {
-                "ifname": "Eth",
+                "ifname": "@@@!!!",
                 "timestamp": "1985-04-12T23:20:50.52Z"
             }
         }
diff --git a/src/sonic-yang-models/yang-models/sonic-events-dhcp-relay.yang b/src/sonic-yang-models/yang-models/sonic-events-dhcp-relay.yang
@@ -41,7 +41,7 @@ module sonic-events-dhcp-relay {
 
             leaf ifname {
                 type string {
-                    pattern 'Ethernet[0-9]{1,3}';
+                    pattern '[a-zA-Z0-9]+';
                 }
                 description "Name of the i/f discarding";
             }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_DISCARD_INCORRECT_IFNAME": {`
`3`	`3`	`"sonic-events-dhcp-relay:sonic-events-dhcp-relay": {`
`4`	`4`	`"sonic-events-dhcp-relay:dhcp-relay-discard": {`
`5`		`- "ifname": "Eth",`
	`5`	`+ "ifname": "@@@!!!",`
`6`	`6`	`"timestamp": "1985-04-12T23:20:50.52Z"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ module sonic-events-dhcp-relay {`
`41`	`41`
`42`	`42`	`leaf ifname {`
`43`	`43`	`type string {`
`44`		`- pattern 'Ethernet[0-9]{1,3}';`
	`44`	`+ pattern '[a-zA-Z0-9]+';`
`45`	`45`	`}`
`46`	`46`	`description "Name of the i/f discarding";`
`47`	`47`	`}`