Repository: cloudstack Updated Branches: refs/heads/4.5 76554e6f5 -> 7aeff217a
CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined During creation of SSVM, checks and adds NetworkOffering.SystemStorageNetwork to offerings only if storage network exists for the target datacenter Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/619f0eb2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/619f0eb2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/619f0eb2 Branch: refs/heads/4.5 Commit: 619f0eb276499a7b8f31d31f6479d27f215c7b3f Parents: 76554e6 Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Tue Nov 3 13:47:23 2015 +0530 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Tue Nov 3 13:51:21 2015 +0530 ---------------------------------------------------------------------- .../secondarystorage/SecondaryStorageManagerImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/619f0eb2/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java ---------------------------------------------------------------------- diff --git a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java index 7b6e868..382a0f8 100755 --- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java @@ -93,6 +93,7 @@ import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; import com.cloud.network.rules.RulesManager; +import com.cloud.network.StorageNetworkManager; import com.cloud.offering.NetworkOffering; import com.cloud.offering.ServiceOffering; import com.cloud.offerings.dao.NetworkOfferingDao; @@ -181,6 +182,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar @Inject protected SecondaryStorageVmDao _secStorageVmDao; @Inject + protected StorageNetworkManager _sNwMgr; + @Inject private DataCenterDao _dcDao; @Inject private VMTemplateDao _templateDao; @@ -548,9 +551,12 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar defaultNetwork = defaultNetworks.get(0); } - List<? extends NetworkOffering> offerings = - _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork, NetworkOffering.SystemManagementNetwork, - NetworkOffering.SystemStorageNetwork); + List<? extends NetworkOffering> offerings = null; + if (_sNwMgr.isStorageIpRangeAvailable(dataCenterId)) { + offerings = _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork, NetworkOffering.SystemManagementNetwork, NetworkOffering.SystemStorageNetwork); + } else { + offerings = _networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork, NetworkOffering.SystemManagementNetwork); + } LinkedHashMap<Network, List<? extends NicProfile>> networks = new LinkedHashMap<Network, List<? extends NicProfile>>(offerings.size() + 1); NicProfile defaultNic = new NicProfile(); defaultNic.setDefaultNic(true);
