[CoPP] Add always_enabled field (#9302)

noaOrMlnx · web-flow · commit 0908f9ec4973 · 2021-11-30T11:04:15.000-08:00
*Add the "always_enabled" field to copp_cfg.j2 file, in order to allow traps without an entry in features table, to be installed automatically.
diff --git a/files/image_config/copp/copp_cfg.j2 b/files/image_config/copp/copp_cfg.j2
@@ -13,7 +13,7 @@
 		    "trap_priority":"4",
 		    "queue": "4"
 	    },
-	    "queue4_group2": {            
+	    "queue4_group2": {
 		    "trap_action":"copy",
 		    "trap_priority":"4",
 		    "queue": "4",
@@ -69,11 +69,13 @@
 	    },
 	    "lacp": {
 		    "trap_ids": "lacp",
-		    "trap_group": "queue4_group1"
+		    "trap_group": "queue4_group1",
+		    "always_enabled": "true"
 	    },
 	    "arp": {
 		    "trap_ids": "arp_req,arp_resp,neigh_discovery",
-		    "trap_group": "queue4_group2"
+		    "trap_group": "queue4_group2",
+		    "always_enabled": "true"
 	    },
 	    "lldp": {
 		    "trap_ids": "lldp",
@@ -85,11 +87,13 @@
 	    },
 	    "udld": {
 		    "trap_ids": "udld",
-		    "trap_group": "queue4_group3"
+		    "trap_group": "queue4_group3",
+		    "always_enabled": "true"
 	    },
 	    "ip2me": {
 		    "trap_ids": "ip2me",
-		    "trap_group": "queue1_group1"
+		    "trap_group": "queue1_group1",
+		    "always_enabled": "true"
 	    },
 	    "macsec": {
 		    "trap_ids": "eapol",
diff --git a/platform/vs/docker-sonic-vs/init_cfg.json.j2 b/platform/vs/docker-sonic-vs/init_cfg.json.j2
@@ -5,7 +5,7 @@
             "buffer_model": "traditional"
         }
     },
-{% set features = ["swss", "bgp", "teamd", "nat", "database"] %}
+{% set features = ["swss", "bgp", "teamd", "nat", "database", "lldp", "dhcp_relay", "macsec"] %}
     "FEATURE": {
 {% for feature in features %}
         "{{ feature }}": {
diff --git a/src/sonic-yang-models/yang-models/sonic-copp.yang b/src/sonic-yang-models/yang-models/sonic-copp.yang
@@ -43,13 +43,13 @@ module sonic-copp {
 					type stypes:copp_packet_action;
 					description "Trap action";
 				}
-				
+
 				leaf meter_type {
 					mandatory true;
 					type stypes:meter_type;
 					description "Policer meter type";
 				}
-				
+
 				leaf mode {
 					mandatory true;
 					type enumeration {
@@ -59,7 +59,7 @@ module sonic-copp {
 					}
 					description "Policer mode";
 				}
-				
+
 				leaf color {
 					type enumeration {
 						enum blind;
@@ -74,7 +74,7 @@ module sonic-copp {
 					default 0;
 					description
 						"Committed information rate for the dual-rate token
-						bucket policer.  This value represents the rate at which 
+						bucket policer.  This value represents the rate at which
 						tokens are added to the primary bucket.";
 				}
 
@@ -118,13 +118,13 @@ module sonic-copp {
 						"Excess burst size for the dual-rate token bucket policer.
 						This value represents the depth of the secondary bucket.";
 				}
-				
+
 				leaf green_action {
 					type stypes:copp_packet_action;
 					default "forward";
 					description "Green action";
 				}
-				
+
 				leaf yellow_action {
 					when "((current()/../mode = 'sr_tcm') or (current()/../mode = 'tr_tcm'))";
 					type stypes:copp_packet_action;
@@ -163,6 +163,11 @@ module sonic-copp {
 					}
 					description "reference to CoPP group";
 				}
+
+				leaf always_enabled {
+					type boolean;
+					description "field that indicates whether the trap should be always installed";
+				}
 			}
 			/* end of list COPP_TRAP_LIST */
 		}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"buffer_model": "traditional"`
`6`	`6`	`}`
`7`	`7`	`},`
`8`		`-{% set features = ["swss", "bgp", "teamd", "nat", "database"] %}`
	`8`	`+{% set features = ["swss", "bgp", "teamd", "nat", "database", "lldp", "dhcp_relay", "macsec"] %}`
`9`	`9`	`"FEATURE": {`
`10`	`10`	`{% for feature in features %}`
`11`	`11`	`"{{ feature }}": {`
Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,13 @@ module sonic-copp {`
`43`	`43`	`type stypes:copp_packet_action;`
`44`	`44`	`description "Trap action";`
`45`	`45`	`}`
`46`		`-`
	`46`	`+`
`47`	`47`	`leaf meter_type {`
`48`	`48`	`mandatory true;`
`49`	`49`	`type stypes:meter_type;`
`50`	`50`	`description "Policer meter type";`
`51`	`51`	`}`
`52`		`-`
	`52`	`+`
`53`	`53`	`leaf mode {`
`54`	`54`	`mandatory true;`
`55`	`55`	`type enumeration {`
`@@ -59,7 +59,7 @@ module sonic-copp {`
`59`	`59`	`}`
`60`	`60`	`description "Policer mode";`
`61`	`61`	`}`
`62`		`-`
	`62`	`+`
`63`	`63`	`leaf color {`
`64`	`64`	`type enumeration {`
`65`	`65`	`enum blind;`
`@@ -74,7 +74,7 @@ module sonic-copp {`
`74`	`74`	`default 0;`
`75`	`75`	`description`
`76`	`76`	`"Committed information rate for the dual-rate token`
`77`		`- bucket policer. This value represents the rate at which`
	`77`	`+ bucket policer. This value represents the rate at which`
`78`	`78`	`tokens are added to the primary bucket.";`
`79`	`79`	`}`
`80`	`80`
`@@ -118,13 +118,13 @@ module sonic-copp {`
`118`	`118`	`"Excess burst size for the dual-rate token bucket policer.`
`119`	`119`	`This value represents the depth of the secondary bucket.";`
`120`	`120`	`}`
`121`		`-`
	`121`	`+`
`122`	`122`	`leaf green_action {`
`123`	`123`	`type stypes:copp_packet_action;`
`124`	`124`	`default "forward";`
`125`	`125`	`description "Green action";`
`126`	`126`	`}`
`127`		`-`
	`127`	`+`
`128`	`128`	`leaf yellow_action {`
`129`	`129`	`when "((current()/../mode = 'sr_tcm') or (current()/../mode = 'tr_tcm'))";`
`130`	`130`	`type stypes:copp_packet_action;`
`@@ -163,6 +163,11 @@ module sonic-copp {`
`163`	`163`	`}`
`164`	`164`	`description "reference to CoPP group";`
`165`	`165`	`}`
	`166`	`+`
	`167`	`+ leaf always_enabled {`
	`168`	`+ type boolean;`
	`169`	`+ description "field that indicates whether the trap should be always installed";`
	`170`	`+ }`
`166`	`171`	`}`
`167`	`172`	`/* end of list COPP_TRAP_LIST */`
`168`	`173`	`}`