From f3f3d37a062b6747130cb43ebbdbfe548b47fefc Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 10 Feb 2011 19:10:31 -0800
Subject: [PATCH] Fixed the bug when dhcp server wasn't started for Direct
 netwok on JuniperSrx setup

---
 server/src/com/cloud/network/element/DhcpElement.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/network/element/DhcpElement.java b/server/src/com/cloud/network/element/DhcpElement.java
index 23fa6bf05b4..e51304ee0e2 100644
--- a/server/src/com/cloud/network/element/DhcpElement.java
+++ b/server/src/com/cloud/network/element/DhcpElement.java
@@ -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