diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index f0d873c9b65..f9a5238d5a2 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -7066,6 +7066,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); }