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

VPC: fixed list public ips by vpcId

This commit is contained in:
Alena Prokharchyk 2012-06-26 16:35:56 -07:00
parent 303d8a250d
commit 0b620bc852
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -1744,7 +1744,7 @@ public class ManagementServerImpl implements ManagementServer {
}
// don't show SSVM/CPVM ips
if (vlanType == VlanType.VirtualNetwork && (allocatedOnly)) {
if (vlanType == VlanType.VirtualNetwork && (allocatedOnly) && vpcId == null) {
sb.and("associatedNetworkId", sb.entity().getAssociatedWithNetworkId(), SearchCriteria.Op.NNULL);
}