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

Fixed the bug when dhcp server wasn't started for Direct netwok on JuniperSrx setup

This commit is contained in:
alena 2011-02-10 19:10:31 -08:00
parent 3fc867d22e
commit f3f3d37a06
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/network/element/DhcpElement.java
View File

@ -78,15 +78,15 @@ public class DhcpElement extends AdapterBase implements NetworkElement, Password
DataCenter dc = dest.getDataCenter();
String provider = dc.getGatewayProvider();
if (provider.equals(Provider.VirtualRouter.getName())) {
if (provider.equalsIgnoreCase(Provider.JuniperSRX.getName()) && ipType == GuestIpType.Virtual) {
return true;
} else {
if (dc.getNetworkType() == NetworkType.Basic) {
return (ipType == GuestIpType.Direct && trafficType == TrafficType.Guest);
} else {
return (ipType == GuestIpType.Direct);
}
} else {
return (ipType == GuestIpType.Virtual);
}
}
}
@Override