Skip to content

Add YANG model and unit tests for additional structured events #12554

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

Merged
zbud-msft merged 13 commits into from
Nov 7, 2022
Merged

Add YANG model and unit tests for additional structured events #12554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9f4df42
Add host events
zbud-msft Oct 28, 2022
f29be29
Add YANG event def
zbud-msft Oct 30, 2022
801aa8c
Add tests
zbud-msft Oct 31, 2022
fe147fd
Add UT for new YANG models
zbud-msft Oct 31, 2022
def27aa
Delete extra line
zbud-msft Oct 31, 2022
454d22d
Fix LGTM warning
zbud-msft Oct 31, 2022
1113bd6
Fix YANG model and UT errors
zbud-msft Oct 31, 2022
8100083
Move publish code into new PR
zbud-msft Nov 1, 2022
68729be
Remove unused YANG model
zbud-msft Nov 1, 2022
4c07917
Add changes from peer review
zbud-msft Nov 1, 2022
4a45f1d
Change eStr in tests
zbud-msft Nov 1, 2022
7ca946d
Fix tests
zbud-msft Nov 1, 2022
62317d6
Merge branch 'master' into AddMoreEvents
zbud-msft Nov 2, 2022
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
15 changes: 15 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-dhcp-relay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,20 @@
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_DISPARITY_VALID": {
"desc": "VALID DHCP_RELAY_DISPARITY EVENT."
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_INCORRECT_VLAN": {
"desc": "DHCP_RELAY_BIND_FAILURE_EVENT_INCORRECT_VLAN failure.",
"eStrKey": "Pattern"
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_INCORRECT_TYPE": {
"desc": "DHCP_RELAY_BIND_FAILURE_EVENT_INCORRECT_TYPE failure.",
"eStrKey": "InvalidValue"
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_INCORRECT_TIMESTAMP": {
"desc": "DHCP_RELAY_BIND_FAILURE_EVENT_INCORRECT_TIMESTAMP failure.",
"eStrKey": "Pattern"
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_VALID": {
"desc": "VALID DHCP_RELAY_BIND_FAILURE EVENT."
}
}
71 changes: 71 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,76 @@
},
"SONIC_EVENTS_HOST_INVALID_FREELIST_VALID": {
"desc": "VALID INVALID_FREELIST EVENT."
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_CTR_NAME": {
"desc": "MEM_THRESHOLD_EXCEEDED_EVENT_INCORRECT_CTR_NAME failure.",
"eStr": "Invalid ctr_name."
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_CTR_NAME_LENGTH": {
"desc": "MEM_THRESHOLD_EXCEEDED_EVENT_INCORRECT_CTR_NAME_LENGTH failure.",
"eStr": "Invalid length for ctr_name."
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_MEM_USAGE": {
"desc": "MEM_THRESHOLD_EXCEEDED_EVENT_INCORRECT_MEM_USAGE failure.",
"eStrKey": "InvalidValue",
"eStr": ["mem_usage"]
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_THRESHOLD": {
"desc": "MEM_THRESHOLD_EXCEEDED_EVENT_INCORRECT_THRESHOLD failure.",
"eStrKey": "InvalidValue",
"eStr": ["threshold"]
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_TIMESTAMP": {
"desc": "MEM_THRESHOLD_EXCEEDED_EVENT_INCORRECT_TIMESTAMP failure.",
"eStrKey": "Pattern"
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_VALID": {
"desc": "VALID MEM_THRESHOLD_EXCEEDED EVENT."
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_CTR_NAME": {
"desc": "PROCESS_EXITED_UNEXPECTEDLY_EVENT_INCORRECT_CTR_NAME failure.",
"eStr": "Invalid ctr_name."
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_CTR_NAME_LENGTH": {
"desc": "PROCESS_EXITED_UNEXPECTEDLY_EVENT_INCORRECT_CTR_NAME_LENGTH failure.",
"eStr": "Invalid length for ctr_name."
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_PROCESS_NAME": {
"desc": "PROCESS_EXITED_UNEXPECTEDLY_EVENT_INCORRECT_PROCESS_NAME failure.",
"eStr": "Invalid process_name."
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_PROCESS_NAME_LENGTH": {
"desc": "PROCESS_EXITED_UNEXPECTEDLY_EVENT_INCORRECT_PROCESS_NAME_LENGTH failure.",
"eStr": "Invalid length for process_name."
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_TIMESTAMP": {
"desc": "PROCESS_EXITED_UNEXPECTEDLY_EVENT_INCORRECT_TIMESTAMP failure.",
"eStrKey": "Pattern"
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_VALID": {
"desc": "VALID_PROCESS_EXITED_UNEXPECTEDLY EVENT."
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_CTR_NAME": {
"desc": "PROCESS_NOT_RUNNING_EVENT_INCORRECT_CTR_NAME failure.",
"eStr": "Invalid ctr_name."
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_CTR_NAME_LENGTH": {
"desc": "PROCESS_NOT_RUNNING_EVENT_INCORRECT_CTR_NAME_LENGTH failure.",
"eStr": "Invalid length for ctr_name."
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_PROCESS_NAME": {
"desc": "PROCESS_NOT_RUNNING_EVENT_INCORRECT_PROCESS_NAME failure.",
"eStr": "Invalid process_name."
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_PROCESS_NAME_LENGTH": {
"desc": "PROCESS_NOT_RUNNING_EVENT_INCORRECT_PROCESS_NAME_LENGTH failure.",
"eStr": "Invalid length for process_name."
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_TIMESTAMP": {
"desc": "PROCESS_NOT_RUNNING_EVENT_INCORRECT_TIMESTAMP failure.",
"eStrKey": "Pattern"
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_VALID": {
"desc": "VALID_PROCESS_NOT_RUNNING EVENT."
}
}
23 changes: 23 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/sonic-events-swss.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,28 @@
},
"SONIC_EVENTS_SWSS_CHK_CRM_THRESHOLD_VALID": {
"desc": "VALID CHK_CRM_THRESHOLD EVENT."
},
"SONIC_EVENTS_SWSS_SELECT_OPERATION_FAILURE_INCORRECT_OPERATION_RESULT": {
"desc": "SELECT_OPERATION_FAILURE_EVENT_INCORRECT_OPERATION_RESULT failure.",
"eStr": "Invalid select operation failure operation_result."
},
"SONIC_EVENTS_SWSS_SELECT_OPERATION_FAILURE_INCORRECT_OPERATION_RESULT_LENGTH": {
"desc": "SELECT_OPERATION_FAILURE_EVENT_INCORRECT_OPERATION_RESULT_LENGTH failure.",
"eStr": "Invalid length for select operation failure operation_result."
},
"SONIC_EVENTS_SWSS_SELECT_OPERATION_FAILURE_INCORRECT_COMMAND": {
"desc": "SELECT_OPERATION_FAILURE_EVENT_INCORRECT_COMMAND failure.",
"eStr": "Invalid select operation failure command."
},
"SONIC_EVENTS_SWSS_SELECT_OPERATION_FAILURE_INCORRECT_COMMAND_LENGTH": {
"desc": "SELECT_OPERATION_FAILURE_EVENT_INCORRECT_COMMAND_LENGTH failure.",
"eStr": "Invalid length for select operation failure command."
},
"SONIC_EVENTS_SWSS_SELECT_OPERATION_FAILURE_INCORRECT_TIMESTAMP": {
"desc": "SELECT_OPERATION_FAILURE_EVENT_INCORRECT_TIMESTAMP failure.",
"eStrKey": "Pattern"
},
"SONIC_EVENTS_SWSS_SELECT_OPERATION_FAILURE_VALID": {
"desc": "VALID SELECT_OPERATION_FAILURE EVENT."
}
}
36 changes: 36 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-dhcp-relay.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,41 @@
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_INCORRECT_VLAN": {
"sonic-events-dhcp-relay:sonic-events-dhcp-relay": {
"sonic-events-dhcp-relay:dhcp-relay-bind-failure": {
"vlan": "INCORRECT_VLAN",
"type": "local",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_INCORRECT_TYPE": {
"sonic-events-dhcp-relay:sonic-events-dhcp-relay": {
"sonic-events-dhcp-relay:dhcp-relay-bind-failure": {
"vlan": "Vlan100",
"type": "INCORRECT_TYPE",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_INCORRECT_TIMESTAMP": {
"sonic-events-dhcp-relay:sonic-events-dhcp-relay": {
"sonic-events-dhcp-relay:dhcp-relay-bind-failure": {
"vlan": "Vlan100",
"type": "global",
"timestamp": "INCORRECT_TIMESTAMP"
}
}
},
"SONIC_EVENTS_DHCP_RELAY_DHCP_RELAY_BIND_FAILURE_VALID": {
"sonic-events-dhcp-relay:sonic-events-dhcp-relay": {
"sonic-events-dhcp-relay:dhcp-relay-bind-failure": {
"vlan": "Vlan100",
"type": "local",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
}
}
168 changes: 168 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/sonic-events-host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,5 +258,173 @@
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_CTR_NAME": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:mem-threshold-exceeded": {
"ctr_name": "Invalid$",
"mem_usage": 123456,
"threshold": 123456,
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_CTR_NAME_LENGTH": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:mem-threshold-exceeded": {
"ctr_name": "invalid-length-for-ctr-name-too-long",
"mem_usage": 123456,
"threshold": 123456,
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_MEM_USAGE": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:mem-threshold-exceeded": {
"ctr_name": "container_name",
"mem_usage": "INCORRECT_MEM_USAGE",
"threshold": 123456,
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_THRESHOLD": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:mem-threshold-exceeded": {
"ctr_name": "container_name",
"mem_usage": 123456,
"threshold": "INCORRECT_THRESHOLD",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_INCORRECT_TIMESTAMP": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:mem-threshold-exceeded": {
"ctr_name": "container_name",
"mem_usage": 123456,
"threshold": 123456,
"timestamp": "INCORRECT_TIMESTAMP"
}
}
},
"SONIC_EVENTS_HOST_MEM_THRESHOLD_EXCEEDED_VALID": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:mem-threshold-exceeded": {
"ctr_name": "container_name",
"mem_usage": 123456,
"threshold": 123456,
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_CTR_NAME": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-exited-unexpectedly": {
"ctr_name": "Invalid$",
"process_name": "process_name",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_CTR_NAME_LENGTH": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-exited-unexpectedly": {
"ctr_name": "invalid-length-for-ctr-name-too-long",
"process_name": "process_name",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_PROCESS_NAME": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-exited-unexpectedly": {
"ctr_name": "container_name",
"process_name": "Invalid$",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_PROCESS_NAME_LENGTH": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-exited-unexpectedly": {
"ctr_name": "container_name",
"process_name": "invalid-length-for-process-name-too-long",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_INCORRECT_TIMESTAMP": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-exited-unexpectedly": {
"ctr_name": "container_name",
"process_name": "process_name",
"timestamp": "INCORRECT_TIMESTAMP"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_EXITED_UNEXPECTEDLY_VALID": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-exited-unexpectedly": {
"ctr_name": "container_name",
"process_name": "process_name",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_CTR_NAME": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-not-running": {
"ctr_name": "Invalid$",
"process_name": "process_name",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_CTR_NAME_LENGTH": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-not-running": {
"ctr_name": "invalid-length-for-ctr-name-too-long",
"process_name": "process_name",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_PROCESS_NAME": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-not-running": {
"ctr_name": "container_name",
"process_name": "Invalid$",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_PROCESS_NAME_LENGTH": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-not-running": {
"ctr_name": "container_name",
"process_name": "invalid-length-for-process-name-too-long",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_INCORRECT_TIMESTAMP": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-not-running": {
"ctr_name": "container_name",
"process_name": "process_name",
"timestamp": "INCORRECT_TIMESTAMP"
}
}
},
"SONIC_EVENTS_HOST_PROCESS_NOT_RUNNING_VALID": {
"sonic-events-host:sonic-events-host": {
"sonic-events-host:process-not-running": {
"ctr_name": "container_name",
"process_name": "process_name",
"timestamp": "1985-04-12T23:20:50.52Z"
}
}
}
}
Loading