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

Merge pull request #1025 from shapeblue/CLOUDSTACK-9019-4.5 

[4.5] 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

(Manually tested)

* pr/1025:
  CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-11-04 10:46:59 +05:30
parent 76554e6f5e 619f0eb276
commit 7aeff217a3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
View File

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