From 345b1421c8c3353a74d263f1c7bfbb29dcff1e42 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Mon, 24 Oct 2011 17:56:34 -0700
Subject: [PATCH] Allow network offering upgrade for any combination of
 services

---
 .../src/com/cloud/network/NetworkManagerImpl.java   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 791ea649fd3..b3e0819c98a 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3414,8 +3414,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
             return false;
         }
         
-        //compare providers
-        return canUpgradeProviders(oldNetworkOfferingId, newNetworkOfferingId);
+        return true;
     }
     
     
@@ -3962,20 +3961,12 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
     
     @Override
     public List<Long> listNetworkOfferingsForUpgrade(long networkId) {
-        List<Long> offeringIdsToReturn = new ArrayList<Long>();
         
         NetworkOffering originalOffering = _configMgr.getNetworkOffering(getNetwork(networkId).getNetworkOfferingId());
         
         List<Long> offerings = _networkOfferingDao.getOfferingIdsToUpgradeFrom(originalOffering);
         
-        //check if providers are upgradable
-        for (Long offering : offerings) {
-            if (canUpgradeProviders(originalOffering.getId(), offering.longValue())) {
-                offeringIdsToReturn.add(offering);
-            }
-        }
-        
-        return offeringIdsToReturn;
+        return offerings;
     }
 
 }