From 8cbf5f749f431c6a551e88b74705a91f71a54785 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Mon, 25 Jun 2012 13:19:00 -0700
Subject: [PATCH] VPC: Don't allow to do ip assoc to the network in the VPC.
 The ip should be assigned to the VPC itself

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

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index fee85489872..0d4a41d9597 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -7068,6 +7068,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         }
         
         if (networkId != null) {
+            Network network = _networksDao.findById(networkId);
+            if (network == null) {
+                throw new InvalidParameterValueException("Invalid network id is given");
+            }
+            
+            if (network.getVpcId() != null) {
+                throw new InvalidParameterValueException("Specify vpcId to associate ip address to VPC");
+            }
             return associateIPToGuestNetwork(ipId, networkId);
         }