CLOUDSTACK-737,
allow to add security group enabled networks in security group enabled
zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b32d7c02
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b32d7c02
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b32d7c02
Branch: refs/heads/master
Commit: b32d7c026c8d84b0b0c17f75cc4ea73bd932eca5
Parents: 3bb8131
Author: anthony <[email protected]>
Authored: Wed Jan 23 11:08:24 2013 -0800
Committer: Anthony Xu <[email protected]>
Committed: Wed May 15 14:53:48 2013 -0700
----------------------------------------------------------------------
.../configuration/ConfigurationManagerImpl.java | 10 ++---
.../consoleproxy/ConsoleProxyManagerImpl.java | 29 +++++++++-----
.../secondary/SecondaryStorageManagerImpl.java | 32 +++++++++-----
3 files changed, 43 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b32d7c02/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index e1aaa50..ef0a784 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1774,13 +1774,11 @@ public class ConfigurationManagerImpl extends
ManagerBase implements Configurati
// check if zone has necessary trafficTypes before enabling
try {
PhysicalNetwork mgmtPhyNetwork;
- if (NetworkType.Advanced == zone.getNetworkType()) {
- // zone should have a physical network with public and
management traffiType
+ // zone should have a physical network with management
traffiType
+ mgmtPhyNetwork =
_networkModel.getDefaultPhysicalNetworkByZoneAndTrafficType(zoneId,
TrafficType.Management);
+ if (NetworkType.Advanced == zone.getNetworkType() && !
zone.isSecurityGroupEnabled() ) {
+ // advanced zone without SG should have a physical
network with public Thpe
_networkModel.getDefaultPhysicalNetworkByZoneAndTrafficType(zoneId,
TrafficType.Public);
- mgmtPhyNetwork =
_networkModel.getDefaultPhysicalNetworkByZoneAndTrafficType(zoneId,
TrafficType.Management);
- } else {
- // zone should have a physical network with management
traffiType
- mgmtPhyNetwork =
_networkModel.getDefaultPhysicalNetworkByZoneAndTrafficType(zoneId,
TrafficType.Management);
}
try {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b32d7c02/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 9a7a46f..421e53f 100755
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -687,19 +687,28 @@ public class ConsoleProxyManagerImpl extends ManagerBase
implements ConsoleProxy
DataCenterDeployment plan = new DataCenterDeployment(dataCenterId);
- TrafficType defaultTrafficType = TrafficType.Public;
- if (dc.getNetworkType() == NetworkType.Basic ||
dc.isSecurityGroupEnabled()) {
- defaultTrafficType = TrafficType.Guest;
- }
-
- List<NetworkVO> defaultNetworks =
_networkDao.listByZoneAndTrafficType(dataCenterId, defaultTrafficType);
+ NetworkVO defaultNetwork = null;
+ if (dc.getNetworkType() == NetworkType.Advanced &&
dc.isSecurityGroupEnabled()) {
+ List<NetworkVO> networks =
_networkDao.listByZoneSecurityGroup(dataCenterId);
+ if (networks == null || networks.size() == 0) {
+ throw new CloudRuntimeException("Can not found security
enabled network in SG Zone " + dc);
+ }
+ defaultNetwork = networks.get(0);
+ } else {
+ TrafficType defaultTrafficType = TrafficType.Public;
+ if (dc.getNetworkType() == NetworkType.Basic ||
dc.isSecurityGroupEnabled()) {
+ defaultTrafficType = TrafficType.Guest;
+ }
+ List<NetworkVO> defaultNetworks =
_networkDao.listByZoneAndTrafficType(dataCenterId, defaultTrafficType);
- if (defaultNetworks.size() != 1) {
- throw new CloudRuntimeException("Found " + defaultNetworks.size()
+ " networks of type " + defaultTrafficType + " when expect to find 1");
+ // api should never allow this situation to happen
+ if (defaultNetworks.size() != 1) {
+ throw new CloudRuntimeException("Found " +
defaultNetworks.size() + " networks of type "
+ + defaultTrafficType + " when expect to find 1");
+ }
+ defaultNetwork = defaultNetworks.get(0);
}
- NetworkVO defaultNetwork = defaultNetworks.get(0);
-
List<? extends NetworkOffering> offerings =
_networkModel.getSystemAccountNetworkOfferings(NetworkOffering.SystemControlNetwork,
NetworkOffering.SystemManagementNetwork);
List<Pair<NetworkVO, NicProfile>> networks = new
ArrayList<Pair<NetworkVO, NicProfile>>(offerings.size() + 1);
NicProfile defaultNic = new NicProfile();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b32d7c02/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
----------------------------------------------------------------------
diff --git
a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
index 3cf9a7e..c343286 100755
--- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
+++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
@@ -538,19 +538,27 @@ public class SecondaryStorageManagerImpl extends
ManagerBase implements Secondar
DataCenterDeployment plan = new DataCenterDeployment(dataCenterId);
DataCenter dc = _dcDao.findById(plan.getDataCenterId());
- TrafficType defaultTrafficType = TrafficType.Public;
- if (dc.getNetworkType() == NetworkType.Basic ||
dc.isSecurityGroupEnabled()) {
- defaultTrafficType = TrafficType.Guest;
- }
-
- List<NetworkVO> defaultNetworks =
_networkDao.listByZoneAndTrafficType(dataCenterId, defaultTrafficType);
-
- //api should never allow this situation to happen
- if (defaultNetworks.size() != 1) {
- throw new CloudRuntimeException("Found " +
defaultNetworks.size() + " networks of type " + defaultTrafficType + " when
expect to find 1");
+ NetworkVO defaultNetwork = null;
+ if (dc.getNetworkType() == NetworkType.Advanced &&
dc.isSecurityGroupEnabled()) {
+ List<NetworkVO> networks =
_networkDao.listByZoneSecurityGroup(dataCenterId);
+ if (networks == null || networks.size() == 0) {
+ throw new CloudRuntimeException("Can not found security
enabled network in SG Zone " + dc);
+ }
+ defaultNetwork = networks.get(0);
+ } else {
+ TrafficType defaultTrafficType = TrafficType.Public;
+
+ if (dc.getNetworkType() == NetworkType.Basic ||
dc.isSecurityGroupEnabled()) {
+ defaultTrafficType = TrafficType.Guest;
+ }
+ List<NetworkVO> defaultNetworks =
_networkDao.listByZoneAndTrafficType(dataCenterId, defaultTrafficType);
+ // api should never allow this situation to happen
+ if (defaultNetworks.size() != 1) {
+ throw new CloudRuntimeException("Found " +
defaultNetworks.size() + " networks of type "
+ + defaultTrafficType + " when expect to find
1");
+ }
+ defaultNetwork = defaultNetworks.get(0);
}
-
- NetworkVO defaultNetwork = defaultNetworks.get(0);
List<? extends NetworkOffering> offerings =
_networkModel.getSystemAccountNetworkOfferings(NetworkOfferingVO.SystemControlNetwork,
NetworkOfferingVO.SystemManagementNetwork,
NetworkOfferingVO.SystemStorageNetwork);
List<Pair<NetworkVO, NicProfile>> networks = new
ArrayList<Pair<NetworkVO, NicProfile>>(offerings.size() + 1);
