diff options
| author | hagbard <vyosdev@derith.de> | 2018-08-31 08:25:26 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2018-08-31 08:25:26 -0700 |
| commit | c2c05c74deaaee6ec222cf09345b7e79ab8adcd2 (patch) | |
| tree | 6cb78d058b2c3b44cbd0fca25704a0866284c2be /src/conf_mode/vrrp.py | |
| parent | 5d577637f8ced10a8cc769cf58c82fc069fd0669 (diff) | |
| parent | c16a8fcb9dca029a233ca9365ad7791b1df495f1 (diff) | |
| download | vyos-1x-c2c05c74deaaee6ec222cf09345b7e79ab8adcd2.tar.gz vyos-1x-c2c05c74deaaee6ec222cf09345b7e79ab8adcd2.zip | |
Merge remote-tracking branch 'upstream/current' into T793
Diffstat (limited to 'src/conf_mode/vrrp.py')
| -rwxr-xr-x | src/conf_mode/vrrp.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py index d21e3ef40..28633f1b4 100755 --- a/src/conf_mode/vrrp.py +++ b/src/conf_mode/vrrp.py @@ -273,7 +273,7 @@ def verify(data): count = len(_groups) - 1 index = 0 while (index < count): - if _groups[index]["vrid"] == _groups[index + 1]["vrid"]: + if (_groups[index]["vrid"] == _groups[index + 1]["vrid"]) and (_groups[index]["interface"] == _groups[index + 1]["interface"]): raise ConfigError("VRID {0} is used in groups {1} and {2} that both use interface {3}. Groups on the same interface must use different VRIDs".format( _groups[index]["vrid"], _groups[index]["name"], _groups[index + 1]["name"], _groups[index]["interface"])) else: |