You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/03/12 19:36:22 UTC
git commit: updated refs/heads/master to b5c8a56
Repository: cloudstack
Updated Branches:
refs/heads/master 6c035240b -> b5c8a56ee
CLOUDSTACK-6232 allow expansion of ip on isolated networks as well
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b5c8a56e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b5c8a56e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b5c8a56e
Branch: refs/heads/master
Commit: b5c8a56eeaa62cb1295993b43b11f1fb916949af
Parents: 6c03524
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Mar 12 19:36:11 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Mar 12 19:36:11 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/configuration/ConfigurationManagerImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5c8a56e/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 863d71b..2d4539c 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -36,6 +36,8 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.SecurityChecker;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -83,7 +85,6 @@ import org.apache.cloudstack.region.dao.RegionDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.log4j.Logger;
import com.cloud.alert.AlertManager;
import com.cloud.api.ApiDBUtils;
@@ -2623,7 +2624,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
networkId = network.getId();
zoneId = network.getDataCenterId();
}
- } else if (network.getGuestType() == null || network.getGuestType() == Network.GuestType.Isolated) {
+ } else if (network.getGuestType() == null ||
+ (network.getGuestType() == Network.GuestType.Isolated
+ && _ntwkOffServiceMapDao.areServicesSupportedByNetworkOffering(network.getNetworkOfferingId(), Service.SourceNat))) {
throw new InvalidParameterValueException("Can't create direct vlan for network id=" + networkId + " with type: " + network.getGuestType());
}
}