From ba2c05cc552167b8a4d1e2e71e8b6dc6fc71adc5 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Mon, 30 Jul 2012 13:33:17 -0700
Subject: [PATCH] Allow EIP/ELB network creation only in Basic zone

---
 server/src/com/cloud/network/NetworkManagerImpl.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 8c855af2ff2..d4fd891edd7 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2935,6 +2935,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
                             "service disabled are allowed in security group enabled zone", null);
                 }
             }
+            
+            //don't allow eip/elb networks in Advance zone
+            if (ntwkOff.getElasticIp() || ntwkOff.getElasticLb()) {
+                throw new InvalidParameterValueException("Elastic IP and Elastic LB services are supported in zone of type " + NetworkType.Basic, null);
+            }
         }
 
         // VlanId can be specified only when network offering supports it