etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid both PodBaseNetworkGuru and StorageNetworkGuru reply to storage network 

design call
This commit is contained in:
frank 2012-02-02 11:31:11 -08:00
parent 2d218ad451
commit de7a763ff9
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/network/guru/PodBasedNetworkGuru.java
View File

@ -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;
}

6
server/src/com/cloud/network/guru/StorageNetworkGuru.java
View File

@ -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;