From de7a763ff93b37e1db5721b98f777af7f9084fa6 Mon Sep 17 00:00:00 2001 From: frank Date: Thu, 2 Feb 2012 11:31:11 -0800 Subject: [PATCH] avoid both PodBaseNetworkGuru and StorageNetworkGuru reply to storage network design call --- .../src/com/cloud/network/guru/PodBasedNetworkGuru.java | 9 ++------- .../src/com/cloud/network/guru/StorageNetworkGuru.java | 6 +----- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java index 0087cbac7f5..8f088fd9743 100755 --- a/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/PodBasedNetworkGuru.java @@ -61,7 +61,7 @@ public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru { @Inject StorageNetworkManager _sNwMgr; Random _rand = new Random(System.currentTimeMillis()); - private static final TrafficType[] _trafficTypes = {TrafficType.Management, TrafficType.Storage}; + private static final TrafficType[] _trafficTypes = {TrafficType.Management}; @Override public boolean isMyTrafficType(TrafficType type) { @@ -85,12 +85,7 @@ public class PodBasedNetworkGuru extends AdapterBase implements NetworkGuru { if (!isMyTrafficType(type)) { return null; } - - if (type == TrafficType.Storage && _sNwMgr.isStorageIpRangeAvailable()) { - s_logger.debug("There is an storage network ip range, let StorageNetworkGuru to handle TrafficType.Storage"); - return null; - } - + NetworkVO config = new NetworkVO(type, Mode.Static, BroadcastDomainType.Native, offering.getId(), Network.State.Setup, plan.getDataCenterId(), plan.getPhysicalNetworkId()); return config; } diff --git a/server/src/com/cloud/network/guru/StorageNetworkGuru.java b/server/src/com/cloud/network/guru/StorageNetworkGuru.java index 700f0e60374..ad58018853d 100755 --- a/server/src/com/cloud/network/guru/StorageNetworkGuru.java +++ b/server/src/com/cloud/network/guru/StorageNetworkGuru.java @@ -71,11 +71,7 @@ public class StorageNetworkGuru extends PodBasedNetworkGuru implements NetworkGu if (!canHandle(offering)) { return null; } - - if (!_sNwMgr.isStorageIpRangeAvailable()) { - return super.design(offering, plan, userSpecified, owner); - } - + NetworkVO config = new NetworkVO(offering.getTrafficType(), Mode.Static, BroadcastDomainType.Native, offering.getId(), Network.State.Setup, plan.getDataCenterId(), plan.getPhysicalNetworkId()); return config;