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

VPC : CS-15542, on ipdeassoc, if vif does not exist, return success.

This commit is contained in:
anthony 2012-07-11 13:48:12 -07:00
parent 9212d16080
commit 7eef78b644
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1929,7 +1929,12 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
VIF correctVif = getCorrectVif(conn, router, ip);
if (correctVif == null) {
throw new InternalErrorException("Failed to find DomR VIF to associate/disassociate IP with.");
if (ip.isAdd()) {
throw new InternalErrorException("Failed to find DomR VIF to associate IP with.");
} else {
s_logger.debug("VIF to deassociate IP with does not exist, return success");
return;
}
}
String args = "vpc_ipassoc.sh " + routerIp;