-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/18683/
-----------------------------------------------------------
Review request for cloudstack, Marcus Sorensen and Sateesh Chodapuneedi.
Bugs: CLOUDSTACK-6194
https://issues.apache.org/jira/browse/CLOUDSTACK-6194
Repository: cloudstack-git
Description
-------
In case the vlan is passed null to the api or doing it from UI, the new changes
make vlanId as "vlan://untagged"
The following code in ConfigurationManagerImpl.java
if (vlans != null && vlans.size() > 0) {
VlanVO vlan = vlans.get(0);
if (vlanId == null) {
vlanId = vlan.getVlanTag();
} else if (!NetUtils.isSameIsolationId(vlan.getVlanTag(),
vlanId)) {
throw new InvalidParameterValueException("there is
already one vlan " + vlan.getVlanTag()
starts throwing exception.
Fix includes additional check for the modified vlanid.
The same checks are in NetUtils.isSameIsolationId() for checking untagged.
Diffs
-----
server/src/com/cloud/configuration/ConfigurationManagerImpl.java d2e5aaa
Diff: https://reviews.apache.org/r/18683/diff/
Testing
-------
Adding new guest IP range passes smoothly.
Adding new public IP ranges passes smoothly.
Thanks,
Saksham Srivastava