Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CoPP] Add always_enabled field to copp_cfg.j2 and yang model #19

Closed
wants to merge 3 commits into from
Closed

[CoPP] Add always_enabled field to copp_cfg.j2 and yang model #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa3d518
[CoPP] Add always_enabled field
noaOrMlnx Nov 8, 2021
f43b6e2
Remove the mandatory field from always_enabled
noaOrMlnx Nov 9, 2021
0aa61ce
Fix CR comments
noaOrMlnx Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions files/image_config/copp/copp_cfg.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"trap_priority":"4",
"queue": "4"
},
"queue4_group2": {
"queue4_group2": {
"trap_action":"copy",
"trap_priority":"4",
"queue": "4",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
18 changes: 12 additions & 6 deletions src/sonic-yang-models/yang-models/sonic-copp.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -59,7 +59,7 @@ module sonic-copp {
}
description "Policer mode";
}

leaf color {
type enumeration {
enum blind;
Expand All @@ -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.";
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -163,6 +163,12 @@ module sonic-copp {
}
description "reference to CoPP group";
}

leaf always_enabled {
mandatory false;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need to explicitly state mandatory false here. Please remove.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

type string;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a type defined for true or false called boolean. Can you please set it https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/yang-models/sonic-bgp-global.yang#L101

description "a field that indicates whether the trap should be always installed"
}
}
/* end of list COPP_TRAP_LIST */
}
Expand Down