Skip to content

Commit

Permalink
fixed PRI numbers and added new rollback case
Browse files Browse the repository at this point in the history
  • Loading branch information
lampwins committed Sep 29, 2017
1 parent d3625ea commit 560090a
Show file tree
Hide file tree
Showing 52 changed files with 158 additions and 109 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This error tag corresponds to syslog messages notifying that the configured
# interface has been dissabled due to a bpdu block
# interface has been disabled due to a bpdu block
messages:
# 'error' should be unique and vendor agnostic. Currently we are using the JUNOS syslog message name as the canonical name.
# This may change if we are able to find a more well defined naming system.
- error: BPDU_BLOCK_INTERFACE_DISSABLED
- error: BPDU_BLOCK_INTERFACE_DISABLED
tag: ESWD_BPDU_BLOCK_ERROR_DISABLED
values:
interface: ([\w\-\/\.\d]+)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,16 @@ messages:
variables: {}
static:
users//user//{user}//action//configuration_rollback: True

- error: CONFIGURATION_ROLLBACK
tag: UI_LOAD_EVENT
values:
user: (\w+)
number: (\d+)
line: "User '{user}' is performing a 'rollback {number}'"
model: NO_MODEL
mapping:
variables:
users//user//{user}//action//configuration_rollback_number: number
static:
users//user//{user}//action//configuration_rollback: True
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Active to Connect (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Active to Connect (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Active to Connect (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Active to Idle (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Active to Idle (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Active to Idle (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Active to OpenSent (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Active to OpenSent (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Active to OpenSent (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to Active (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to Active (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to Active (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to Idle (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to Idle (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to Idle (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to OpenSent (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to OpenSent (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Connect to OpenSent (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Established to Idle (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Established to Idle (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Established to Idle (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Idle to Connect (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from Idle to Connect (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from Idle to Connect (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenConfirm to Established (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenConfirm to Established (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from OpenConfirm to Established (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenConfirm to Idle (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenConfirm to Idle (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from OpenConfirm to Idle (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenSent to Idle (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenSent to Idle (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from OpenSent to Idle (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<149>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenSent to OpenConfirm (event AnEvent) (instance master)
<28>Jun 21 14:03:12 vmx01 rpd[2902]: RPD_BGP_NEIGHBOR_STATE_CHANGED: BGP peer 1.1.1.1 (External AS 2222) changed state from OpenSent to OpenConfirm (event AnEvent) (instance master)
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"processName": "rpd",
"processId": "2902",
"tag": "RPD_BGP_NEIGHBOR_STATE_CHANGED",
"pri": "149",
"pri": "28",
"message": "BGP peer 1.1.1.1 (External AS 2222) changed state from OpenSent to OpenConfirm (event AnEvent) (instance master)",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 4
},
"yang_model": "openconfig-bgp",
"os": "junos",
"facility": 18,
"severity": 5,
"facility": 3,
"severity": 4,
"error": "BGP_NEIGHBOR_STATE_CHANGED",
"host": "vmx01",
"ip": "127.0.0.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<25>Jun 21 14:03:12 vmx01 eswd[2902]: ESWD_BPDU_BLOCK_ERROR_DISABLED: ge-0/0/17.0: bpdu-block disabled port
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
"processName": "eswd",
"processId": "2902",
"tag": "ESWD_BPDU_BLOCK_ERROR_DISABLED",
"pri": "149",
"pri": "25",
"message": "ge-0/0/17.0: bpdu-block disabled port",
"facility": 18,
"severity": 5
"facility": 3,
"severity": 1
},
"yang_model": "openconfig-interface",
"os": "junos",
"facility": 18,
"severity": 5,
"error": "BPDU_BLOCK_INTERFACE_DISSABLED",
"facility": 3,
"severity": 1,
"error": "BPDU_BLOCK_INTERFACE_DISABLED",
"host": "vmx01",
"ip": "127.0.0.1",
"timestamp": 1498053792
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion tests/config/junos/CONFIGURATION_ERROR/default/syslog.msg
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<189>Jul 20 21:44:00 vmx01 mgd[7729]: UI_CONFIGURATION_ERROR: Process: mgd, path: [edit vlans VLANTEST l3-interface], statement: l3-interface vlan.666, Interface must already be defined under [edit interfaces]
<187>Jul 20 21:44:00 vmx01 mgd[7729]: UI_CONFIGURATION_ERROR: Process: mgd, path: [edit vlans VLANTEST l3-interface], statement: l3-interface vlan.666, Interface must already be defined under [edit interfaces]
6 changes: 3 additions & 3 deletions tests/config/junos/CONFIGURATION_ERROR/default/yang.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
},
"message_details": {
"processId": "7729",
"severity": 5,
"severity": 3,
"facility": 23,
"hostPrefix": null,
"pri": "189",
"pri": "187",
"processName": "mgd",
"host": "vmx01",
"tag": "UI_CONFIGURATION_ERROR",
Expand All @@ -29,5 +29,5 @@
"yang_model": "NO_MODEL",
"error": "CONFIGURATION_ERROR",
"os": "junos",
"severity": 5
"severity": 3
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<189>Jul 20 21:44:00 vmx01 mgd[7729]: UI_LOAD_EVENT: User 'luke' is performing a 'rollback 3'
Loading

0 comments on commit 560090a

Please sign in to comment.