Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
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: Ia0fb3404dafe734ef4ad6e13885d53766aa6d95b Partial-Bug: 1456193
- Loading branch information
Nischal Sheth
committed
May 19, 2015
1 parent
dad6d8d
commit 04424af
Showing
11 changed files
with
356 additions
and
21 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> |
Oops, something went wrong.