From 9be0a5525dae4dc4b9ec3d0553017a9aba3c2f02 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 27 Jul 2012 11:28:42 -0700 Subject: [PATCH] VPC: CS-15725 - don't allow regular offering upgrade to the offering that can be used inside vpc only --- 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 880466c0ac3..e022ea38efb 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -4718,6 +4718,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag } + //can't update from vpc to non-vpc network offering + boolean forVpcNew = _configMgr.isOfferingForVpc(networkOffering); + boolean vorVpcOriginal = _configMgr.isOfferingForVpc(_configMgr.getNetworkOffering(oldNetworkOfferingId)); + if (forVpcNew != vorVpcOriginal) { + String errMsg = forVpcNew ? "a vpc offering " : "not a vpc offering"; + throw new InvalidParameterValueException("Can't update as the new offering is " + errMsg); + } + //can't update from vpc to non-vpc network offering boolean forVpcNew = _configMgr.isOfferingForVpc(networkOffering); boolean vorVpcOriginal = _configMgr.isOfferingForVpc(_configMgr.getNetworkOffering(oldNetworkOfferingId));