You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/03 21:31:20 UTC
[1/2] git commit: updated refs/heads/master to 0ba871b
Repository: cloudstack
Updated Branches:
refs/heads/master 0c62c611d -> 0ba871b12
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 <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89227070
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89227070
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89227070
Branch: refs/heads/master
Commit: 8922707076632d478d7ed088a08bf24261e07c82
Parents: 20bbd34
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Nov 3 13:47:23 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Tue Nov 3 13:47:23 2015 +0530
----------------------------------------------------------------------
.../secondarystorage/SecondaryStorageManagerImpl.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/89227070/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 dd81809..5f8a1e0 100644
--- a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -92,6 +92,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;
@@ -180,6 +181,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar
@Inject
protected SecondaryStorageVmDao _secStorageVmDao;
@Inject
+ protected StorageNetworkManager _sNwMgr;
+ @Inject
private DataCenterDao _dcDao;
@Inject
private VMTemplateDao _templateDao;
@@ -551,9 +554,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);
[2/2] git commit: updated refs/heads/master to 0ba871b
Posted by re...@apache.org.
Merge pull request #1024 from shapeblue/CLOUDSTACK-9019-master
[4.6/master] 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/1024:
CLOUDSTACK-9019: Add storage network offering in ssvm only if storage network is defined
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0ba871b1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0ba871b1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0ba871b1
Branch: refs/heads/master
Commit: 0ba871b127f83b7ba6dca1d55ada16bf5b971959
Parents: 0c62c61 8922707
Author: Remi Bergsma <gi...@remi.nl>
Authored: Tue Nov 3 21:30:52 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Tue Nov 3 21:30:52 2015 +0100
----------------------------------------------------------------------
.../secondarystorage/SecondaryStorageManagerImpl.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------