Fixed the bug when dhcp server wasn't started for Direct netwok on JuniperSrx setup
diff --git a/server/src/com/cloud/network/element/DhcpElement.java b/server/src/com/cloud/network/element/DhcpElement.java
index 23fa6bf..e51304e 100644
--- a/server/src/com/cloud/network/element/DhcpElement.java
+++ b/server/src/com/cloud/network/element/DhcpElement.java
@@ -78,15 +78,15 @@
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
