mirror of https://github.com/apache/cloudstack.git
5690cd6364
Fixes: #3114 When adding iprange for VLANs there are 3 cases - VLAN under consideration has a tag (like 101) VLAN under consideration has a tag but as a range (like 101-124) VLAN is untagged (i.e. id is "untagged") Before adding iprange we have to check for possible overlaps and throw exception. This needs to be done as follows - If VLAN Tag ID is numeric or a range we need to call UriUtils.checkVlanUriOverlapmethod which internally tries to expand the range as verifies if there are overlaps. If URI overlaps (i.e. there are overlapping VLAN tags) we then need to verify if the iprange being added overlaps with previously added ranges. If there are no overlapping tags we simply need to test for public networks being present in the VLAN. A Regression was introduced in 41fdb88#diff-6e2b61984e8fa2823bb47da3caafa4eeR3174 which caused comparing 'untagged' string as a numeric VLAN Tag range and and attempted expanding it to test overlap in UriUtils.checkVlanUriOverlap. To fix the bug in the issue, we need to handle the untagged case separately as it's non-numeric tag in code. For untagged VLANs and overlapping VLAN URIs we need to check for ipranges and gateways which happens naturally after this change. For tagged VLANs with non-overlapping URIs we need to check if there is a public network. |
||
|---|---|---|
| .. | ||
| conf | ||
| src | ||
| pom.xml | ||