Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve error handling for static route config parsing
Do not assert when we encounter parse errors in prefixes, nexthops and route targets. Add tests to cover the above scenarios. Change-Id: Ibb7780bb367486a31eb4a57b1a61942c404e2342 Partial-Bug: 1456193
- Loading branch information
Nischal Sheth
committed
May 19, 2015
1 parent
d09ef26
commit ee68869
Showing
11 changed files
with
345 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix></prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.3.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/33</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.2.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.3.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.2.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>2001:abcd:abcd:abcd::/64</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>xxxxxx:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:5000000000</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.2.0/24</prefix> | ||
<next-hop></next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.3.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.256</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.2.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.3.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<static-route-entries> | ||
<route> | ||
<prefix>192.168.1.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.2.0/24</prefix> | ||
<next-hop>192.168.1.254</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
<route> | ||
<prefix>192.168.3.0/24</prefix> | ||
<next-hop>2001::2001</next-hop> | ||
<route-target>target:64496:1</route-target> | ||
<route-target>target:64496:2</route-target> | ||
<route-target>target:64496:3</route-target> | ||
</route> | ||
</static-route-entries> |