From c125496691a28fa66b3378dc56d3100e818e19bd Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 23 Jan 2012 14:52:07 -0800 Subject: [PATCH] bug 13207: check providers/services combination before performing actual network offering upgrade status 13207: resolved fixed --- server/src/com/cloud/network/NetworkManagerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index f3c022dd87f..8aef116dc36 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -3837,6 +3837,10 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag networkOfferingChanged = true; } } + Map newSvcProviders = new HashMap(); + if (networkOfferingChanged) { + newSvcProviders = finalizeServicesAndProvidersForNetwork(_configMgr.getNetworkOffering(networkOfferingId), network.getPhysicalNetworkId()); + } //don't allow to modify network domain if the service is not supported if (domainSuffix != null) { @@ -3892,7 +3896,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag Transaction txn = Transaction.currentTxn(); txn.start(); network.setNetworkOfferingId(networkOfferingId); - _networksDao.update(networkId, network, finalizeServicesAndProvidersForNetwork(_configMgr.getNetworkOffering(networkOfferingId), network.getPhysicalNetworkId())); + _networksDao.update(networkId, network, newSvcProviders); //get all nics using this network //log remove usage events for old offering //log assign usage events for new offering