etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 6807: firstip determination is more complicated than at first sight 

status 6807: resolved fixed
This commit is contained in:
Chiradeep Vittal 2010-11-01 13:10:05 -07:00
parent 4bfe0154b0
commit 2b05811508
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -961,8 +961,10 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
boolean removeVif = false;
if (add && correctVif == null) {
addVif = true;
s_logger.info("ipassoc: Need to add a vif to the virtual router since the ip is in a new subnet " + publicIpAddress);
} else if (!add && firstIP) {
removeVif = true;
s_logger.info("ipassoc: Need to remove a vif to the virtual router since the removed ip is the last one " + publicIpAddress);
}
if (addVif) {
@ -994,9 +996,11 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
args += " -f";
args += " -l ";
args += publicIpAddress + "/" + cidrSize;
} else if (firstIP) {
s_logger.debug("ipassoc: source nat ip: " + publicIpAddress);
} else if (addVif || removeVif || firstIP) {
args += " -l ";
args += publicIpAddress + "/" + cidrSize;
s_logger.debug("ipassoc: first ip on vif: " + publicIpAddress);
} else {
args += " -l ";
args += publicIpAddress;